upgrade to AGP 4.2, update dependencies and remove kotlin stdlib (firebase#294)

thatfiredev · dpebot · web-flow · commit 6ec6b5f9d5e7 · 2021-05-10T06:17:15.000-04:00
Co-authored-by: DPE bot &lt;dpebot@google.com&gt;
diff --git a/admob/app/build.gradle b/admob/app/build.gradle
@@ -26,19 +26,17 @@ dependencies {
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'androidx.browser:browser:1.0.0'
     implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation "com.google.firebase:firebase-ads:20.0.0"
+    implementation "com.google.firebase:firebase-ads:20.1.0"
     implementation "androidx.constraintlayout:constraintlayout:2.0.4"
     implementation "androidx.multidex:multidex:2.0.1"
 
     // [START gradle_play_config]
-    implementation 'com.google.android.gms:play-services-ads:20.0.0'
+    implementation 'com.google.android.gms:play-services-ads:20.1.0'
     // [END gradle_play_config]
 
     // For an optimal experience using AdMob, add the Firebase SDK
     // for Google Analytics. This is recommended, but not required.
     implementation 'com.google.firebase:firebase-analytics:18.0.3'
-
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32"
 }
 
 apply plugin: 'com.google.gms.google-services'
diff --git a/admob/build.gradle b/admob/build.gradle
@@ -6,9 +6,9 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.3'
+        classpath 'com.android.tools.build:gradle:4.2.0'
         classpath 'com.google.gms:google-services:4.3.5'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.0"
     }
 }
 
diff --git a/analytics/app/build.gradle b/analytics/app/build.gradle
@@ -24,7 +24,6 @@ android {
 dependencies {
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32"
 
     implementation "com.google.firebase:firebase-analytics:18.0.3"
     implementation "com.google.firebase:firebase-analytics-ktx:18.0.3"
diff --git a/analytics/build.gradle b/analytics/build.gradle
@@ -6,9 +6,9 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.3'
+        classpath 'com.android.tools.build:gradle:4.2.0'
         classpath 'com.google.gms:google-services:4.3.5'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.0"
     }
 }
 
diff --git a/appindexing/app/build.gradle b/appindexing/app/build.gradle
@@ -25,7 +25,6 @@ dependencies {
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation "com.google.firebase:firebase-appindexing:19.2.0"
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32"
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
 }
 
diff --git a/appindexing/build.gradle b/appindexing/build.gradle
@@ -6,9 +6,9 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.3'
+        classpath 'com.android.tools.build:gradle:4.2.0'
         classpath 'com.google.gms:google-services:4.3.5'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.0"
     }
 }
 
diff --git a/auth/app/build.gradle b/auth/app/build.gradle
@@ -22,8 +22,6 @@ android {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32"
-    
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.browser:browser:1.0.0'
diff --git a/auth/build.gradle b/auth/build.gradle
@@ -6,9 +6,9 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.3'
+        classpath 'com.android.tools.build:gradle:4.2.0'
         classpath 'com.google.gms:google-services:4.3.5'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.0"
     }
 }
 
diff --git a/build.gradle b/build.gradle
@@ -6,9 +6,9 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.3'
+        classpath 'com.android.tools.build:gradle:4.2.0'
         classpath 'com.google.gms:google-services:4.3.5'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.0"
     }
 }
 
diff --git a/crashlytics/app/build.gradle b/crashlytics/app/build.gradle
@@ -31,8 +31,6 @@ dependencies {
     // For an optimal experience using Crashlytics, add the Firebase SDK
     // for Google Analytics. This is recommended, but not required.
     implementation 'com.google.firebase:firebase-analytics:18.0.3'
-
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32"
 }
 
 apply plugin: 'com.google.gms.google-services'
diff --git a/crashlytics/build.gradle b/crashlytics/build.gradle
@@ -6,9 +6,9 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.3'
+        classpath 'com.android.tools.build:gradle:4.2.0'
         classpath 'com.google.gms:google-services:4.3.5'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.0"
     }
 }
 
diff --git a/database/app/build.gradle b/database/app/build.gradle
@@ -30,7 +30,6 @@ dependencies {
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation "com.google.firebase:firebase-database-ktx:19.7.0"
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32"
 }
 
 apply plugin: 'com.google.gms.google-services'
diff --git a/database/build.gradle b/database/build.gradle
@@ -7,9 +7,9 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.3'
+        classpath 'com.android.tools.build:gradle:4.2.0'
         classpath 'com.google.gms:google-services:4.3.5'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.0"
     }
 }
 
diff --git a/dl-invites/app/build.gradle b/dl-invites/app/build.gradle
@@ -34,6 +34,4 @@ dependencies {
 
     implementation 'com.google.android.material:material:1.3.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
-
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32"
 }
diff --git a/dl-invites/build.gradle b/dl-invites/build.gradle
@@ -6,9 +6,9 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.3'
+        classpath 'com.android.tools.build:gradle:4.2.0'
         classpath 'com.google.gms:google-services:4.3.5'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.0"
     }
 }
 
diff --git a/dynamic-links/app/build.gradle b/dynamic-links/app/build.gradle
@@ -33,6 +33,5 @@ dependencies {
     implementation 'com.google.firebase:firebase-analytics:18.0.3'
 
     implementation "com.google.firebase:firebase-database-ktx:19.7.0"
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32"
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
 }
diff --git a/dynamic-links/build.gradle b/dynamic-links/build.gradle
@@ -6,9 +6,9 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.3'
+        classpath 'com.android.tools.build:gradle:4.2.0'
         classpath 'com.google.gms:google-services:4.3.5'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.0"
     }
 }
 
diff --git a/firebaseoptions/app/build.gradle b/firebaseoptions/app/build.gradle
@@ -26,7 +26,6 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation "com.google.firebase:firebase-common-ktx:19.5.0"
     implementation "com.google.firebase:firebase-database-ktx:19.7.0"
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32"
 }
 
 apply plugin: 'com.google.gms.google-services'
diff --git a/firebaseoptions/build.gradle b/firebaseoptions/build.gradle
@@ -6,9 +6,9 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.3'
+        classpath 'com.android.tools.build:gradle:4.2.0'
         classpath 'com.google.gms:google-services:4.3.5'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.0"
     }
 }
 
diff --git a/firestore/app/build.gradle b/firestore/app/build.gradle
@@ -46,7 +46,6 @@ dependencies {
     implementation "com.google.firebase:firebase-auth:20.0.4"
     implementation "com.google.android.gms:play-services-auth:19.0.0"
     implementation "com.google.firebase:firebase-functions-ktx:19.2.0"
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32"
 
     // GeoFire (for Geoqueries solution)
     implementation "com.firebase:geofire-android-common:3.1.0"
diff --git a/firestore/build.gradle b/firestore/build.gradle
@@ -7,9 +7,9 @@ buildscript {
         mavenLocal()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.3'
+        classpath 'com.android.tools.build:gradle:4.2.0'
         classpath 'com.google.gms:google-services:4.3.5'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.0"
     }
 }
 
diff --git a/functions/app/build.gradle b/functions/app/build.gradle
@@ -24,7 +24,6 @@ android {
 dependencies {
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32"
 
     implementation "com.google.firebase:firebase-functions-ktx:19.2.0"
 }
diff --git a/functions/build.gradle b/functions/build.gradle
@@ -6,9 +6,9 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.3'
+        classpath 'com.android.tools.build:gradle:4.2.0'
         classpath 'com.google.gms:google-services:4.3.5'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.0"
     }
 }
 
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-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/inappmessaging/app/build.gradle b/inappmessaging/app/build.gradle
@@ -33,6 +33,4 @@ dependencies {
 
     // The Firebase SDK for Google Analytics is required to use In-App Messaging.
     implementation 'com.google.firebase:firebase-analytics:18.0.3'
-    
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32"
 }
diff --git a/inappmessaging/build.gradle b/inappmessaging/build.gradle
@@ -6,9 +6,9 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.3'
+        classpath 'com.android.tools.build:gradle:4.2.0'
         classpath 'com.google.gms:google-services:4.3.5'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.0"
     }
 }
 
diff --git a/installations/app/build.gradle b/installations/app/build.gradle
@@ -25,7 +25,6 @@ android {
 
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:1.4.32"
     implementation 'androidx.core:core-ktx:1.3.2'
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
diff --git a/installations/build.gradle b/installations/build.gradle
@@ -5,9 +5,9 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:4.1.3"
+        classpath "com.android.tools.build:gradle:4.2.0"
         classpath 'com.google.gms:google-services:4.3.5'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.0"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/messaging/app/build.gradle b/messaging/app/build.gradle
@@ -31,7 +31,6 @@ dependencies {
     implementation 'com.google.firebase:firebase-analytics:18.0.3'
 
     implementation "com.google.android.gms:play-services-auth:19.0.0"
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32"
 }
 
 apply plugin: 'com.google.gms.google-services'
diff --git a/messaging/build.gradle b/messaging/build.gradle
@@ -6,9 +6,9 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.3'
+        classpath 'com.android.tools.build:gradle:4.2.0'
         classpath 'com.google.gms:google-services:4.3.5'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.0"
     }
 }
 
diff --git a/ml-functions/build.gradle b/ml-functions/build.gradle
@@ -6,9 +6,9 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.3'
+        classpath 'com.android.tools.build:gradle:4.2.0'
         classpath 'com.google.gms:google-services:4.3.5'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.0"
     }
 }
 
diff --git a/mlkit/app/build.gradle b/mlkit/app/build.gradle
@@ -41,8 +41,6 @@ dependencies {
     // Image Labeling model.
     implementation 'com.google.android.gms:play-services-vision:20.1.3'
     implementation 'com.google.android.gms:play-services-vision-common:19.1.3'
-
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32"
 }
 
 apply plugin: 'com.google.gms.google-services'
diff --git a/mlkit/build.gradle b/mlkit/build.gradle
@@ -6,9 +6,9 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.3'
+        classpath 'com.android.tools.build:gradle:4.2.0'
         classpath 'com.google.gms:google-services:4.3.5'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.0"
     }
 }
 
diff --git a/perf/app/build.gradle b/perf/app/build.gradle
@@ -26,5 +26,4 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation "com.google.firebase:firebase-config-ktx:20.0.4"
     implementation "com.google.firebase:firebase-perf-ktx:19.1.1"
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32"
 }
diff --git a/perf/build.gradle b/perf/build.gradle
@@ -6,9 +6,9 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.3'
+        classpath 'com.android.tools.build:gradle:4.2.0'
         classpath 'com.google.gms:google-services:4.3.5'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.0"
     }
 }
 
diff --git a/predictions/app/build.gradle b/predictions/app/build.gradle
@@ -27,8 +27,7 @@ dependencies {
     implementation 'androidx.browser:browser:1.0.0'
     implementation 'androidx.appcompat:appcompat:1.2.0'
 
-    implementation "com.google.firebase:firebase-ads:20.0.0"
+    implementation "com.google.firebase:firebase-ads:20.1.0"
     implementation "com.google.firebase:firebase-analytics:18.0.3"
     implementation "com.google.firebase:firebase-config-ktx:20.0.4"
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32"
 }
diff --git a/predictions/build.gradle b/predictions/build.gradle
@@ -6,9 +6,9 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.3'
+        classpath 'com.android.tools.build:gradle:4.2.0'
         classpath 'com.google.gms:google-services:4.3.5'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.0"
     }
 }
 
diff --git a/storage/app/build.gradle b/storage/app/build.gradle
@@ -31,7 +31,6 @@ dependencies {
     annotationProcessor 'com.github.bumptech.glide:compiler:4.12.0'
     kapt 'com.github.bumptech.glide:compiler:4.12.0'
 
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32"
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
 }
 
diff --git a/storage/build.gradle b/storage/build.gradle
diff --git a/tasks/app/build.gradle b/tasks/app/build.gradle
diff --git a/tasks/build.gradle b/tasks/build.gradle
diff --git a/test-lab/app/build.gradle b/test-lab/app/build.gradle
diff --git a/test-lab/build.gradle b/test-lab/build.gradle

Original file line number	Diff line number	Diff line change
`@@ -6,9 +6,9 @@ buildscript {`
`6`	`6`	`jcenter()`
`7`	`7`	`}`
`8`	`8`	`dependencies {`
`9`		`- classpath 'com.android.tools.build:gradle:4.1.3'`
	`9`	`+ classpath 'com.android.tools.build:gradle:4.2.0'`
`10`	`10`	`classpath 'com.google.gms:google-services:4.3.5'`
`11`		`- classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32"`
	`11`	`+ classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.0"`
`12`	`12`	`}`
`13`	`13`	`}`
`14`	`14`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,6 @@ dependencies {`
`25`	`25`	`implementation 'androidx.legacy:legacy-support-v4:1.0.0'`
`26`	`26`	`implementation 'androidx.appcompat:appcompat:1.2.0'`
`27`	`27`	`implementation "com.google.firebase:firebase-appindexing:19.2.0"`
`28`		`- implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32"`
`29`	`28`	`implementation 'androidx.constraintlayout:constraintlayout:2.0.4'`
`30`	`29`	`}`
`31`	`30`
Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,6 @@ android {`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`dependencies {`
`25`		`- implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32"`
`26`		`-`
`27`	`25`	`implementation 'androidx.legacy:legacy-support-v4:1.0.0'`
`28`	`26`	`implementation 'androidx.appcompat:appcompat:1.2.0'`
`29`	`27`	`implementation 'androidx.browser:browser:1.0.0'`
Original file line number	Diff line number	Diff line change
`@@ -6,9 +6,9 @@ buildscript {`
`6`	`6`	`mavenCentral()`
`7`	`7`	`}`
`8`	`8`	`dependencies {`
`9`		`- classpath 'com.android.tools.build:gradle:4.1.3'`
	`9`	`+ classpath 'com.android.tools.build:gradle:4.2.0'`
`10`	`10`	`classpath 'com.google.gms:google-services:4.3.5'`
`11`		`- classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32"`
	`11`	`+ classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.0"`
`12`	`12`	`}`
`13`	`13`	`}`
`14`	`14`
Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,6 @@ dependencies {`
`31`	`31`	`// For an optimal experience using Crashlytics, add the Firebase SDK`
`32`	`32`	`// for Google Analytics. This is recommended, but not required.`
`33`	`33`	`implementation 'com.google.firebase:firebase-analytics:18.0.3'`
`34`		`-`
`35`		`- implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32"`
`36`	`34`	`}`
`37`	`35`
`38`	`36`	`apply plugin: 'com.google.gms.google-services'`