Skip to content

chore: AGP 8 updates #11318

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Zazo032 wants to merge 21 commits into from
Closed

chore: AGP 8 updates #11318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
9699663
Android-related updates
Zazo032 Jul 19, 2023
a7d034a
Update versions
Zazo032 Jul 19, 2023
fdb5325
Fix stack_trace version
Zazo032 Jul 19, 2023
44bc9d8
Fix twitter_login version
Zazo032 Jul 19, 2023
ac9f85a
Fix flutter_facebook_auth
Zazo032 Jul 19, 2023
b2e6753
Fix analyzer
Zazo032 Jul 19, 2023
ca4d0fd
Format java file
Zazo032 Jul 19, 2023
bfd51a2
Clang format
Zazo032 Jul 19, 2023
b4e4cce
Use Java SDK 17
Zazo032 Jul 19, 2023
01c03e3
Add missing namespace
Zazo032 Jul 19, 2023
d3230e9
Revert pubspec changes
Zazo032 Jul 30, 2023
0c00c7f
Merge branch 'master' into master
Zazo032 Jul 30, 2023
9093907
Fix
Zazo032 Jul 30, 2023
ff772a9
Fix
Zazo032 Jul 30, 2023
6edea9e
`compileSdkVersion` -> `compileSdk`
Zazo032 Aug 1, 2023
53677c3
Revert pubspec+example changes
Zazo032 Aug 1, 2023
e88bbb1
Revert pubspec
Zazo032 Aug 1, 2023
f6cfd41
Revert variable name
Zazo032 Aug 1, 2023
8313e8d
Update example's `compileSdk` to 33
Zazo032 Aug 2, 2023
0384b20
Merge pull request #1 from firebase/master
Zazo032 Aug 8, 2023
4e4d48f
Merge branch 'master' into master
Zazo032 Aug 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/e2e_tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
- uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2
with:
distribution: 'temurin'
java-version: '11'
java-version: '17'
- uses: actions/cache@69d9d449aced6a2ede0bc19182fadc3a0a42d2b0
name: Gradle Cache
with:
Expand Down Expand Up @@ -113,7 +113,7 @@ jobs:
- uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2
with:
distribution: 'temurin'
java-version: '11'
java-version: '17'
- uses: hendrikmuhs/ccache-action@ca3acd2731eef11f1572ccb126356c2f9298d35e
name: Xcode Compile Cache
with:
Expand Down Expand Up @@ -188,7 +188,7 @@ jobs:
- uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2
with:
distribution: 'temurin'
java-version: '11'
java-version: '17'
- uses: hendrikmuhs/ccache-action@ca3acd2731eef11f1572ccb126356c2f9298d35e
name: Xcode Compile Cache
with:
Expand Down Expand Up @@ -257,7 +257,7 @@ jobs:
- uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2
with:
distribution: 'temurin'
java-version: '11'
java-version: '17'
- uses: subosito/flutter-action@48cafc24713cca54bbe03cdc3a423187d413aafa
with:
channel: 'stable'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/firebase_firestore_odm.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
- uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2
with:
distribution: 'temurin'
java-version: '11'
java-version: '17'
- uses: subosito/flutter-action@48cafc24713cca54bbe03cdc3a423187d413aafa
with:
channel: 'stable'
Expand Down
8 changes: 6 additions & 2 deletions packages/cloud_firestore/cloud_firestore/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:8.0.1'
classpath 'com.android.tools.build:gradle:8.0.2'
}
}

Expand Down Expand Up @@ -39,7 +39,11 @@ android {
if (project.android.hasProperty("namespace")) {
namespace 'io.flutter.plugins.firebase.firestore'
}
compileSdkVersion 31
buildFeatures {
buildConfig = true
}

compileSdk 33
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
Expand Down
4 changes: 2 additions & 2 deletions packages/cloud_firestore/cloud_firestore/example/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ apply plugin: 'kotlin-android'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

android {
compileSdkVersion 33
compileSdk 33

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
Expand Down Expand Up @@ -68,5 +68,5 @@ flutter {
}

dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
}
4 changes: 2 additions & 2 deletions packages/cloud_firestore/cloud_firestore/example/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
buildscript {
ext.kotlin_version = '1.7.10'
ext.kotlin_version = '1.9.0'
repositories {
google()
mavenCentral()
}

dependencies {
classpath 'com.android.tools.build:gradle:7.4.2'
classpath 'com.android.tools.build:gradle:8.0.2'
// START: FlutterFire Configuration
classpath 'com.google.gms:google-services:4.3.15'
// END: FlutterFire Configuration
Expand Down
1 change: 0 additions & 1 deletion packages/cloud_firestore/cloud_firestore/example/android/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
org.gradle.jvmargs=-Xmx1536M
android.useAndroidX=true
android.enableJetifier=true
android.defaults.buildfeatures.buildconfig=true
android.nonTransitiveRClass=false
android.nonFinalResIds=false
2 changes: 1 addition & 1 deletion .../cloud_firestore/cloud_firestore/example/android/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
9 changes: 6 additions & 3 deletions packages/cloud_functions/cloud_functions/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:8.0.1'
classpath 'com.android.tools.build:gradle:8.0.2'
}
}

Expand Down Expand Up @@ -39,8 +39,11 @@ android {
if (project.android.hasProperty("namespace")) {
namespace 'io.flutter.plugins.firebase.functions'
}
buildFeatures {
buildConfig = true
}

compileSdkVersion 31
compileSdk 33
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
Expand All @@ -56,7 +59,7 @@ android {
api firebaseCoreProject
implementation platform("com.google.firebase:firebase-bom:${getRootProjectExtOrCoreProperty("FirebaseSDKVersion", firebaseCoreProject)}")
implementation 'com.google.firebase:firebase-functions'
implementation 'androidx.annotation:annotation:1.0.0'
implementation 'androidx.annotation:annotation:1.6.0'
}
}

Expand Down
2 changes: 1 addition & 1 deletion ...ud_functions/cloud_functions/example/android/app/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
6 changes: 3 additions & 3 deletions packages/cloud_functions/cloud_functions/example/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
buildscript {
repositories {
google()
jcenter()
mavenCentral()
}

dependencies {
classpath 'com.android.tools.build:gradle:8.0.1'
classpath 'com.android.tools.build:gradle:8.0.2'
classpath 'com.google.gms:google-services:4.3.15'
}
}

allprojects {
repositories {
google()
jcenter()
mavenCentral()
}
}

Expand Down
1 change: 0 additions & 1 deletion packages/cloud_functions/cloud_functions/example/android/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
org.gradle.jvmargs=-Xmx1536M
android.useAndroidX=true
android.enableJetifier=true
android.defaults.buildfeatures.buildconfig=true
android.nonTransitiveRClass=false
android.nonFinalResIds=false
2 changes: 1 addition & 1 deletion .../cloud_functions/cloud_functions/example/android/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
9 changes: 6 additions & 3 deletions packages/firebase_analytics/firebase_analytics/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:8.0.1'
classpath 'com.android.tools.build:gradle:8.0.2'
}
}

Expand Down Expand Up @@ -39,8 +39,11 @@ android {
if (project.android.hasProperty("namespace")) {
namespace 'io.flutter.plugins.firebase.analytics'
}

compileSdkVersion 31
buildFeatures {
buildConfig = true
}

compileSdk 33

defaultConfig {
minSdkVersion 19
Expand Down
3 changes: 1 addition & 2 deletions packages/firebase_analytics/firebase_analytics/android/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
org.gradle.jvmargs=-Xmx1536M
android.useAndroidX=true
android.enableJetifier=true
android.defaults.buildfeatures.buildconfig=true
android.nonTransitiveRClass=false
android.nonFinalResIds=false
android.nonFinalResIds=false
2 changes: 1 addition & 1 deletion packages/firebase_analytics/firebase_analytics/example/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ apply plugin: 'com.google.gms.google-services'

android {
namespace 'io.flutter.plugins.firebase.analytics.example'
compileSdkVersion 33
compileSdk 33

lintOptions {
disable 'InvalidPackage'
Expand Down
2 changes: 1 addition & 1 deletion ...analytics/firebase_analytics/example/android/app/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
4 changes: 1 addition & 3 deletions packages/firebase_analytics/firebase_analytics/example/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,18 @@
buildscript {
repositories {
google()
jcenter()
mavenLocal()
}

dependencies {
classpath 'com.android.tools.build:gradle:8.0.1'
classpath 'com.android.tools.build:gradle:8.0.2'
classpath 'com.google.gms:google-services:4.3.15'
}
}

allprojects {
repositories {
google()
jcenter()
mavenLocal()
}
}
Expand Down
3 changes: 1 addition & 2 deletions packages/firebase_analytics/firebase_analytics/example/android/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
org.gradle.jvmargs=-Xmx1536M
android.useAndroidX=true
android.enableJetifier=true
android.defaults.buildfeatures.buildconfig=true
android.nonTransitiveRClass=false
android.nonFinalResIds=false
android.nonFinalResIds=false
2 changes: 1 addition & 1 deletion ...ase_analytics/firebase_analytics/example/android/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
7 changes: 5 additions & 2 deletions packages/firebase_app_check/firebase_app_check/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:4.1.0'
classpath 'com.android.tools.build:gradle:8.0.2'
}
}

Expand Down Expand Up @@ -39,8 +39,11 @@ android {
if (project.android.hasProperty("namespace")) {
namespace 'io.flutter.plugins.firebase.appcheck'
}
buildFeatures {
buildConfig = true
}

compileSdkVersion 31
compileSdk 33
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
Expand Down
2 changes: 1 addition & 1 deletion ...es/firebase_app_check/firebase_app_check/android/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion packages/firebase_app_check/firebase_app_check/example/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

android {
namespace "io.flutter.plugins.firebase.appcheck.example"
compileSdkVersion 33
compileSdk 33

defaultConfig {
applicationId "io.flutter.plugins.firebase.appcheck.example"
Expand Down
2 changes: 1 addition & 1 deletion packages/firebase_app_check/firebase_app_check/example/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:7.4.2'
classpath 'com.android.tools.build:gradle:8.0.2'
// START: FlutterFire Configuration
classpath 'com.google.gms:google-services:4.3.15'
// END: FlutterFire Configuration
Expand Down
3 changes: 1 addition & 2 deletions packages/firebase_app_check/firebase_app_check/example/android/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
org.gradle.jvmargs=-Xmx1536M
android.useAndroidX=true
android.enableJetifier=true
android.defaults.buildfeatures.buildconfig=true
android.nonTransitiveRClass=false
android.nonFinalResIds=false
android.nonFinalResIds=false
2 changes: 1 addition & 1 deletion ...ase_app_check/firebase_app_check/example/android/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
7 changes: 5 additions & 2 deletions packages/firebase_app_installations/firebase_app_installations/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,11 @@ android {
if (project.android.hasProperty("namespace")) {
namespace 'io.flutter.plugins.firebase.installations.firebase_app_installations'
}
buildFeatures {
buildConfig = true
}

compileSdkVersion 31
compileSdk 33

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
Expand All @@ -59,7 +62,7 @@ android {
}

dependencies {
implementation 'androidx.annotation:annotation:1.1.0'
implementation 'androidx.annotation:annotation:1.6.0'
}

apply from: file("./user-agent.gradle")
2 changes: 1 addition & 1 deletion ...installations/firebase_app_installations/android/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
4 changes: 2 additions & 2 deletions ...es/firebase_app_installations/firebase_app_installations/example/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

android {
namespace 'io.flutter.plugins.firebase.installations.example'
compileSdkVersion 33
compileSdk 33

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
Expand Down Expand Up @@ -66,5 +66,5 @@ flutter {
}

dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
}
4 changes: 2 additions & 2 deletions packages/firebase_app_installations/firebase_app_installations/example/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
buildscript {
ext.kotlin_version = '1.7.10'
ext.kotlin_version = '1.9.0'
repositories {
google()
mavenCentral()
}

dependencies {
classpath 'com.android.tools.build:gradle:8.0.1'
classpath 'com.android.tools.build:gradle:8.0.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'com.google.gms:google-services:4.3.15'
}
Expand Down
Loading