Skip to content

Commit 6ec6b5f

Browse files
thatfiredevdpebot
thatfiredev
and
dpebot
authored
upgrade to AGP 4.2, update dependencies and remove kotlin stdlib (firebase#294)
Co-authored-by: DPE bot <[email protected]>
1 parent 7484726 commit 6ec6b5f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+48
-74
lines changed

‎admob/app/build.gradle

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,17 @@ dependencies {
2626
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
2727
implementation 'androidx.browser:browser:1.0.0'
2828
implementation 'androidx.appcompat:appcompat:1.2.0'
29-
implementation "com.google.firebase:firebase-ads:20.0.0"
29+
implementation "com.google.firebase:firebase-ads:20.1.0"
3030
implementation "androidx.constraintlayout:constraintlayout:2.0.4"
3131
implementation "androidx.multidex:multidex:2.0.1"
3232

3333
// [START gradle_play_config]
34-
implementation 'com.google.android.gms:play-services-ads:20.0.0'
34+
implementation 'com.google.android.gms:play-services-ads:20.1.0'
3535
// [END gradle_play_config]
3636

3737
// For an optimal experience using AdMob, add the Firebase SDK
3838
// for Google Analytics. This is recommended, but not required.
3939
implementation 'com.google.firebase:firebase-analytics:18.0.3'
40-
41-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32"
4240
}
4341

4442
apply plugin: 'com.google.gms.google-services'

‎admob/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ buildscript {
66
jcenter()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:4.1.3'
9+
classpath 'com.android.tools.build:gradle:4.2.0'
1010
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"
1212
}
1313
}
1414

‎analytics/app/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ android {
2424
dependencies {
2525
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
2626
implementation 'androidx.appcompat:appcompat:1.2.0'
27-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32"
2827

2928
implementation "com.google.firebase:firebase-analytics:18.0.3"
3029
implementation "com.google.firebase:firebase-analytics-ktx:18.0.3"

‎analytics/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ buildscript {
66
jcenter()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:4.1.3'
9+
classpath 'com.android.tools.build:gradle:4.2.0'
1010
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"
1212
}
1313
}
1414

‎appindexing/app/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ dependencies {
2525
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
2626
implementation 'androidx.appcompat:appcompat:1.2.0'
2727
implementation "com.google.firebase:firebase-appindexing:19.2.0"
28-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32"
2928
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
3029
}
3130

‎appindexing/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ buildscript {
66
jcenter()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:4.1.3'
9+
classpath 'com.android.tools.build:gradle:4.2.0'
1010
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"
1212
}
1313
}
1414

‎auth/app/build.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ android {
2222
}
2323

2424
dependencies {
25-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32"
26-
2725
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
2826
implementation 'androidx.appcompat:appcompat:1.2.0'
2927
implementation 'androidx.browser:browser:1.0.0'

‎auth/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ buildscript {
66
jcenter()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:4.1.3'
9+
classpath 'com.android.tools.build:gradle:4.2.0'
1010
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"
1212
}
1313
}
1414

‎build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ buildscript {
66
mavenCentral()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:4.1.3'
9+
classpath 'com.android.tools.build:gradle:4.2.0'
1010
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"
1212
}
1313
}
1414

‎crashlytics/app/build.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ dependencies {
3131
// For an optimal experience using Crashlytics, add the Firebase SDK
3232
// for Google Analytics. This is recommended, but not required.
3333
implementation 'com.google.firebase:firebase-analytics:18.0.3'
34-
35-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32"
3634
}
3735

3836
apply plugin: 'com.google.gms.google-services'

‎crashlytics/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ buildscript {
66
jcenter()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:4.1.3'
9+
classpath 'com.android.tools.build:gradle:4.2.0'
1010
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"
1212
}
1313
}
1414

‎database/app/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ dependencies {
3030
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
3131
implementation 'androidx.appcompat:appcompat:1.2.0'
3232
implementation "com.google.firebase:firebase-database-ktx:19.7.0"
33-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32"
3433
}
3534

3635
apply plugin: 'com.google.gms.google-services'

‎database/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ buildscript {
77
jcenter()
88
}
99
dependencies {
10-
classpath 'com.android.tools.build:gradle:4.1.3'
10+
classpath 'com.android.tools.build:gradle:4.2.0'
1111
classpath 'com.google.gms:google-services:4.3.5'
12-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32"
12+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.0"
1313
}
1414
}
1515

‎dl-invites/app/build.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,4 @@ dependencies {
3434

3535
implementation 'com.google.android.material:material:1.3.0'
3636
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
37-
38-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32"
3937
}

‎dl-invites/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ buildscript {
66
jcenter()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:4.1.3'
9+
classpath 'com.android.tools.build:gradle:4.2.0'
1010
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"
1212
}
1313
}
1414

‎dynamic-links/app/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,5 @@ dependencies {
3333
implementation 'com.google.firebase:firebase-analytics:18.0.3'
3434

3535
implementation "com.google.firebase:firebase-database-ktx:19.7.0"
36-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32"
3736
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
3837
}

‎dynamic-links/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ buildscript {
66
jcenter()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:4.1.3'
9+
classpath 'com.android.tools.build:gradle:4.2.0'
1010
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"
1212
}
1313
}
1414

‎firebaseoptions/app/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ dependencies {
2626
implementation 'androidx.appcompat:appcompat:1.2.0'
2727
implementation "com.google.firebase:firebase-common-ktx:19.5.0"
2828
implementation "com.google.firebase:firebase-database-ktx:19.7.0"
29-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32"
3029
}
3130

3231
apply plugin: 'com.google.gms.google-services'

‎firebaseoptions/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ buildscript {
66
jcenter()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:4.1.3'
9+
classpath 'com.android.tools.build:gradle:4.2.0'
1010
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"
1212
}
1313
}
1414

‎firestore/app/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ dependencies {
4646
implementation "com.google.firebase:firebase-auth:20.0.4"
4747
implementation "com.google.android.gms:play-services-auth:19.0.0"
4848
implementation "com.google.firebase:firebase-functions-ktx:19.2.0"
49-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32"
5049

5150
// GeoFire (for Geoqueries solution)
5251
implementation "com.firebase:geofire-android-common:3.1.0"

‎firestore/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ buildscript {
77
mavenLocal()
88
}
99
dependencies {
10-
classpath 'com.android.tools.build:gradle:4.1.3'
10+
classpath 'com.android.tools.build:gradle:4.2.0'
1111
classpath 'com.google.gms:google-services:4.3.5'
12-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32"
12+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.0"
1313
}
1414
}
1515

‎functions/app/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ android {
2424
dependencies {
2525
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
2626
implementation 'androidx.appcompat:appcompat:1.2.0'
27-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32"
2827

2928
implementation "com.google.firebase:firebase-functions-ktx:19.2.0"
3029
}

‎functions/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ buildscript {
66
jcenter()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:4.1.3'
9+
classpath 'com.android.tools.build:gradle:4.2.0'
1010
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"
1212
}
1313
}
1414

‎gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎inappmessaging/app/build.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,4 @@ dependencies {
3333

3434
// The Firebase SDK for Google Analytics is required to use In-App Messaging.
3535
implementation 'com.google.firebase:firebase-analytics:18.0.3'
36-
37-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32"
3836
}

‎inappmessaging/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ buildscript {
66
jcenter()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:4.1.3'
9+
classpath 'com.android.tools.build:gradle:4.2.0'
1010
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"
1212
}
1313
}
1414

‎installations/app/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ android {
2525

2626
dependencies {
2727
implementation fileTree(dir: "libs", include: ["*.jar"])
28-
implementation "org.jetbrains.kotlin:kotlin-stdlib:1.4.32"
2928
implementation 'androidx.core:core-ktx:1.3.2'
3029
implementation 'androidx.appcompat:appcompat:1.2.0'
3130
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'

‎installations/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ buildscript {
55
jcenter()
66
}
77
dependencies {
8-
classpath "com.android.tools.build:gradle:4.1.3"
8+
classpath "com.android.tools.build:gradle:4.2.0"
99
classpath 'com.google.gms:google-services:4.3.5'
10-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32"
10+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.0"
1111

1212
// NOTE: Do not place your application dependencies here; they belong
1313
// in the individual module build.gradle files

‎messaging/app/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ dependencies {
3131
implementation 'com.google.firebase:firebase-analytics:18.0.3'
3232

3333
implementation "com.google.android.gms:play-services-auth:19.0.0"
34-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32"
3534
}
3635

3736
apply plugin: 'com.google.gms.google-services'

‎messaging/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ buildscript {
66
jcenter()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:4.1.3'
9+
classpath 'com.android.tools.build:gradle:4.2.0'
1010
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"
1212
}
1313
}
1414

‎ml-functions/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ buildscript {
66
jcenter()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:4.1.3'
9+
classpath 'com.android.tools.build:gradle:4.2.0'
1010
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"
1212
}
1313
}
1414

‎mlkit/app/build.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@ dependencies {
4141
// Image Labeling model.
4242
implementation 'com.google.android.gms:play-services-vision:20.1.3'
4343
implementation 'com.google.android.gms:play-services-vision-common:19.1.3'
44-
45-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32"
4644
}
4745

4846
apply plugin: 'com.google.gms.google-services'

‎mlkit/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ buildscript {
66
jcenter()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:4.1.3'
9+
classpath 'com.android.tools.build:gradle:4.2.0'
1010
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"
1212
}
1313
}
1414

‎perf/app/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,4 @@ dependencies {
2626
implementation 'androidx.appcompat:appcompat:1.2.0'
2727
implementation "com.google.firebase:firebase-config-ktx:20.0.4"
2828
implementation "com.google.firebase:firebase-perf-ktx:19.1.1"
29-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32"
3029
}

‎perf/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ buildscript {
66
jcenter()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:4.1.3'
9+
classpath 'com.android.tools.build:gradle:4.2.0'
1010
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"
1212
}
1313
}
1414

‎predictions/app/build.gradle

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@ dependencies {
2727
implementation 'androidx.browser:browser:1.0.0'
2828
implementation 'androidx.appcompat:appcompat:1.2.0'
2929

30-
implementation "com.google.firebase:firebase-ads:20.0.0"
30+
implementation "com.google.firebase:firebase-ads:20.1.0"
3131
implementation "com.google.firebase:firebase-analytics:18.0.3"
3232
implementation "com.google.firebase:firebase-config-ktx:20.0.4"
33-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32"
3433
}

‎predictions/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ buildscript {
66
jcenter()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:4.1.3'
9+
classpath 'com.android.tools.build:gradle:4.2.0'
1010
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"
1212
}
1313
}
1414

‎storage/app/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ dependencies {
3131
annotationProcessor 'com.github.bumptech.glide:compiler:4.12.0'
3232
kapt 'com.github.bumptech.glide:compiler:4.12.0'
3333

34-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32"
3534
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
3635
}
3736

0 commit comments

Comments
 (0)