Undo agp upgrade

vkryachko · vkryachko · commit 1de3d2fd7b24 · 2020-08-14T16:21:12.000-04:00
diff --git a/build.gradle b/build.gradle
@@ -29,7 +29,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0-rc01'
+        classpath 'com.android.tools.build:gradle:4.0.0'
         classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.12'
         classpath 'net.ltgt.gradle:gradle-errorprone-plugin:1.2.1'
         classpath 'org.jsoup:jsoup:1.13.1'
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 plugins {
-    id "org.gradle.kotlin.kotlin-dsl" version "1.3.6"
+    id "org.gradle.kotlin.kotlin-dsl" version "1.2.6"
     id "org.jlleitschuh.gradle.ktlint" version "9.2.1"
 }
 
@@ -47,7 +47,7 @@ dependencies {
     runtime 'io.opencensus:opencensus-impl:0.18.0'
     implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.6'
     implementation 'org.jetbrains.dokka:dokka-android-gradle-plugin:0.9.17-g013-9b8280a'
-    implementation 'com.android.tools.build:gradle:4.1.0-rc01'
+    implementation 'com.android.tools.build:gradle:3.4.2'
 
     testImplementation 'junit:junit:4.13-rc-1'
     testImplementation group: 'com.google.code.gson', name: 'gson', version: '2.8.6'
@@ -92,7 +92,3 @@ test {
     }
     enabled = rootProject.properties.get('enablePluginTests', false).toBoolean()
 }
-
-tasks.named("validatePlugins") {
-    failOnWarning = false
-}
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/FirebaseLibraryPlugin.java b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/FirebaseLibraryPlugin.java
@@ -18,7 +18,6 @@
 
 import com.android.build.gradle.LibraryExtension;
 import com.android.build.gradle.api.AndroidSourceSet;
-import com.android.build.gradle.internal.dsl.TestOptions;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.firebase.gradle.plugins.apiinfo.ApiInformationTask;
@@ -59,7 +58,7 @@ public void apply(Project project) {
 
     // see https://github.com/robolectric/robolectric/issues/5456
     android.testOptions(
-        (TestOptions options) ->
+        options ->
             options
                 .getUnitTests()
                 .all(
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/Coverage.java b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/Coverage.java
@@ -66,7 +66,7 @@ public static void apply(FirebaseLibraryExtension firebaseLibrary) {
                       .add("**Manifest*.*")
                       .build();
 
-              task.getClassDirectories().from(
+              task.setClassDirectories(
                   project.files(
                       project.fileTree(
                           ImmutableMap.of(
@@ -80,8 +80,8 @@ public static void apply(FirebaseLibraryExtension firebaseLibrary) {
                               project.getBuildDir() + "/tmp/kotlin-classes/release",
                               "excludes",
                               excludes))));
-              task.getSourceDirectories().from(project.files("src/main/java", "src/main/kotlin"));
-              task.getExecutionData().from(
+              task.setSourceDirectories(project.files("src/main/java", "src/main/kotlin"));
+              task.setExecutionData(
                   project.fileTree(
                       ImmutableMap.of(
                           "dir",
diff --git a/buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/VendorTests.kt b/buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/VendorTests.kt
@@ -139,9 +139,9 @@ class VendorPluginTests {
                 google()
                 jcenter()
             }
-            
+
             android.compileSdkVersion = 26
-            
+
             dependencies {
                 $deps
             }
diff --git a/firebase-common/firebase-common.gradle b/firebase-common/firebase-common.gradle
@@ -33,7 +33,6 @@ android {
       versionName version
       multiDexEnabled true
       testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-      testInstrumentationRunnerArguments 'hello': 'world', 'foo': 'bar'
     }
     sourceSets {
         androidTest {
diff --git a/firebase-common/gradle.properties b/firebase-common/gradle.properties
@@ -1,2 +1,3 @@
 version=19.3.1
 latestReleasedVersion=19.3.0
+android.enableUnitTestBinaryResources=true
diff --git a/firebase-common/ktx/gradle.properties b/firebase-common/ktx/gradle.properties
@@ -0,0 +1 @@
+android.enableUnitTestBinaryResources=true
diff --git a/firebase-config/gradle.properties b/firebase-config/gradle.properties
@@ -16,3 +16,5 @@
 
 version=19.2.1
 latestReleasedVersion=19.2.0
+android.enableUnitTestBinaryResources=true
+
diff --git a/firebase-config/ktx/gradle.properties b/firebase-config/ktx/gradle.properties
@@ -0,0 +1,2 @@
+android.enableUnitTestBinaryResources=true
+
diff --git a/firebase-crashlytics-ndk/.cxx/ndk_locator_record_1s6d6z5g.json b/firebase-crashlytics-ndk/.cxx/ndk_locator_record_1s6d6z5g.json
diff --git a/firebase-crashlytics-ndk/.cxx/ndk_locator_record_1s6d6z5g.log b/firebase-crashlytics-ndk/.cxx/ndk_locator_record_1s6d6z5g.log
diff --git a/firebase-crashlytics-ndk/.cxx/ndk_locator_record_1s6d6z5g_key.json b/firebase-crashlytics-ndk/.cxx/ndk_locator_record_1s6d6z5g_key.json
diff --git a/firebase-crashlytics-ndk/.cxx/ndk_locator_record_3nr3d4x5.json b/firebase-crashlytics-ndk/.cxx/ndk_locator_record_3nr3d4x5.json
diff --git a/firebase-crashlytics-ndk/.cxx/ndk_locator_record_3nr3d4x5.log b/firebase-crashlytics-ndk/.cxx/ndk_locator_record_3nr3d4x5.log
diff --git a/firebase-crashlytics-ndk/.cxx/ndk_locator_record_3nr3d4x5_key.json b/firebase-crashlytics-ndk/.cxx/ndk_locator_record_3nr3d4x5_key.json
diff --git a/firebase-crashlytics/ktx/gradle.properties b/firebase-crashlytics/ktx/gradle.properties
@@ -0,0 +1 @@
+android.enableUnitTestBinaryResources=true
diff --git a/firebase-database/gradle.properties b/firebase-database/gradle.properties
@@ -14,3 +14,4 @@
 
 version=19.3.2
 latestReleasedVersion=19.3.1
+android.enableUnitTestBinaryResources=true
diff --git a/firebase-database/ktx/gradle.properties b/firebase-database/ktx/gradle.properties
@@ -0,0 +1 @@
+android.enableUnitTestBinaryResources=true
diff --git a/firebase-datatransport/gradle.properties b/firebase-datatransport/gradle.properties
@@ -1,2 +1,3 @@
 version=17.0.7
 latestReleasedVersion=17.0.6
+android.enableUnitTestBinaryResources=true
diff --git a/firebase-dynamic-links/gradle.properties b/firebase-dynamic-links/gradle.properties
@@ -14,3 +14,4 @@
 
 version=19.1.1
 latestReleasedVersion=19.1.0
+android.enableUnitTestBinaryResources=true
diff --git a/firebase-dynamic-links/ktx/gradle.properties b/firebase-dynamic-links/ktx/gradle.properties
@@ -0,0 +1,2 @@
+android.enableUnitTestBinaryResources=true
+
diff --git a/firebase-firestore/ktx/gradle.properties b/firebase-firestore/ktx/gradle.properties
@@ -0,0 +1,2 @@
+android.enableUnitTestBinaryResources=true
+
diff --git a/firebase-functions/gradle.properties b/firebase-functions/gradle.properties
@@ -1,2 +1,3 @@
 version=19.0.3
 latestReleasedVersion=19.0.2
+android.enableUnitTestBinaryResources=true
diff --git a/firebase-functions/ktx/gradle.properties b/firebase-functions/ktx/gradle.properties
@@ -0,0 +1,2 @@
+android.enableUnitTestBinaryResources=true
+
diff --git a/firebase-inappmessaging-display/firebase-inappmessaging-display.gradle b/firebase-inappmessaging-display/firebase-inappmessaging-display.gradle
@@ -93,7 +93,6 @@ dependencies {
     testImplementation "junit:junit:4.12"
     testImplementation "org.mockito:mockito-core:2.25.0"
     testImplementation "com.google.truth:truth:1.0"
-    testImplementation 'androidx.test:core:1.2.0'
     testImplementation 'com.google.guava:guava:27.1-android'
 
     androidTestImplementation "org.mockito:mockito-core:2.25.0"
diff --git a/firebase-inappmessaging-display/ktx/gradle.properties b/firebase-inappmessaging-display/ktx/gradle.properties
@@ -0,0 +1,2 @@
+android.enableUnitTestBinaryResources=true
+
diff --git a/firebase-inappmessaging/ktx/gradle.properties b/firebase-inappmessaging/ktx/gradle.properties
@@ -0,0 +1,2 @@
+android.enableUnitTestBinaryResources=true
+
diff --git a/firebase-messaging-directboot/gradle.properties b/firebase-messaging-directboot/gradle.properties
@@ -1,2 +1,3 @@
 version=20.2.5
 latestReleasedVersion=20.2.4
+android.enableUnitTestBinaryResources=true
diff --git a/firebase-messaging-directboot/src/main/AndroidManifest.xml b/firebase-messaging-directboot/src/main/AndroidManifest.xml
@@ -15,7 +15,7 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.google.firebase.messaging.directboot">
-<!--    <uses-sdk android:minSdkVersion="16"/>-->
+    <uses-sdk android:minSdkVersion="16"/>
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
diff --git a/firebase-messaging/gradle.properties b/firebase-messaging/gradle.properties
@@ -1,2 +1,3 @@
 version=20.2.5
 latestReleasedVersion=20.2.4
+android.enableUnitTestBinaryResources=true
diff --git a/firebase-storage/gradle.properties b/firebase-storage/gradle.properties
@@ -14,3 +14,4 @@
 
 version=19.1.2
 latestReleasedVersion=19.1.1
+android.enableUnitTestBinaryResources=true
diff --git a/firebase-storage/ktx/gradle.properties b/firebase-storage/ktx/gradle.properties
@@ -0,0 +1,2 @@
+android.enableUnitTestBinaryResources=true
+
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/transport/transport-runtime/gradle.properties b/transport/transport-runtime/gradle.properties
@@ -14,3 +14,4 @@
 
 version=2.2.4
 latestReleasedVersion=2.2.3
+android.enableUnitTestBinaryResources=true

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ buildscript {`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`dependencies {`
`32`		`- classpath 'com.android.tools.build:gradle:4.1.0-rc01'`
	`32`	`+ classpath 'com.android.tools.build:gradle:4.0.0'`
`33`	`33`	`classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.12'`
`34`	`34`	`classpath 'net.ltgt.gradle:gradle-errorprone-plugin:1.2.1'`
`35`	`35`	`classpath 'org.jsoup:jsoup:1.13.1'`
Original file line number	Diff line number	Diff line change
`@@ -139,9 +139,9 @@ class VendorPluginTests {`
`139`	`139`	`google()`
`140`	`140`	`jcenter()`
`141`	`141`	`}`
`142`		`-`
	`142`	`+`
`143`	`143`	`android.compileSdkVersion = 26`
`144`		`-`
	`144`	`+`
`145`	`145`	`dependencies {`
`146`	`146`	`$deps`
`147`	`147`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,6 @@ android {`
`33`	`33`	`versionName version`
`34`	`34`	`multiDexEnabled true`
`35`	`35`	`testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"`
`36`		`- testInstrumentationRunnerArguments 'hello': 'world', 'foo': 'bar'`
`37`	`36`	`}`
`38`	`37`	`sourceSets {`
`39`	`38`	`androidTest {`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`version=19.3.1`
`2`	`2`	`latestReleasedVersion=19.3.0`
	`3`	`+android.enableUnitTestBinaryResources=true`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+android.enableUnitTestBinaryResources=true`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+android.enableUnitTestBinaryResources=true`
	`2`	`+`
Original file line number	Diff line number	Diff line change
`@@ -14,3 +14,4 @@`
`14`	`14`
`15`	`15`	`version=19.3.2`
`16`	`16`	`latestReleasedVersion=19.3.1`
	`17`	`+android.enableUnitTestBinaryResources=true`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`version=17.0.7`
`2`	`2`	`latestReleasedVersion=17.0.6`
	`3`	`+android.enableUnitTestBinaryResources=true`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`version=19.0.3`
`2`	`2`	`latestReleasedVersion=19.0.2`
	`3`	`+android.enableUnitTestBinaryResources=true`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`version=20.2.5`
`2`	`2`	`latestReleasedVersion=20.2.4`
	`3`	`+android.enableUnitTestBinaryResources=true`