Skip to content

Commit d60225a

Browse files
thatfiredevthatfiredev
authored
chore: upgrade to AGP 8.0 (#442)
* chore: update AGP to 8.0 * ci: update gh actions to use jdk17 * MaxPermSize --> MaxMetaspaceSize * chore(*): use java 11 for compilation * chore(storage): use ksp instead of kapt * chore(storage): workaround for ksp
1 parent 8d1e40d commit d60225a

File tree

23 files changed

+158
-24
lines changed

23 files changed

+158
-24
lines changed

‎.github/workflows/android.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ jobs:
99
runs-on: ubuntu-latest
1010
steps:
1111
- uses: actions/checkout@v2
12-
- name: set up JDK 11
12+
- name: set up JDK 17
1313
uses: actions/setup-java@v1
1414
with:
15-
java-version: 11
15+
java-version: 17
1616
- name: Check Snippets
1717
run: python scripts/checksnippets.py
1818
- name: Install NDK

‎admob/app/build.gradle

+7
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,13 @@ android {
1919
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
2020
}
2121
}
22+
compileOptions {
23+
sourceCompatibility JavaVersion.VERSION_11
24+
targetCompatibility JavaVersion.VERSION_11
25+
}
26+
kotlinOptions {
27+
jvmTarget = '11'
28+
}
2229
namespace 'devrel.firebase.google.com.firebaseoptions'
2330
}
2431

‎analytics/app/build.gradle

+7
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,13 @@ android {
1919
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
2020
}
2121
}
22+
compileOptions {
23+
sourceCompatibility JavaVersion.VERSION_11
24+
targetCompatibility JavaVersion.VERSION_11
25+
}
26+
kotlinOptions {
27+
jvmTarget = '11'
28+
}
2229
namespace 'com.google.firebase.example.analytics'
2330
}
2431
repositories {

‎appcheck/app/build.gradle

+5-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,11 @@ android {
2222
}
2323
}
2424
compileOptions {
25-
sourceCompatibility JavaVersion.VERSION_1_8
26-
targetCompatibility JavaVersion.VERSION_1_8
25+
sourceCompatibility JavaVersion.VERSION_11
26+
targetCompatibility JavaVersion.VERSION_11
27+
}
28+
kotlinOptions {
29+
jvmTarget = '11'
2730
}
2831
namespace 'com.google.firebase.example.appcheck'
2932
}

‎auth/app/build.gradle

+7
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,13 @@ android {
1818
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
1919
}
2020
}
21+
compileOptions {
22+
sourceCompatibility JavaVersion.VERSION_11
23+
targetCompatibility JavaVersion.VERSION_11
24+
}
25+
kotlinOptions {
26+
jvmTarget = '11'
27+
}
2128
namespace 'com.google.firebase.quickstart.auth'
2229
}
2330

‎build.gradle

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
mavenCentral()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:7.4.2'
8+
classpath 'com.android.tools.build:gradle:8.0.0'
99
classpath 'com.google.gms:google-services:4.3.15'
1010
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20"
1111
}
@@ -79,4 +79,5 @@ task("ktlint", type: JavaExec, group: "verification") {
7979
"--reporter=checkstyle,output=${outputFile}",
8080
"**/*.kt",
8181
]
82+
jvmArgs "--add-opens=java.base/java.lang=ALL-UNNAMED"
8283
}

‎config/app/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ android {
2323
}
2424
}
2525
compileOptions {
26-
sourceCompatibility JavaVersion.VERSION_1_8
27-
targetCompatibility JavaVersion.VERSION_1_8
26+
sourceCompatibility JavaVersion.VERSION_11
27+
targetCompatibility JavaVersion.VERSION_11
2828
}
2929
kotlinOptions {
30-
jvmTarget = '1.8'
30+
jvmTarget = '11'
3131
}
3232
namespace 'com.google.firebase.quickstart.config'
3333
}

‎crashlytics/app/build.gradle

+7
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,13 @@ android {
2020
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
2121
}
2222
}
23+
compileOptions {
24+
sourceCompatibility JavaVersion.VERSION_11
25+
targetCompatibility JavaVersion.VERSION_11
26+
}
27+
kotlinOptions {
28+
jvmTarget = '11'
29+
}
2330
namespace 'com.google.firebase.example.crashlytics'
2431
}
2532

‎database/app/build.gradle

+11-4
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,17 @@ android {
1818
}
1919
}
2020
packagingOptions {
21-
// Required to avoid clashes in Jackson.
22-
exclude 'META-INF/LICENSE'
23-
exclude 'META-INF/LICENSE-FIREBASE.txt'
24-
exclude 'META-INF/NOTICE'
21+
resources {
22+
// Required to avoid clashes in Jackson.
23+
excludes += ['META-INF/LICENSE', 'META-INF/LICENSE-FIREBASE.txt', 'META-INF/NOTICE']
24+
}
25+
}
26+
compileOptions {
27+
sourceCompatibility JavaVersion.VERSION_11
28+
targetCompatibility JavaVersion.VERSION_11
29+
}
30+
kotlinOptions {
31+
jvmTarget = '11'
2532
}
2633
namespace 'com.google.firebase.referencecode.database'
2734
}

‎dl-invites/app/build.gradle

+7
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,13 @@ android {
1818
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
1919
}
2020
}
21+
compileOptions {
22+
sourceCompatibility JavaVersion.VERSION_11
23+
targetCompatibility JavaVersion.VERSION_11
24+
}
25+
kotlinOptions {
26+
jvmTarget = '11'
27+
}
2128
namespace 'com.google.firebase.dynamicinvites'
2229
}
2330

‎dynamic-links/app/build.gradle

+7
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,13 @@ android {
1919
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
2020
}
2121
}
22+
compileOptions {
23+
sourceCompatibility JavaVersion.VERSION_11
24+
targetCompatibility JavaVersion.VERSION_11
25+
}
26+
kotlinOptions {
27+
jvmTarget = '11'
28+
}
2229
namespace 'com.google.firebase.quickstart.dynamiclinks'
2330
}
2431

‎firebaseoptions/app/build.gradle

+7
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,13 @@ android {
1818
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
1919
}
2020
}
21+
compileOptions {
22+
sourceCompatibility JavaVersion.VERSION_11
23+
targetCompatibility JavaVersion.VERSION_11
24+
}
25+
kotlinOptions {
26+
jvmTarget = '11'
27+
}
2128
namespace 'devrel.firebase.google.com.firebaseoptions'
2229
}
2330

‎firestore/app/build.gradle

+10-3
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,24 @@ android {
1414
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1515
}
1616

17-
lintOptions {
18-
warning 'InvalidPackage'
19-
}
2017

2118
buildTypes {
2219
release {
2320
minifyEnabled false
2421
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
2522
}
2623
}
24+
compileOptions {
25+
sourceCompatibility JavaVersion.VERSION_11
26+
targetCompatibility JavaVersion.VERSION_11
27+
}
28+
kotlinOptions {
29+
jvmTarget = '11'
30+
}
2731
namespace 'com.google.example.firestore'
32+
lint {
33+
warning 'InvalidPackage'
34+
}
2835
}
2936

3037
repositories {

‎functions/app/build.gradle

+7
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,13 @@ android {
1818
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
1919
}
2020
}
21+
compileOptions {
22+
sourceCompatibility JavaVersion.VERSION_11
23+
targetCompatibility JavaVersion.VERSION_11
24+
}
25+
kotlinOptions {
26+
jvmTarget = '11'
27+
}
2128
namespace 'devrel.firebase.google.com.functions'
2229
}
2330

‎gradle.properties

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1-
org.gradle.jvmargs=-Xmx6g -XX:MaxPermSize=6g -XX:ReservedCodeCacheSize=2g -Dfile.encoding=UTF-8
1+
org.gradle.jvmargs=-Xmx6g -XX:MaxMetaspaceSize=6g -XX:ReservedCodeCacheSize=2g -Dfile.encoding=UTF-8
22
org.gradle.parallel=true
33
org.gradle.configureondemand=true
44
org.gradle.caching=true
55

66
android.enableJetifier=true
77
android.useAndroidX=true
8+
android.defaults.buildfeatures.buildconfig=true
9+
android.nonTransitiveRClass=false
10+
android.nonFinalResIds=false

‎gradle/wrapper/gradle-wrapper.properties

+1-1
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-7.5.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎inappmessaging/app/build.gradle

+8-1
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,15 @@ android {
1919
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
2020
}
2121
}
22+
compileOptions {
23+
sourceCompatibility JavaVersion.VERSION_11
24+
targetCompatibility JavaVersion.VERSION_11
25+
}
26+
kotlinOptions {
27+
jvmTarget = '11'
28+
}
2229
namespace 'devrel.firebase.google.com.firebaseoptions'
23-
lintOptions {
30+
lint {
2431
// TODO(thatfiredev): Remove this once
2532
// https://github.com/bumptech/glide/issues/4940 is fixed
2633
disable 'NotificationPermission'

‎installations/app/build.gradle

+7
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,13 @@ android {
2121
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
2222
}
2323
}
24+
compileOptions {
25+
sourceCompatibility JavaVersion.VERSION_11
26+
targetCompatibility JavaVersion.VERSION_11
27+
}
28+
kotlinOptions {
29+
jvmTarget = '11'
30+
}
2431
namespace 'com.google.samples.snippet'
2532
}
2633

‎messaging/app/build.gradle

+7
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,13 @@ android {
1919
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
2020
}
2121
}
22+
compileOptions {
23+
sourceCompatibility JavaVersion.VERSION_11
24+
targetCompatibility JavaVersion.VERSION_11
25+
}
26+
kotlinOptions {
27+
jvmTarget = '11'
28+
}
2229
namespace 'com.google.firebase.example.messaging'
2330
}
2431

‎perf/app/build.gradle

+7
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,13 @@ android {
2020
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
2121
}
2222
}
23+
compileOptions {
24+
sourceCompatibility JavaVersion.VERSION_11
25+
targetCompatibility JavaVersion.VERSION_11
26+
}
27+
kotlinOptions {
28+
jvmTarget = '11'
29+
}
2330
namespace 'devrel.firebase.google.com.firebaseoptions'
2431
}
2532

‎storage/app/build.gradle

+21-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
apply plugin: 'com.android.application'
2-
apply plugin: 'kotlin-android'
3-
apply plugin: 'kotlin-kapt'
1+
plugins {
2+
id 'com.android.application'
3+
id 'kotlin-android'
4+
id 'com.google.devtools.ksp' version '1.8.20-1.0.10'
5+
}
46

57
android {
68
compileSdkVersion 33
@@ -19,11 +21,25 @@ android {
1921
}
2022
}
2123
namespace 'com.google.firebase.referencecode.storage'
22-
lintOptions {
24+
lint {
2325
// TODO(thatfiredev): Remove this once
2426
// https://github.com/bumptech/glide/issues/4940 is fixed
2527
disable 'NotificationPermission'
2628
}
29+
compileOptions {
30+
sourceCompatibility JavaVersion.VERSION_11
31+
targetCompatibility JavaVersion.VERSION_11
32+
}
33+
kotlinOptions {
34+
jvmTarget = '11'
35+
}
36+
37+
// Workaround until https://youtrack.jetbrains.com/issue/KT-55947 is fixed
38+
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
39+
kotlinOptions {
40+
jvmTarget = "11"
41+
}
42+
}
2743
}
2844

2945
dependencies {
@@ -33,8 +49,7 @@ dependencies {
3349

3450
implementation 'com.firebaseui:firebase-ui-storage:8.0.2'
3551
implementation 'com.github.bumptech.glide:glide:4.15.1'
36-
annotationProcessor 'com.github.bumptech.glide:compiler:4.15.1'
37-
kapt 'com.github.bumptech.glide:compiler:4.15.1'
52+
ksp 'com.github.bumptech.glide:ksp:4.15.1'
3853

3954
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
4055
}

‎tasks/app/build.gradle

+7
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,13 @@ android {
1919
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
2020
}
2121
}
22+
compileOptions {
23+
sourceCompatibility JavaVersion.VERSION_11
24+
targetCompatibility JavaVersion.VERSION_11
25+
}
26+
kotlinOptions {
27+
jvmTarget = '11'
28+
}
2229
namespace 'com.google.firebase.quickstart.tasks'
2330
}
2431

‎test-lab/app/build.gradle

+7
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,13 @@ android {
1818
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
1919
}
2020
}
21+
compileOptions {
22+
sourceCompatibility JavaVersion.VERSION_11
23+
targetCompatibility JavaVersion.VERSION_11
24+
}
25+
kotlinOptions {
26+
jvmTarget = '11'
27+
}
2128
namespace 'devrel.firebase.google.com.firebaseoptions'
2229
}
2330

0 commit comments

Comments
 (0)