From 8e341809f0061306c5445cc178c8feac8cdb468a Mon Sep 17 00:00:00 2001 From: Volodymyr Date: Fri, 13 Oct 2023 11:20:56 +0300 Subject: [PATCH 1/7] refactor(ci): Remove redundant Java installation step --- .github/workflows/e2e_tests.yaml | 20 ------------------- .github/workflows/firebase_firestore_odm.yaml | 4 ---- 2 files changed, 24 deletions(-) diff --git a/.github/workflows/e2e_tests.yaml b/.github/workflows/e2e_tests.yaml index f8b3945a31c4..e50642cc6ef0 100644 --- a/.github/workflows/e2e_tests.yaml +++ b/.github/workflows/e2e_tests.yaml @@ -38,10 +38,6 @@ jobs: name: Install Node.js 16 with: node-version: '16' - - uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 - with: - distribution: 'temurin' - java-version: '11' - uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 name: Gradle Cache with: @@ -111,10 +107,6 @@ jobs: name: Install Node.js 16 with: node-version: '16' - - uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 - with: - distribution: 'temurin' - java-version: '11' - uses: hendrikmuhs/ccache-action@ca3acd2731eef11f1572ccb126356c2f9298d35e name: Xcode Compile Cache with: @@ -186,10 +178,6 @@ jobs: name: Install Node.js 16 with: node-version: '16' - - uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 - with: - distribution: 'temurin' - java-version: '11' - uses: hendrikmuhs/ccache-action@ca3acd2731eef11f1572ccb126356c2f9298d35e name: Xcode Compile Cache with: @@ -255,10 +243,6 @@ jobs: name: Install Node.js 16 with: node-version: '16' - - uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 - with: - distribution: 'temurin' - java-version: '11' - uses: subosito/flutter-action@48cafc24713cca54bbe03cdc3a423187d413aafa with: channel: 'stable' @@ -299,10 +283,6 @@ jobs: timeout-minutes: 45 steps: - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 - - uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 - with: - distribution: 'temurin' - java-version: '11' - uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 name: Install Node.js 16 with: diff --git a/.github/workflows/firebase_firestore_odm.yaml b/.github/workflows/firebase_firestore_odm.yaml index 1876a0b90025..4e98ba74a3a5 100644 --- a/.github/workflows/firebase_firestore_odm.yaml +++ b/.github/workflows/firebase_firestore_odm.yaml @@ -58,10 +58,6 @@ jobs: name: Install Node.js 16 with: node-version: '16' - - uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 - with: - distribution: 'temurin' - java-version: '11' - uses: subosito/flutter-action@48cafc24713cca54bbe03cdc3a423187d413aafa with: channel: 'stable' From 20f412af46b4a1187bf61598206ee56bf22d40e8 Mon Sep 17 00:00:00 2001 From: Volodymyr Date: Fri, 13 Oct 2023 11:41:29 +0300 Subject: [PATCH 2/7] chore(cloud_firestore): Add full support of AGP 8 --- .../cloud_firestore/cloud_firestore/android/build.gradle | 7 +++++-- .../cloud_firestore/example/android/app/build.gradle | 4 ++-- .../cloud_firestore/example/android/build.gradle | 2 +- .../cloud_firestore/example/android/gradle.properties | 1 - .../android/gradle/wrapper/gradle-wrapper.properties | 2 +- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/packages/cloud_firestore/cloud_firestore/android/build.gradle b/packages/cloud_firestore/cloud_firestore/android/build.gradle index 526144adac7d..f2659f6bdf7c 100755 --- a/packages/cloud_firestore/cloud_firestore/android/build.gradle +++ b/packages/cloud_firestore/cloud_firestore/android/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.0.1' + classpath 'com.android.tools.build:gradle:8.1.2' } } @@ -39,7 +39,7 @@ android { if (project.android.hasProperty("namespace")) { namespace 'io.flutter.plugins.firebase.firestore' } - compileSdkVersion 31 + compileSDK 33 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 @@ -48,6 +48,9 @@ android { minSdkVersion 19 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } + buildFeatures { + buildConfig true + } lintOptions { disable 'InvalidPackage' } diff --git a/packages/cloud_firestore/cloud_firestore/example/android/app/build.gradle b/packages/cloud_firestore/cloud_firestore/example/android/app/build.gradle index 43c48ee0cba8..837bf5e5b7cd 100644 --- a/packages/cloud_firestore/cloud_firestore/example/android/app/build.gradle +++ b/packages/cloud_firestore/cloud_firestore/example/android/app/build.gradle @@ -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 @@ -68,5 +68,5 @@ flutter { } dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" } diff --git a/packages/cloud_firestore/cloud_firestore/example/android/build.gradle b/packages/cloud_firestore/cloud_firestore/example/android/build.gradle index ae605880881c..d8de042daa01 100644 --- a/packages/cloud_firestore/cloud_firestore/example/android/build.gradle +++ b/packages/cloud_firestore/cloud_firestore/example/android/build.gradle @@ -6,7 +6,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.android.tools.build:gradle:8.1.2' // START: FlutterFire Configuration classpath 'com.google.gms:google-services:4.3.15' // END: FlutterFire Configuration diff --git a/packages/cloud_firestore/cloud_firestore/example/android/gradle.properties b/packages/cloud_firestore/cloud_firestore/example/android/gradle.properties index b9a9a2464056..aa8601e3000f 100644 --- a/packages/cloud_firestore/cloud_firestore/example/android/gradle.properties +++ b/packages/cloud_firestore/cloud_firestore/example/android/gradle.properties @@ -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 diff --git a/packages/cloud_firestore/cloud_firestore/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/cloud_firestore/cloud_firestore/example/android/gradle/wrapper/gradle-wrapper.properties index da1db5f04e88..db9a6b825d7f 100644 --- a/packages/cloud_firestore/cloud_firestore/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/cloud_firestore/cloud_firestore/example/android/gradle/wrapper/gradle-wrapper.properties @@ -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.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From b1b3765289a69f1d4c9bbfa362d93718013f2f3a Mon Sep 17 00:00:00 2001 From: Volodymyr Date: Fri, 13 Oct 2023 15:42:06 +0300 Subject: [PATCH 3/7] chore(all): Update Android build config to fully support AGP 8 --- .../cloud_firestore/android/build.gradle | 8 +++--- .../example/android/app/build.gradle | 4 +-- .../cloud_functions/android/build.gradle | 12 +++++---- .../example/android/build.gradle | 6 ++--- .../example/android/gradle.properties | 1 - .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../firebase_analytics/android/build.gradle | 26 ++++++++++++------- .../android/gradle.properties | 3 +-- .../example/android/app/build.gradle | 6 ++--- .../gradle/wrapper/gradle-wrapper.properties | 5 ---- .../example/android/build.gradle | 10 +++---- .../example/android/gradle.properties | 3 +-- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../firebase_app_check/android/build.gradle | 12 +++++---- .../android/gradle.properties | 1 - .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../example/android/app/build.gradle | 10 ++++--- .../example/android/build.gradle | 2 +- .../example/android/gradle.properties | 3 +-- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../android/build.gradle | 8 +++--- .../android/gradle.properties | 1 - .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../example/android/app/build.gradle | 8 +++--- .../example/android/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../firebase_auth/android/build.gradle | 11 +++++--- .../firebase_auth/android/gradle.properties | 1 - .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../example/android/app/build.gradle | 6 ++--- .../example/android/build.gradle | 2 +- .../example/android/gradle.properties | 3 +-- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../firebase_core/android/build.gradle | 23 ++++++++++------ .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../example/android/app/build.gradle | 14 ++++++---- .../example/android/build.gradle | 6 ++--- .../example/android/gradle.properties | 3 +-- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../firebase_crashlytics/android/build.gradle | 14 +++++++--- .../example/android/app/build.gradle | 6 ++--- .../example/android/build.gradle | 6 ++--- .../example/android/gradle.properties | 3 +-- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../firebase_database/android/build.gradle | 23 ++++++++++------ .../gradle/wrapper/gradle-wrapper.properties | 5 ---- .../example/android/build.gradle | 6 ++--- .../example/android/gradle.properties | 3 +-- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../android/build.gradle | 14 +++++++--- .../example/android/app/build.gradle | 11 +++++--- .../gradle/wrapper/gradle-wrapper.properties | 5 ---- .../example/android/build.gradle | 7 +++-- .../example/android/gradle.properties | 3 +-- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../android/build.gradle | 16 +++++++++--- .../android/gradle.properties | 2 -- .../example/android/app/build.gradle | 6 ++--- .../example/android/build.gradle | 2 +- .../example/android/gradle.properties | 3 +-- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../firebase_messaging/android/build.gradle | 15 ++++++++--- .../example/android/app/build.gradle | 8 ++++-- .../example/android/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../android/build.gradle | 14 ++++++---- .../android/gradle.properties | 1 - .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../example/android/app/build.gradle | 10 ++++--- .../example/android/build.gradle | 2 +- .../example/android/gradle.properties | 3 +-- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../firebase_performance/android/build.gradle | 20 +++++++------- .../example/android/app/build.gradle | 11 +++++--- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../example/android/build.gradle | 8 +++--- .../example/android/gradle.properties | 3 +-- .../android/build.gradle | 15 ++++++++--- .../example/android/app/build.gradle | 10 ++++--- .../gradle/wrapper/gradle-wrapper.properties | 5 ---- .../example/android/build.gradle | 6 ++--- .../example/android/gradle.properties | 3 +-- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../firebase_storage/android/build.gradle | 16 +++++++++--- .../example/android/app/build.gradle | 10 ++++--- .../gradle/wrapper/gradle-wrapper.properties | 5 ---- .../example/android/build.gradle | 6 ++--- .../example/android/gradle.properties | 3 +-- .../gradle/wrapper/gradle-wrapper.properties | 2 +- 89 files changed, 306 insertions(+), 245 deletions(-) delete mode 100644 packages/firebase_analytics/firebase_analytics/example/android/app/gradle/wrapper/gradle-wrapper.properties delete mode 100644 packages/firebase_database/firebase_database/example/android/app/gradle/wrapper/gradle-wrapper.properties delete mode 100644 packages/firebase_dynamic_links/firebase_dynamic_links/example/android/app/gradle/wrapper/gradle-wrapper.properties delete mode 100644 packages/firebase_remote_config/firebase_remote_config/example/android/app/gradle/wrapper/gradle-wrapper.properties delete mode 100644 packages/firebase_storage/firebase_storage/example/android/app/gradle/wrapper/gradle-wrapper.properties diff --git a/packages/cloud_firestore/cloud_firestore/android/build.gradle b/packages/cloud_firestore/cloud_firestore/android/build.gradle index f2659f6bdf7c..cc944d597dbf 100755 --- a/packages/cloud_firestore/cloud_firestore/android/build.gradle +++ b/packages/cloud_firestore/cloud_firestore/android/build.gradle @@ -39,18 +39,18 @@ android { if (project.android.hasProperty("namespace")) { namespace 'io.flutter.plugins.firebase.firestore' } + buildFeatures { + buildConfig true + } compileSDK 33 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } defaultConfig { - minSdkVersion 19 + minSdk 19 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } - buildFeatures { - buildConfig true - } lintOptions { disable 'InvalidPackage' } diff --git a/packages/cloud_firestore/cloud_firestore/example/android/app/build.gradle b/packages/cloud_firestore/cloud_firestore/example/android/app/build.gradle index 837bf5e5b7cd..d02be2ff6bba 100644 --- a/packages/cloud_firestore/cloud_firestore/example/android/app/build.gradle +++ b/packages/cloud_firestore/cloud_firestore/example/android/app/build.gradle @@ -46,8 +46,8 @@ android { defaultConfig { applicationId "io.flutter.plugins.firebase.firestore.example" - minSdkVersion 21 - targetSdkVersion 33 + minSdk 21 + targetSdk 33 versionCode flutterVersionCode.toInteger() versionName flutterVersionName diff --git a/packages/cloud_functions/cloud_functions/android/build.gradle b/packages/cloud_functions/cloud_functions/android/build.gradle index 0750dbb4f75f..9163fc627019 100644 --- a/packages/cloud_functions/cloud_functions/android/build.gradle +++ b/packages/cloud_functions/cloud_functions/android/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.0.1' + classpath 'com.android.tools.build:gradle:8.1.2' } } @@ -39,14 +39,16 @@ android { if (project.android.hasProperty("namespace")) { namespace 'io.flutter.plugins.firebase.functions' } - - compileSdkVersion 31 + buildFeatures { + buildConfig = true + } + compileSdk 33 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } defaultConfig { - minSdkVersion 16 + minSdk 19 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } lintOptions { @@ -56,7 +58,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.7.0' } } diff --git a/packages/cloud_functions/cloud_functions/example/android/build.gradle b/packages/cloud_functions/cloud_functions/example/android/build.gradle index fe9f643af12d..50d2594f4c32 100644 --- a/packages/cloud_functions/cloud_functions/example/android/build.gradle +++ b/packages/cloud_functions/cloud_functions/example/android/build.gradle @@ -1,11 +1,11 @@ buildscript { repositories { google() - jcenter() + mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:8.0.1' + classpath 'com.android.tools.build:gradle:8.1.2' classpath 'com.google.gms:google-services:4.3.15' } } @@ -13,7 +13,7 @@ buildscript { allprojects { repositories { google() - jcenter() + mavenCentral() } } diff --git a/packages/cloud_functions/cloud_functions/example/android/gradle.properties b/packages/cloud_functions/cloud_functions/example/android/gradle.properties index b9a9a2464056..aa8601e3000f 100644 --- a/packages/cloud_functions/cloud_functions/example/android/gradle.properties +++ b/packages/cloud_functions/cloud_functions/example/android/gradle.properties @@ -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 diff --git a/packages/cloud_functions/cloud_functions/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/cloud_functions/cloud_functions/example/android/gradle/wrapper/gradle-wrapper.properties index da1db5f04e88..db9a6b825d7f 100644 --- a/packages/cloud_functions/cloud_functions/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/cloud_functions/cloud_functions/example/android/gradle/wrapper/gradle-wrapper.properties @@ -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.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/firebase_analytics/firebase_analytics/android/build.gradle b/packages/firebase_analytics/firebase_analytics/android/build.gradle index cb06892dd8ef..155f74c50b6c 100755 --- a/packages/firebase_analytics/firebase_analytics/android/build.gradle +++ b/packages/firebase_analytics/firebase_analytics/android/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.0.1' + classpath 'com.android.tools.build:gradle:8.1.2' } } @@ -39,27 +39,33 @@ android { if (project.android.hasProperty("namespace")) { namespace 'io.flutter.plugins.firebase.analytics' } - - compileSdkVersion 31 + + buildFeatures { + buildConfig true + } + + compileSdk 33 defaultConfig { - minSdkVersion 19 + minSdk 19 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + lintOptions { disable 'InvalidPackage' } + dependencies { api firebaseCoreProject implementation platform("com.google.firebase:firebase-bom:${getRootProjectExtOrCoreProperty("FirebaseSDKVersion", firebaseCoreProject)}") implementation 'com.google.firebase:firebase-analytics' - implementation 'androidx.annotation:annotation:1.1.0' + implementation 'androidx.annotation:annotation:1.7.0' } - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } } - apply from: file("./user-agent.gradle") diff --git a/packages/firebase_analytics/firebase_analytics/android/gradle.properties b/packages/firebase_analytics/firebase_analytics/android/gradle.properties index 1310f7a8fc01..aa8601e3000f 100755 --- a/packages/firebase_analytics/firebase_analytics/android/gradle.properties +++ b/packages/firebase_analytics/firebase_analytics/android/gradle.properties @@ -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 \ No newline at end of file +android.nonFinalResIds=false diff --git a/packages/firebase_analytics/firebase_analytics/example/android/app/build.gradle b/packages/firebase_analytics/firebase_analytics/example/android/app/build.gradle index a3b4f9e3ebfa..c82aa2658052 100755 --- a/packages/firebase_analytics/firebase_analytics/example/android/app/build.gradle +++ b/packages/firebase_analytics/firebase_analytics/example/android/app/build.gradle @@ -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' @@ -35,8 +35,8 @@ android { defaultConfig { applicationId "io.flutter.plugins.firebase.analytics.example" - minSdkVersion 21 - targetSdkVersion 33 + minSdk 21 + targetSdk 33 versionCode flutterVersionCode.toInteger() versionName flutterVersionName testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/packages/firebase_analytics/firebase_analytics/example/android/app/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_analytics/firebase_analytics/example/android/app/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index 0ebb3108e207..000000000000 --- a/packages/firebase_analytics/firebase_analytics/example/android/app/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,5 +0,0 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists diff --git a/packages/firebase_analytics/firebase_analytics/example/android/build.gradle b/packages/firebase_analytics/firebase_analytics/example/android/build.gradle index 0cdd38a12388..f7ccb003b6a8 100755 --- a/packages/firebase_analytics/firebase_analytics/example/android/build.gradle +++ b/packages/firebase_analytics/firebase_analytics/example/android/build.gradle @@ -1,12 +1,11 @@ buildscript { repositories { google() - jcenter() - mavenLocal() + mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:8.0.1' + classpath 'com.android.tools.build:gradle:8.1.2' classpath 'com.google.gms:google-services:4.3.15' } } @@ -14,8 +13,7 @@ buildscript { allprojects { repositories { google() - jcenter() - mavenLocal() + mavenCentral() } } @@ -27,6 +25,6 @@ subprojects { project.evaluationDependsOn(':app') } -task clean(type: Delete) { +tasks.register("clean", Delete) { delete rootProject.buildDir } diff --git a/packages/firebase_analytics/firebase_analytics/example/android/gradle.properties b/packages/firebase_analytics/firebase_analytics/example/android/gradle.properties index 1310f7a8fc01..aa8601e3000f 100755 --- a/packages/firebase_analytics/firebase_analytics/example/android/gradle.properties +++ b/packages/firebase_analytics/firebase_analytics/example/android/gradle.properties @@ -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 \ No newline at end of file +android.nonFinalResIds=false diff --git a/packages/firebase_analytics/firebase_analytics/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_analytics/firebase_analytics/example/android/gradle/wrapper/gradle-wrapper.properties index da1db5f04e88..db9a6b825d7f 100644 --- a/packages/firebase_analytics/firebase_analytics/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/firebase_analytics/firebase_analytics/example/android/gradle/wrapper/gradle-wrapper.properties @@ -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.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/firebase_app_check/firebase_app_check/android/build.gradle b/packages/firebase_app_check/firebase_app_check/android/build.gradle index 5128490ce517..4a1c206e585a 100644 --- a/packages/firebase_app_check/firebase_app_check/android/build.gradle +++ b/packages/firebase_app_check/firebase_app_check/android/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:4.1.0' + classpath 'com.android.tools.build:gradle:8.1.2' } } @@ -39,14 +39,16 @@ android { if (project.android.hasProperty("namespace")) { namespace 'io.flutter.plugins.firebase.appcheck' } - - compileSdkVersion 31 + buildFeatures { + buildConfig true + } + compileSdk 33 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } defaultConfig { - minSdkVersion 16 + minSdk 19 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } lintOptions { @@ -59,7 +61,7 @@ android { implementation 'com.google.firebase:firebase-appcheck-safetynet:16.1.0' implementation 'com.google.firebase:firebase-appcheck-debug:16.1.0' implementation 'com.google.firebase:firebase-appcheck-playintegrity' - implementation 'androidx.annotation:annotation:1.5.0' + implementation 'androidx.annotation:annotation:1.7.0' } } diff --git a/packages/firebase_app_check/firebase_app_check/android/gradle.properties b/packages/firebase_app_check/firebase_app_check/android/gradle.properties index 94adc3a3f97a..d9cf55df7c19 100644 --- a/packages/firebase_app_check/firebase_app_check/android/gradle.properties +++ b/packages/firebase_app_check/firebase_app_check/android/gradle.properties @@ -1,3 +1,2 @@ org.gradle.jvmargs=-Xmx1536M android.useAndroidX=true -android.enableJetifier=true diff --git a/packages/firebase_app_check/firebase_app_check/android/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_app_check/firebase_app_check/android/gradle/wrapper/gradle-wrapper.properties index da1db5f04e88..db9a6b825d7f 100644 --- a/packages/firebase_app_check/firebase_app_check/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/firebase_app_check/firebase_app_check/android/gradle/wrapper/gradle-wrapper.properties @@ -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.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/firebase_app_check/firebase_app_check/example/android/app/build.gradle b/packages/firebase_app_check/firebase_app_check/example/android/app/build.gradle index 790ae215ef31..f9cc88caf8f7 100644 --- a/packages/firebase_app_check/firebase_app_check/example/android/app/build.gradle +++ b/packages/firebase_app_check/firebase_app_check/example/android/app/build.gradle @@ -29,12 +29,16 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace "io.flutter.plugins.firebase.appcheck.example" - compileSdkVersion 33 + compileSdk 33 + + buildFeatures { + buildConfig true + } defaultConfig { applicationId "io.flutter.plugins.firebase.appcheck.example" - minSdkVersion 21 - targetSdkVersion 33 + minSdk 21 + targetSdk 33 versionCode flutterVersionCode.toInteger() versionName flutterVersionName } diff --git a/packages/firebase_app_check/firebase_app_check/example/android/build.gradle b/packages/firebase_app_check/firebase_app_check/example/android/build.gradle index 7f7248c01af5..6559dc6afa54 100644 --- a/packages/firebase_app_check/firebase_app_check/example/android/build.gradle +++ b/packages/firebase_app_check/firebase_app_check/example/android/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.android.tools.build:gradle:8.1.2' // START: FlutterFire Configuration classpath 'com.google.gms:google-services:4.3.15' // END: FlutterFire Configuration diff --git a/packages/firebase_app_check/firebase_app_check/example/android/gradle.properties b/packages/firebase_app_check/firebase_app_check/example/android/gradle.properties index 1310f7a8fc01..aa8601e3000f 100644 --- a/packages/firebase_app_check/firebase_app_check/example/android/gradle.properties +++ b/packages/firebase_app_check/firebase_app_check/example/android/gradle.properties @@ -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 \ No newline at end of file +android.nonFinalResIds=false diff --git a/packages/firebase_app_check/firebase_app_check/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_app_check/firebase_app_check/example/android/gradle/wrapper/gradle-wrapper.properties index da1db5f04e88..db9a6b825d7f 100644 --- a/packages/firebase_app_check/firebase_app_check/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/firebase_app_check/firebase_app_check/example/android/gradle/wrapper/gradle-wrapper.properties @@ -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.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/firebase_app_installations/firebase_app_installations/android/build.gradle b/packages/firebase_app_installations/firebase_app_installations/android/build.gradle index f8cae1bb2d3f..586a0050fc56 100644 --- a/packages/firebase_app_installations/firebase_app_installations/android/build.gradle +++ b/packages/firebase_app_installations/firebase_app_installations/android/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:4.1.0' + classpath 'com.android.tools.build:gradle:8.1.2' } } @@ -40,7 +40,7 @@ android { namespace 'io.flutter.plugins.firebase.installations.firebase_app_installations' } - compileSdkVersion 31 + compileSdk 33 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 @@ -48,7 +48,7 @@ android { } defaultConfig { - minSdkVersion 19 + minSdk 19 } dependencies { @@ -59,7 +59,7 @@ android { } dependencies { - implementation 'androidx.annotation:annotation:1.1.0' + implementation 'androidx.annotation:annotation:1.7.0' } apply from: file("./user-agent.gradle") diff --git a/packages/firebase_app_installations/firebase_app_installations/android/gradle.properties b/packages/firebase_app_installations/firebase_app_installations/android/gradle.properties index 94adc3a3f97a..d9cf55df7c19 100644 --- a/packages/firebase_app_installations/firebase_app_installations/android/gradle.properties +++ b/packages/firebase_app_installations/firebase_app_installations/android/gradle.properties @@ -1,3 +1,2 @@ org.gradle.jvmargs=-Xmx1536M android.useAndroidX=true -android.enableJetifier=true diff --git a/packages/firebase_app_installations/firebase_app_installations/android/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_app_installations/firebase_app_installations/android/gradle/wrapper/gradle-wrapper.properties index da1db5f04e88..db9a6b825d7f 100644 --- a/packages/firebase_app_installations/firebase_app_installations/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/firebase_app_installations/firebase_app_installations/android/gradle/wrapper/gradle-wrapper.properties @@ -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.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/firebase_app_installations/firebase_app_installations/example/android/app/build.gradle b/packages/firebase_app_installations/firebase_app_installations/example/android/app/build.gradle index 4bdaa47d1de5..734bd2c4f025 100644 --- a/packages/firebase_app_installations/firebase_app_installations/example/android/app/build.gradle +++ b/packages/firebase_app_installations/firebase_app_installations/example/android/app/build.gradle @@ -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 @@ -46,8 +46,8 @@ android { defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "io.flutter.plugins.firebase.installations.example" - minSdkVersion 21 - targetSdkVersion 33 + minSdk 21 + targetSdk 33 versionCode flutterVersionCode.toInteger() versionName flutterVersionName } @@ -66,5 +66,5 @@ flutter { } dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" } diff --git a/packages/firebase_app_installations/firebase_app_installations/example/android/build.gradle b/packages/firebase_app_installations/firebase_app_installations/example/android/build.gradle index 913279681350..9381c193c0bb 100644 --- a/packages/firebase_app_installations/firebase_app_installations/example/android/build.gradle +++ b/packages/firebase_app_installations/firebase_app_installations/example/android/build.gradle @@ -6,7 +6,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.0.1' + classpath 'com.android.tools.build:gradle:8.1.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath 'com.google.gms:google-services:4.3.15' } diff --git a/packages/firebase_app_installations/firebase_app_installations/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_app_installations/firebase_app_installations/example/android/gradle/wrapper/gradle-wrapper.properties index da1db5f04e88..db9a6b825d7f 100644 --- a/packages/firebase_app_installations/firebase_app_installations/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/firebase_app_installations/firebase_app_installations/example/android/gradle/wrapper/gradle-wrapper.properties @@ -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.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/firebase_auth/firebase_auth/android/build.gradle b/packages/firebase_auth/firebase_auth/android/build.gradle index 0ecef8a5cd7b..f66ca3d58618 100755 --- a/packages/firebase_auth/firebase_auth/android/build.gradle +++ b/packages/firebase_auth/firebase_auth/android/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.0.1' + classpath 'com.android.tools.build:gradle:8.1.2' } } @@ -39,13 +39,16 @@ android { if (project.android.hasProperty("namespace")) { namespace 'io.flutter.plugins.firebase.auth' } - compileSdkVersion 31 + buildFeatures { + buildConfig true + } + compileSdk 33 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } defaultConfig { - minSdkVersion 16 + minSdk 19 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } lintOptions { @@ -55,7 +58,7 @@ android { api firebaseCoreProject implementation platform("com.google.firebase:firebase-bom:${getRootProjectExtOrCoreProperty("FirebaseSDKVersion", firebaseCoreProject)}") implementation 'com.google.firebase:firebase-auth' - implementation 'androidx.annotation:annotation:1.1.0' + implementation 'androidx.annotation:annotation:1.7.0' } } diff --git a/packages/firebase_auth/firebase_auth/android/gradle.properties b/packages/firebase_auth/firebase_auth/android/gradle.properties index 7be3d8b46841..8bd86f680510 100755 --- a/packages/firebase_auth/firebase_auth/android/gradle.properties +++ b/packages/firebase_auth/firebase_auth/android/gradle.properties @@ -1,2 +1 @@ org.gradle.jvmargs=-Xmx1536M -android.enableR8=true diff --git a/packages/firebase_auth/firebase_auth/android/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_auth/firebase_auth/android/gradle/wrapper/gradle-wrapper.properties index da1db5f04e88..db9a6b825d7f 100644 --- a/packages/firebase_auth/firebase_auth/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/firebase_auth/firebase_auth/android/gradle/wrapper/gradle-wrapper.properties @@ -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.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/firebase_auth/firebase_auth/example/android/app/build.gradle b/packages/firebase_auth/firebase_auth/example/android/app/build.gradle index c79b6689ab88..80e12675207c 100644 --- a/packages/firebase_auth/firebase_auth/example/android/app/build.gradle +++ b/packages/firebase_auth/firebase_auth/example/android/app/build.gradle @@ -31,7 +31,7 @@ android { namespace 'io.flutter.plugins.firebaseauthexample' } - compileSdkVersion flutter.compileSdkVersion + compileSdk flutter.compileSdkVersion compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 @@ -49,7 +49,7 @@ android { defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "io.flutter.plugins.firebase.auth.example" - minSdkVersion 19 + minSdk 19 targetSdkVersion flutter.targetSdkVersion versionCode flutterVersionCode.toInteger() versionName flutterVersionName @@ -70,7 +70,7 @@ flutter { } dependencies { - implementation 'com.android.support:multidex:1.0.3' + implementation 'com.android.support:multidex:2.0.1' implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" } diff --git a/packages/firebase_auth/firebase_auth/example/android/build.gradle b/packages/firebase_auth/firebase_auth/example/android/build.gradle index 75986dc5d7ee..0724c11743f4 100644 --- a/packages/firebase_auth/firebase_auth/example/android/build.gradle +++ b/packages/firebase_auth/firebase_auth/example/android/build.gradle @@ -6,7 +6,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.0.2' + classpath 'com.android.tools.build:gradle:8.1.2' classpath 'com.google.gms:google-services:4.3.15' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } diff --git a/packages/firebase_auth/firebase_auth/example/android/gradle.properties b/packages/firebase_auth/firebase_auth/example/android/gradle.properties index 1310f7a8fc01..aa8601e3000f 100644 --- a/packages/firebase_auth/firebase_auth/example/android/gradle.properties +++ b/packages/firebase_auth/firebase_auth/example/android/gradle.properties @@ -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 \ No newline at end of file +android.nonFinalResIds=false diff --git a/packages/firebase_auth/firebase_auth/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_auth/firebase_auth/example/android/gradle/wrapper/gradle-wrapper.properties index da1db5f04e88..db9a6b825d7f 100644 --- a/packages/firebase_auth/firebase_auth/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/firebase_auth/firebase_auth/example/android/gradle/wrapper/gradle-wrapper.properties @@ -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.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/firebase_core/firebase_core/android/build.gradle b/packages/firebase_core/firebase_core/android/build.gradle index 259430a96d1a..b549bad811f7 100644 --- a/packages/firebase_core/firebase_core/android/build.gradle +++ b/packages/firebase_core/firebase_core/android/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.0.1' + classpath 'com.android.tools.build:gradle:8.1.2' } } @@ -21,29 +21,36 @@ def getRootProjectExtOrDefaultProperty(name) { } android { - // Conditional for compatibility with AGP <4.2. - if (project.android.hasProperty("namespace")) { - namespace 'io.flutter.plugins.firebase.core' - } + // Conditional for compatibility with AGP <4.2. + if (project.android.hasProperty("namespace")) { + namespace 'io.flutter.plugins.firebase.core' + } + + buildFeatures { + buildConfig true + } - compileSdkVersion 31 + compileSdk 33 defaultConfig { - minSdkVersion 16 + minSdk 19 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } + compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } + lintOptions { disable 'InvalidPackage' } + dependencies { implementation platform("com.google.firebase:firebase-bom:${getRootProjectExtOrDefaultProperty("FirebaseSDKVersion")}") implementation "com.google.firebase:firebase-common" - implementation 'androidx.annotation:annotation:1.1.0' + implementation 'androidx.annotation:annotation:1.7.0' } } diff --git a/packages/firebase_core/firebase_core/android/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_core/firebase_core/android/gradle/wrapper/gradle-wrapper.properties index da1db5f04e88..db9a6b825d7f 100644 --- a/packages/firebase_core/firebase_core/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/firebase_core/firebase_core/android/gradle/wrapper/gradle-wrapper.properties @@ -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.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/firebase_core/firebase_core/example/android/app/build.gradle b/packages/firebase_core/firebase_core/example/android/app/build.gradle index 5f47847f94a1..92c54711b33f 100644 --- a/packages/firebase_core/firebase_core/example/android/app/build.gradle +++ b/packages/firebase_core/firebase_core/example/android/app/build.gradle @@ -26,21 +26,25 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.firebasecoreexample' - compileSdkVersion flutter.compileSdkVersion + compileSdk flutter.compileSdkVersion - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + buildFeatures { + buildConfig = true } defaultConfig { applicationId "io.flutter.plugins.firebasecoreexample" minSdkVersion flutter.minSdkVersion - targetSdkVersion flutter.targetSdkVersion + targetSdk flutter.targetSdkVersion versionCode flutterVersionCode.toInteger() versionName flutterVersionName } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + buildTypes { release { signingConfig signingConfigs.debug diff --git a/packages/firebase_core/firebase_core/example/android/build.gradle b/packages/firebase_core/firebase_core/example/android/build.gradle index 8237b734dca2..4ab8982effe5 100644 --- a/packages/firebase_core/firebase_core/example/android/build.gradle +++ b/packages/firebase_core/firebase_core/example/android/build.gradle @@ -1,18 +1,18 @@ buildscript { repositories { google() - jcenter() + mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:8.0.1' + classpath 'com.android.tools.build:gradle:8.1.2' } } allprojects { repositories { google() - jcenter() + mavenCentral() } } diff --git a/packages/firebase_core/firebase_core/example/android/gradle.properties b/packages/firebase_core/firebase_core/example/android/gradle.properties index 1310f7a8fc01..aa8601e3000f 100644 --- a/packages/firebase_core/firebase_core/example/android/gradle.properties +++ b/packages/firebase_core/firebase_core/example/android/gradle.properties @@ -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 \ No newline at end of file +android.nonFinalResIds=false diff --git a/packages/firebase_core/firebase_core/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_core/firebase_core/example/android/gradle/wrapper/gradle-wrapper.properties index da1db5f04e88..db9a6b825d7f 100644 --- a/packages/firebase_core/firebase_core/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/firebase_core/firebase_core/example/android/gradle/wrapper/gradle-wrapper.properties @@ -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.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/firebase_crashlytics/firebase_crashlytics/android/build.gradle b/packages/firebase_crashlytics/firebase_crashlytics/android/build.gradle index e9f6a6cb5744..66a69e9a743c 100644 --- a/packages/firebase_crashlytics/firebase_crashlytics/android/build.gradle +++ b/packages/firebase_crashlytics/firebase_crashlytics/android/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.5.4' + classpath 'com.android.tools.build:gradle:8.1.2' } } @@ -39,16 +39,22 @@ android { namespace 'io.flutter.plugins.firebase.crashlytics' } - compileSdkVersion 31 + compileSdk 33 + + buildFeatures { + buildConfig = true + } + compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } defaultConfig { - minSdkVersion 16 + minSdk 19 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } + lintOptions { disable 'InvalidPackage' } @@ -57,7 +63,7 @@ android { dependencies { implementation platform("com.google.firebase:firebase-bom:${getRootProjectExtOrCoreProperty("FirebaseSDKVersion", firebaseCoreProject)}") implementation 'com.google.firebase:firebase-crashlytics' - implementation 'androidx.annotation:annotation:1.1.0' + implementation 'androidx.annotation:annotation:1.7.0' } apply from: file("./user-agent.gradle") diff --git a/packages/firebase_crashlytics/firebase_crashlytics/example/android/app/build.gradle b/packages/firebase_crashlytics/firebase_crashlytics/example/android/app/build.gradle index 3d45cb6c164a..8417af92bac2 100644 --- a/packages/firebase_crashlytics/firebase_crashlytics/example/android/app/build.gradle +++ b/packages/firebase_crashlytics/firebase_crashlytics/example/android/app/build.gradle @@ -26,7 +26,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.firebasecrashlyticsexample' - compileSdkVersion 33 + compileSdk 33 lintOptions { disable 'InvalidPackage' @@ -34,8 +34,8 @@ android { defaultConfig { applicationId 'io.flutter.plugins.firebasecrashlyticsexample' - minSdkVersion 19 - targetSdkVersion 33 + minSdk 19 + targetSdk 33 versionCode flutterVersionCode.toInteger() versionName flutterVersionName testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/packages/firebase_crashlytics/firebase_crashlytics/example/android/build.gradle b/packages/firebase_crashlytics/firebase_crashlytics/example/android/build.gradle index e3aa19badb73..babd0c114fdc 100644 --- a/packages/firebase_crashlytics/firebase_crashlytics/example/android/build.gradle +++ b/packages/firebase_crashlytics/firebase_crashlytics/example/android/build.gradle @@ -1,11 +1,11 @@ buildscript { repositories { google() - jcenter() + mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:8.0.1' + classpath 'com.android.tools.build:gradle:8.1.2' classpath 'com.google.gms:google-services:4.3.15' classpath 'com.google.firebase:firebase-crashlytics-gradle:2.8.1' } @@ -14,7 +14,7 @@ buildscript { allprojects { repositories { google() - jcenter() + mavenCentral() } } diff --git a/packages/firebase_crashlytics/firebase_crashlytics/example/android/gradle.properties b/packages/firebase_crashlytics/firebase_crashlytics/example/android/gradle.properties index 1310f7a8fc01..aa8601e3000f 100644 --- a/packages/firebase_crashlytics/firebase_crashlytics/example/android/gradle.properties +++ b/packages/firebase_crashlytics/firebase_crashlytics/example/android/gradle.properties @@ -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 \ No newline at end of file +android.nonFinalResIds=false diff --git a/packages/firebase_crashlytics/firebase_crashlytics/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_crashlytics/firebase_crashlytics/example/android/gradle/wrapper/gradle-wrapper.properties index da1db5f04e88..db9a6b825d7f 100644 --- a/packages/firebase_crashlytics/firebase_crashlytics/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/firebase_crashlytics/firebase_crashlytics/example/android/gradle/wrapper/gradle-wrapper.properties @@ -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.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/firebase_database/firebase_database/android/build.gradle b/packages/firebase_database/firebase_database/android/build.gradle index e2933d30e1cd..35931a57cf1d 100755 --- a/packages/firebase_database/firebase_database/android/build.gradle +++ b/packages/firebase_database/firebase_database/android/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.5.4' + classpath 'com.android.tools.build:gradle:8.1.2' } } @@ -40,24 +40,31 @@ android { namespace 'io.flutter.plugins.firebase.database' } - compileSdkVersion 31 + compileSdk 33 + + buildFeatures { + buildConfig = true + } defaultConfig { - minSdkVersion 19 + minSdk 19 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + lintOptions { disable 'InvalidPackage' } + dependencies { api firebaseCoreProject implementation platform("com.google.firebase:firebase-bom:${getRootProjectExtOrCoreProperty("FirebaseSDKVersion", firebaseCoreProject)}") implementation 'com.google.firebase:firebase-database' - implementation 'androidx.annotation:annotation:1.3.0' - } - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + implementation 'androidx.annotation:annotation:1.7.0' } } diff --git a/packages/firebase_database/firebase_database/example/android/app/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_database/firebase_database/example/android/app/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index da1db5f04e88..000000000000 --- a/packages/firebase_database/firebase_database/example/android/app/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,5 +0,0 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists diff --git a/packages/firebase_database/firebase_database/example/android/build.gradle b/packages/firebase_database/firebase_database/example/android/build.gradle index fe9f643af12d..50d2594f4c32 100755 --- a/packages/firebase_database/firebase_database/example/android/build.gradle +++ b/packages/firebase_database/firebase_database/example/android/build.gradle @@ -1,11 +1,11 @@ buildscript { repositories { google() - jcenter() + mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:8.0.1' + classpath 'com.android.tools.build:gradle:8.1.2' classpath 'com.google.gms:google-services:4.3.15' } } @@ -13,7 +13,7 @@ buildscript { allprojects { repositories { google() - jcenter() + mavenCentral() } } diff --git a/packages/firebase_database/firebase_database/example/android/gradle.properties b/packages/firebase_database/firebase_database/example/android/gradle.properties index 1310f7a8fc01..aa8601e3000f 100755 --- a/packages/firebase_database/firebase_database/example/android/gradle.properties +++ b/packages/firebase_database/firebase_database/example/android/gradle.properties @@ -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 \ No newline at end of file +android.nonFinalResIds=false diff --git a/packages/firebase_database/firebase_database/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_database/firebase_database/example/android/gradle/wrapper/gradle-wrapper.properties index da1db5f04e88..db9a6b825d7f 100644 --- a/packages/firebase_database/firebase_database/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/firebase_database/firebase_database/example/android/gradle/wrapper/gradle-wrapper.properties @@ -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.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/firebase_dynamic_links/firebase_dynamic_links/android/build.gradle b/packages/firebase_dynamic_links/firebase_dynamic_links/android/build.gradle index 2e4922e33113..f2bc52cb6ba1 100644 --- a/packages/firebase_dynamic_links/firebase_dynamic_links/android/build.gradle +++ b/packages/firebase_dynamic_links/firebase_dynamic_links/android/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.0.2' + classpath 'com.android.tools.build:gradle:8.1.2' } } @@ -40,18 +40,26 @@ android { namespace 'io.flutter.plugins.firebase.dynamiclinks' } - compileSdkVersion 31 + compileSdk 33 + + buildFeatures { + buildConfig = true + } + compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } + defaultConfig { - minSdkVersion 19 + minSdk 19 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } + lintOptions { disable 'InvalidPackage' } + dependencies { api firebaseCoreProject implementation platform("com.google.firebase:firebase-bom:${getRootProjectExtOrCoreProperty("FirebaseSDKVersion", firebaseCoreProject)}") diff --git a/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/app/build.gradle b/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/app/build.gradle index 78a67ad9d563..4ac01ae5f071 100644 --- a/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/app/build.gradle +++ b/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/app/build.gradle @@ -26,16 +26,21 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.firebase.dynamiclinksexample' - compileSdkVersion 33 + + compileSdk 33 lintOptions { disable 'InvalidPackage' } + buildFeatures { + buildConfig = true + } + defaultConfig { applicationId "io.flutter.plugins.firebase.dynamiclinksexample" - minSdkVersion 19 - targetSdkVersion 33 + minSdk 19 + targetSdk 33 versionCode flutterVersionCode.toInteger() versionName flutterVersionName } diff --git a/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/app/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/app/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index da1db5f04e88..000000000000 --- a/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/app/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,5 +0,0 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists diff --git a/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/build.gradle b/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/build.gradle index 735309b337c1..50d2594f4c32 100644 --- a/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/build.gradle +++ b/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/build.gradle @@ -1,11 +1,11 @@ buildscript { repositories { google() - jcenter() + mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.android.tools.build:gradle:8.1.2' classpath 'com.google.gms:google-services:4.3.15' } } @@ -13,8 +13,7 @@ buildscript { allprojects { repositories { google() - jcenter() - mavenLocal() + mavenCentral() } } diff --git a/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/gradle.properties b/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/gradle.properties index 1310f7a8fc01..aa8601e3000f 100644 --- a/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/gradle.properties +++ b/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/gradle.properties @@ -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 \ No newline at end of file +android.nonFinalResIds=false diff --git a/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/gradle/wrapper/gradle-wrapper.properties index da1db5f04e88..db9a6b825d7f 100644 --- a/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/gradle/wrapper/gradle-wrapper.properties @@ -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.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/build.gradle b/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/build.gradle index 2e114b11cecf..e3460cd2142a 100644 --- a/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/build.gradle +++ b/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.5.4' + classpath 'com.android.tools.build:gradle:8.1.2' } } @@ -40,23 +40,31 @@ android { namespace 'io.flutter.plugins.firebase.inappmessaging' } - compileSdkVersion 31 + compileSdk 33 + + buildFeatures { + buildConfig = true + } + compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } + defaultConfig { - minSdkVersion 16 + minSdk 19 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } + lintOptions { disable 'InvalidPackage' } + dependencies { api firebaseCoreProject implementation platform("com.google.firebase:firebase-bom:${getRootProjectExtOrCoreProperty("FirebaseSDKVersion", firebaseCoreProject)}") implementation 'com.google.firebase:firebase-inappmessaging-display' - implementation 'androidx.annotation:annotation:1.1.0' + implementation 'androidx.annotation:annotation:1.7.0' } } diff --git a/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/gradle.properties b/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/gradle.properties index 1441b1da923a..8bd86f680510 100644 --- a/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/gradle.properties +++ b/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/gradle.properties @@ -1,3 +1 @@ org.gradle.jvmargs=-Xmx1536M - -android.enableR8=true diff --git a/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/app/build.gradle b/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/app/build.gradle index 7017f7770656..d047eba58b14 100644 --- a/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/app/build.gradle +++ b/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/app/build.gradle @@ -26,7 +26,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.firebase.tests' - compileSdkVersion 33 + compileSdk 33 lintOptions { disable 'InvalidPackage' @@ -34,8 +34,8 @@ android { defaultConfig { applicationId "io.flutter.plugins.firebase.tests" - minSdkVersion 21 - targetSdkVersion 33 + minSdk 21 + targetSdk 33 versionCode flutterVersionCode.toInteger() versionName flutterVersionName testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/build.gradle b/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/build.gradle index 7dfa17343bdd..50d2594f4c32 100644 --- a/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/build.gradle +++ b/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.0.1' + classpath 'com.android.tools.build:gradle:8.1.2' classpath 'com.google.gms:google-services:4.3.15' } } diff --git a/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/gradle.properties b/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/gradle.properties index 1310f7a8fc01..aa8601e3000f 100644 --- a/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/gradle.properties +++ b/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/gradle.properties @@ -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 \ No newline at end of file +android.nonFinalResIds=false diff --git a/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/gradle/wrapper/gradle-wrapper.properties index da1db5f04e88..db9a6b825d7f 100644 --- a/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/gradle/wrapper/gradle-wrapper.properties @@ -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.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/firebase_messaging/firebase_messaging/android/build.gradle b/packages/firebase_messaging/firebase_messaging/android/build.gradle index 52307b8a51a6..7e486a480300 100644 --- a/packages/firebase_messaging/firebase_messaging/android/build.gradle +++ b/packages/firebase_messaging/firebase_messaging/android/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.0.1' + classpath 'com.android.tools.build:gradle:8.1.2' } } @@ -40,24 +40,31 @@ android { namespace 'io.flutter.plugins.firebase.messaging' } - compileSdkVersion 33 + compileSdk 33 + + buildFeatures { + buildConfig = true + } + compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } defaultConfig { - minSdkVersion 19 + minSdk 19 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } + lintOptions { disable 'InvalidPackage' } + dependencies { api firebaseCoreProject implementation platform("com.google.firebase:firebase-bom:${getRootProjectExtOrCoreProperty("FirebaseSDKVersion", firebaseCoreProject)}") implementation 'com.google.firebase:firebase-messaging' implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.1.0' - implementation 'androidx.annotation:annotation:1.4.0' + implementation 'androidx.annotation:annotation:1.7.0' implementation ('com.google.firebase:firebase-iid:21.1.0') { transitive = true } diff --git a/packages/firebase_messaging/firebase_messaging/example/android/app/build.gradle b/packages/firebase_messaging/firebase_messaging/example/android/app/build.gradle index 1233527e4b71..ed391925eb6a 100644 --- a/packages/firebase_messaging/firebase_messaging/example/android/app/build.gradle +++ b/packages/firebase_messaging/firebase_messaging/example/android/app/build.gradle @@ -32,10 +32,14 @@ android { disable 'InvalidPackage' } + buildFeatures { + buildConfig = true + } + defaultConfig { applicationId "io.flutter.plugins.firebase.messaging.example" - minSdkVersion 21 - targetSdkVersion 33 + minSdk 21 + targetSdk 33 versionCode flutterVersionCode.toInteger() versionName flutterVersionName } diff --git a/packages/firebase_messaging/firebase_messaging/example/android/build.gradle b/packages/firebase_messaging/firebase_messaging/example/android/build.gradle index a7a489e681c2..33ee42e7f17a 100644 --- a/packages/firebase_messaging/firebase_messaging/example/android/build.gradle +++ b/packages/firebase_messaging/firebase_messaging/example/android/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.1.0' + classpath 'com.android.tools.build:gradle:8.1.2' classpath 'com.google.gms:google-services:4.4.0' } } diff --git a/packages/firebase_messaging/firebase_messaging/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_messaging/firebase_messaging/example/android/gradle/wrapper/gradle-wrapper.properties index da1db5f04e88..db9a6b825d7f 100644 --- a/packages/firebase_messaging/firebase_messaging/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/firebase_messaging/firebase_messaging/example/android/gradle/wrapper/gradle-wrapper.properties @@ -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.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/build.gradle b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/build.gradle index 5a7e1e3f8550..a500f4494a6f 100644 --- a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/build.gradle +++ b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.0.3' + classpath 'com.android.tools.build:gradle:8.1.2' } } @@ -39,24 +39,28 @@ android { if (project.android.hasProperty("namespace")) { namespace 'io.flutter.plugins.firebase.firebase_ml_model_downloader' } - - compileSdkVersion 31 + + compileSdk 33 + compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } + defaultConfig { - minSdkVersion 19 + minSdk 19 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } + lintOptions { disable 'InvalidPackage' } + dependencies { api firebaseCoreProject implementation platform("com.google.firebase:firebase-bom:${getRootProjectExtOrCoreProperty("FirebaseSDKVersion", firebaseCoreProject)}") implementation 'com.google.firebase:firebase-ml-modeldownloader' - implementation 'androidx.annotation:annotation:1.3.0' + implementation 'androidx.annotation:annotation:1.7.0' } } diff --git a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/gradle.properties b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/gradle.properties index 94adc3a3f97a..d9cf55df7c19 100644 --- a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/gradle.properties +++ b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/gradle.properties @@ -1,3 +1,2 @@ org.gradle.jvmargs=-Xmx1536M android.useAndroidX=true -android.enableJetifier=true diff --git a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/gradle/wrapper/gradle-wrapper.properties index da1db5f04e88..db9a6b825d7f 100644 --- a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/gradle/wrapper/gradle-wrapper.properties @@ -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.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/app/build.gradle b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/app/build.gradle index f583097273a0..26c352401b74 100644 --- a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/app/build.gradle +++ b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/app/build.gradle @@ -29,7 +29,11 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.firebase.tests' - compileSdkVersion 33 + compileSdk 33 + + buildFeatures { + buildConfig = true + } compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 @@ -38,8 +42,8 @@ android { defaultConfig { applicationId "io.flutter.plugins.firebase.tests" - minSdkVersion 21 - targetSdkVersion 33 + minSdk 21 + targetSdk 33 versionCode flutterVersionCode.toInteger() versionName flutterVersionName } diff --git a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/build.gradle b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/build.gradle index 927bcf02b688..0fdec00e5c65 100644 --- a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/build.gradle +++ b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.0.1' + classpath 'com.android.tools.build:gradle:8.1.2' // START: FlutterFire Configuration classpath 'com.google.gms:google-services:4.3.15' // END: FlutterFire Configuration diff --git a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/gradle.properties b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/gradle.properties index 1310f7a8fc01..aa8601e3000f 100644 --- a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/gradle.properties +++ b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/gradle.properties @@ -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 \ No newline at end of file +android.nonFinalResIds=false diff --git a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/gradle/wrapper/gradle-wrapper.properties index da1db5f04e88..db9a6b825d7f 100644 --- a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/gradle/wrapper/gradle-wrapper.properties @@ -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.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/firebase_performance/firebase_performance/android/build.gradle b/packages/firebase_performance/firebase_performance/android/build.gradle index 69adadc53e7d..87ba32ea2d67 100644 --- a/packages/firebase_performance/firebase_performance/android/build.gradle +++ b/packages/firebase_performance/firebase_performance/android/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.5.4' + classpath 'com.android.tools.build:gradle:8.1.2' } } @@ -40,26 +40,28 @@ android { namespace 'io.flutter.plugins.firebase.performance' } - compileSdkVersion 31 + compileSdk 33 defaultConfig { - minSdkVersion 16 + minSdk 19 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + lintOptions { disable 'InvalidPackage' } + dependencies { api firebaseCoreProject implementation platform("com.google.firebase:firebase-bom:${getRootProjectExtOrCoreProperty("FirebaseSDKVersion", firebaseCoreProject)}") implementation 'com.google.firebase:firebase-perf' - implementation 'androidx.annotation:annotation:1.1.0' + implementation 'androidx.annotation:annotation:1.7.0' } - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } } - apply from: file("./user-agent.gradle") diff --git a/packages/firebase_performance/firebase_performance/example/android/app/build.gradle b/packages/firebase_performance/firebase_performance/example/android/app/build.gradle index c83aba7fac88..941f5645be1c 100644 --- a/packages/firebase_performance/firebase_performance/example/android/app/build.gradle +++ b/packages/firebase_performance/firebase_performance/example/android/app/build.gradle @@ -27,7 +27,11 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.firebase.tests' - compileSdkVersion 33 + compileSdk 33 + + buildFeatures { + buildConfig = true + } lintOptions { disable 'InvalidPackage' @@ -35,8 +39,8 @@ android { defaultConfig { applicationId "io.flutter.plugins.firebase.tests" - minSdkVersion 21 - targetSdkVersion 33 + minSdk 21 + targetSdk 33 versionCode flutterVersionCode.toInteger() versionName flutterVersionName testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -47,6 +51,7 @@ android { signingConfig signingConfigs.debug } } + compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 diff --git a/packages/firebase_performance/firebase_performance/example/android/app/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_performance/firebase_performance/example/android/app/gradle/wrapper/gradle-wrapper.properties index da1db5f04e88..db9a6b825d7f 100644 --- a/packages/firebase_performance/firebase_performance/example/android/app/gradle/wrapper/gradle-wrapper.properties +++ b/packages/firebase_performance/firebase_performance/example/android/app/gradle/wrapper/gradle-wrapper.properties @@ -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.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/firebase_performance/firebase_performance/example/android/build.gradle b/packages/firebase_performance/firebase_performance/example/android/build.gradle index 71cd3d5001b3..1cbee2cc7191 100644 --- a/packages/firebase_performance/firebase_performance/example/android/build.gradle +++ b/packages/firebase_performance/firebase_performance/example/android/build.gradle @@ -1,12 +1,11 @@ buildscript { repositories { google() - jcenter() - mavenLocal() + mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.android.tools.build:gradle:8.1.2' classpath 'com.google.gms:google-services:4.3.15' classpath 'com.google.firebase:perf-plugin:1.4.2' } @@ -15,8 +14,7 @@ buildscript { allprojects { repositories { google() - jcenter() - mavenLocal() + mavenCentral() } } diff --git a/packages/firebase_performance/firebase_performance/example/android/gradle.properties b/packages/firebase_performance/firebase_performance/example/android/gradle.properties index 1310f7a8fc01..aa8601e3000f 100644 --- a/packages/firebase_performance/firebase_performance/example/android/gradle.properties +++ b/packages/firebase_performance/firebase_performance/example/android/gradle.properties @@ -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 \ No newline at end of file +android.nonFinalResIds=false diff --git a/packages/firebase_remote_config/firebase_remote_config/android/build.gradle b/packages/firebase_remote_config/firebase_remote_config/android/build.gradle index 0fd936a88113..326fa746cf59 100644 --- a/packages/firebase_remote_config/firebase_remote_config/android/build.gradle +++ b/packages/firebase_remote_config/firebase_remote_config/android/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.5.4' + classpath 'com.android.tools.build:gradle:8.1.2' } } @@ -40,23 +40,30 @@ android { namespace 'io.flutter.plugins.firebase.firebaseremoteconfig' } - compileSdkVersion 31 + compileSdk 33 + + buildFeatures { + buildConfig = true + } + compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } + defaultConfig { - minSdkVersion 16 + minSdk 19 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } lintOptions { disable 'InvalidPackage' } + dependencies { api firebaseCoreProject implementation platform("com.google.firebase:firebase-bom:${getRootProjectExtOrCoreProperty("FirebaseSDKVersion", firebaseCoreProject)}") implementation 'com.google.firebase:firebase-config' - implementation 'androidx.annotation:annotation:1.1.0' + implementation 'androidx.annotation:annotation:1.7.0' } } diff --git a/packages/firebase_remote_config/firebase_remote_config/example/android/app/build.gradle b/packages/firebase_remote_config/firebase_remote_config/example/android/app/build.gradle index fe5fd2f8e517..780054e85de9 100644 --- a/packages/firebase_remote_config/firebase_remote_config/example/android/app/build.gradle +++ b/packages/firebase_remote_config/firebase_remote_config/example/android/app/build.gradle @@ -26,7 +26,11 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.firebase.remoteconfig.example' - compileSdkVersion 33 + compileSdk 33 + + buildFeatures { + buildConfig = true + } lintOptions { disable 'InvalidPackage' @@ -34,8 +38,8 @@ android { defaultConfig { applicationId "io.flutter.plugins.firebase.remoteconfig.example" - minSdkVersion 21 - targetSdkVersion 33 + minSdk 21 + targetSdk 33 versionCode flutterVersionCode.toInteger() versionName flutterVersionName } diff --git a/packages/firebase_remote_config/firebase_remote_config/example/android/app/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_remote_config/firebase_remote_config/example/android/app/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index da1db5f04e88..000000000000 --- a/packages/firebase_remote_config/firebase_remote_config/example/android/app/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,5 +0,0 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists diff --git a/packages/firebase_remote_config/firebase_remote_config/example/android/build.gradle b/packages/firebase_remote_config/firebase_remote_config/example/android/build.gradle index fe9f643af12d..50d2594f4c32 100644 --- a/packages/firebase_remote_config/firebase_remote_config/example/android/build.gradle +++ b/packages/firebase_remote_config/firebase_remote_config/example/android/build.gradle @@ -1,11 +1,11 @@ buildscript { repositories { google() - jcenter() + mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:8.0.1' + classpath 'com.android.tools.build:gradle:8.1.2' classpath 'com.google.gms:google-services:4.3.15' } } @@ -13,7 +13,7 @@ buildscript { allprojects { repositories { google() - jcenter() + mavenCentral() } } diff --git a/packages/firebase_remote_config/firebase_remote_config/example/android/gradle.properties b/packages/firebase_remote_config/firebase_remote_config/example/android/gradle.properties index 1310f7a8fc01..aa8601e3000f 100644 --- a/packages/firebase_remote_config/firebase_remote_config/example/android/gradle.properties +++ b/packages/firebase_remote_config/firebase_remote_config/example/android/gradle.properties @@ -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 \ No newline at end of file +android.nonFinalResIds=false diff --git a/packages/firebase_remote_config/firebase_remote_config/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_remote_config/firebase_remote_config/example/android/gradle/wrapper/gradle-wrapper.properties index da1db5f04e88..db9a6b825d7f 100644 --- a/packages/firebase_remote_config/firebase_remote_config/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/firebase_remote_config/firebase_remote_config/example/android/gradle/wrapper/gradle-wrapper.properties @@ -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.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/firebase_storage/firebase_storage/android/build.gradle b/packages/firebase_storage/firebase_storage/android/build.gradle index 0fe207601d46..c6416d7cc991 100755 --- a/packages/firebase_storage/firebase_storage/android/build.gradle +++ b/packages/firebase_storage/firebase_storage/android/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.5.4' + classpath 'com.android.tools.build:gradle:8.1.2' } } @@ -48,23 +48,31 @@ android { namespace 'io.flutter.plugins.firebase.storage' } - compileSdkVersion 31 + compileSdk 33 + + buildFeatures { + buildConfig = true + } + compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } + defaultConfig { - minSdkVersion 16 + minSdk 19 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } + lintOptions { disable 'InvalidPackage' } + dependencies { api firebaseCoreProject implementation platform("com.google.firebase:firebase-bom:${getRootProjectExtOrCoreProperty("FirebaseSDKVersion", firebaseCoreProject)}") implementation 'com.google.firebase:firebase-storage' - implementation 'androidx.annotation:annotation:1.1.0' + implementation 'androidx.annotation:annotation:1.7.0' } } diff --git a/packages/firebase_storage/firebase_storage/example/android/app/build.gradle b/packages/firebase_storage/firebase_storage/example/android/app/build.gradle index 12865218052f..579b2135f39a 100755 --- a/packages/firebase_storage/firebase_storage/example/android/app/build.gradle +++ b/packages/firebase_storage/firebase_storage/example/android/app/build.gradle @@ -26,7 +26,11 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.firebasestorageexample' - compileSdkVersion 33 + compileSdk 33 + + buildFeatures { + buildConfig = true + } lintOptions { disable 'InvalidPackage' @@ -34,8 +38,8 @@ android { defaultConfig { applicationId 'io.flutter.plugins.firebasestorageexample' - minSdkVersion 21 - targetSdkVersion 33 + minSdk 21 + targetSdk 33 versionCode flutterVersionCode.toInteger() versionName flutterVersionName testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/packages/firebase_storage/firebase_storage/example/android/app/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_storage/firebase_storage/example/android/app/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index da1db5f04e88..000000000000 --- a/packages/firebase_storage/firebase_storage/example/android/app/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,5 +0,0 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists diff --git a/packages/firebase_storage/firebase_storage/example/android/build.gradle b/packages/firebase_storage/firebase_storage/example/android/build.gradle index 05226cc38ae5..50d2594f4c32 100755 --- a/packages/firebase_storage/firebase_storage/example/android/build.gradle +++ b/packages/firebase_storage/firebase_storage/example/android/build.gradle @@ -1,11 +1,11 @@ buildscript { repositories { google() - jcenter() + mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.android.tools.build:gradle:8.1.2' classpath 'com.google.gms:google-services:4.3.15' } } @@ -13,7 +13,7 @@ buildscript { allprojects { repositories { google() - jcenter() + mavenCentral() } } diff --git a/packages/firebase_storage/firebase_storage/example/android/gradle.properties b/packages/firebase_storage/firebase_storage/example/android/gradle.properties index 1310f7a8fc01..aa8601e3000f 100755 --- a/packages/firebase_storage/firebase_storage/example/android/gradle.properties +++ b/packages/firebase_storage/firebase_storage/example/android/gradle.properties @@ -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 \ No newline at end of file +android.nonFinalResIds=false diff --git a/packages/firebase_storage/firebase_storage/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_storage/firebase_storage/example/android/gradle/wrapper/gradle-wrapper.properties index da1db5f04e88..db9a6b825d7f 100644 --- a/packages/firebase_storage/firebase_storage/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/firebase_storage/firebase_storage/example/android/gradle/wrapper/gradle-wrapper.properties @@ -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.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From b7315a55f2fdb11679de782bcc256713fc2d01dd Mon Sep 17 00:00:00 2001 From: Volodymyr Date: Fri, 13 Oct 2023 16:16:00 +0300 Subject: [PATCH 4/7] chore(all): Format all build.gradle files order of blocks --- .../cloud_firestore/android/build.gradle | 20 ++++++++----- .../example/android/app/build.gradle | 28 +++++++++---------- .../cloud_functions/android/build.gradle | 17 +++++++---- .../example/android/app/build.gradle | 11 ++++---- .../firebase_analytics/android/build.gradle | 10 +++---- .../example/android/app/build.gradle | 9 +++--- .../firebase_app_check/android/build.gradle | 18 ++++++++---- .../example/android/app/build.gradle | 9 +++--- .../android/build.gradle | 8 ++++-- .../example/android/app/build.gradle | 19 +++++++------ .../firebase_auth/android/build.gradle | 16 +++++++---- .../example/android/app/build.gradle | 22 +++++++-------- .../firebase_core/android/build.gradle | 8 +++--- .../example/android/app/build.gradle | 12 ++++---- .../firebase_crashlytics/android/build.gradle | 10 +++---- .../example/android/app/build.gradle | 9 +++--- .../firebase_database/android/build.gradle | 12 ++++---- .../example/android/app/build.gradle | 13 +++++---- .../android/build.gradle | 10 +++---- .../example/android/app/build.gradle | 16 +++++------ .../android/build.gradle | 10 +++---- .../example/android/app/build.gradle | 9 +++--- .../firebase_messaging/android/build.gradle | 11 ++++---- .../example/android/app/build.gradle | 17 +++++------ .../android/build.gradle | 10 +++---- .../example/android/app/build.gradle | 17 +++++------ .../firebase_performance/android/build.gradle | 8 ++++-- .../example/android/app/build.gradle | 27 +++++++++--------- .../android/build.gradle | 15 +++++----- .../example/android/app/build.gradle | 17 +++++------ .../firebase_storage/android/build.gradle | 10 +++---- .../example/android/app/build.gradle | 17 +++++------ tests/android/app/build.gradle | 2 +- 33 files changed, 244 insertions(+), 203 deletions(-) diff --git a/packages/cloud_firestore/cloud_firestore/android/build.gradle b/packages/cloud_firestore/cloud_firestore/android/build.gradle index cc944d597dbf..f42d1869455a 100755 --- a/packages/cloud_firestore/cloud_firestore/android/build.gradle +++ b/packages/cloud_firestore/cloud_firestore/android/build.gradle @@ -39,21 +39,27 @@ android { if (project.android.hasProperty("namespace")) { namespace 'io.flutter.plugins.firebase.firestore' } - buildFeatures { - buildConfig true - } + compileSDK 33 - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } + defaultConfig { minSdk 19 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + + buildFeatures { + buildConfig true + } + lintOptions { disable 'InvalidPackage' } + dependencies { api firebaseCoreProject implementation platform("com.google.firebase:firebase-bom:${getRootProjectExtOrCoreProperty("FirebaseSDKVersion", firebaseCoreProject)}") diff --git a/packages/cloud_firestore/cloud_firestore/example/android/app/build.gradle b/packages/cloud_firestore/cloud_firestore/example/android/app/build.gradle index d02be2ff6bba..8a71a108d758 100644 --- a/packages/cloud_firestore/cloud_firestore/example/android/app/build.gradle +++ b/packages/cloud_firestore/cloud_firestore/example/android/app/build.gradle @@ -29,20 +29,9 @@ apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdk 33 - - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - - kotlinOptions { - jvmTarget = '1.8' - } + namespace 'io.flutter.plugins.firebase.firestore.example' - sourceSets { - main.java.srcDirs += 'src/main/kotlin' - } + compileSdk 33 defaultConfig { applicationId "io.flutter.plugins.firebase.firestore.example" @@ -50,7 +39,19 @@ android { targetSdk 33 versionCode flutterVersionCode.toInteger() versionName flutterVersionName + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } + + sourceSets { + main.java.srcDirs += 'src/main/kotlin' } buildTypes { @@ -60,7 +61,6 @@ android { signingConfig signingConfigs.debug } } - namespace 'io.flutter.plugins.firebase.firestore.example' } flutter { diff --git a/packages/cloud_functions/cloud_functions/android/build.gradle b/packages/cloud_functions/cloud_functions/android/build.gradle index 9163fc627019..d9152439db0a 100644 --- a/packages/cloud_functions/cloud_functions/android/build.gradle +++ b/packages/cloud_functions/cloud_functions/android/build.gradle @@ -39,21 +39,26 @@ android { if (project.android.hasProperty("namespace")) { namespace 'io.flutter.plugins.firebase.functions' } - buildFeatures { - buildConfig = true - } + compileSdk 33 + + defaultConfig { + minSdk 19 + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } - defaultConfig { - minSdk 19 - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + buildFeatures { + buildConfig = true } + lintOptions { disable 'InvalidPackage' } + dependencies { api firebaseCoreProject implementation platform("com.google.firebase:firebase-bom:${getRootProjectExtOrCoreProperty("FirebaseSDKVersion", firebaseCoreProject)}") diff --git a/packages/cloud_functions/cloud_functions/example/android/app/build.gradle b/packages/cloud_functions/cloud_functions/example/android/app/build.gradle index 79b32d110890..23ee3fb156a8 100644 --- a/packages/cloud_functions/cloud_functions/example/android/app/build.gradle +++ b/packages/cloud_functions/cloud_functions/example/android/app/build.gradle @@ -26,10 +26,10 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.firebase.functions.example' - compileSdk 33 + compileSdk 33 - defaultConfig { + defaultConfig { applicationId "io.flutter.plugins.firebase.functions.example" minSdkVersion 16 targetSdkVersion 33 @@ -38,6 +38,10 @@ android { testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } + lint { + disable 'InvalidPackage' + } + buildTypes { release { // TODO: Add your own signing config for the release build. @@ -45,9 +49,6 @@ android { signingConfig signingConfigs.debug } } - lint { - disable 'InvalidPackage' - } } flutter { diff --git a/packages/firebase_analytics/firebase_analytics/android/build.gradle b/packages/firebase_analytics/firebase_analytics/android/build.gradle index 155f74c50b6c..6c49815432d7 100755 --- a/packages/firebase_analytics/firebase_analytics/android/build.gradle +++ b/packages/firebase_analytics/firebase_analytics/android/build.gradle @@ -40,10 +40,6 @@ android { namespace 'io.flutter.plugins.firebase.analytics' } - buildFeatures { - buildConfig true - } - compileSdk 33 defaultConfig { @@ -56,8 +52,12 @@ android { targetCompatibility JavaVersion.VERSION_1_8 } + buildFeatures { + buildConfig true + } + lintOptions { - disable 'InvalidPackage' + disable 'InvalidPackage' } dependencies { diff --git a/packages/firebase_analytics/firebase_analytics/example/android/app/build.gradle b/packages/firebase_analytics/firebase_analytics/example/android/app/build.gradle index c82aa2658052..da3fa50b89d2 100755 --- a/packages/firebase_analytics/firebase_analytics/example/android/app/build.gradle +++ b/packages/firebase_analytics/firebase_analytics/example/android/app/build.gradle @@ -27,11 +27,8 @@ apply plugin: 'com.google.gms.google-services' android { namespace 'io.flutter.plugins.firebase.analytics.example' - compileSdk 33 - lintOptions { - disable 'InvalidPackage' - } + compileSdk 33 defaultConfig { applicationId "io.flutter.plugins.firebase.analytics.example" @@ -42,6 +39,10 @@ android { testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } + lintOptions { + disable 'InvalidPackage' + } + buildTypes { release { // TODO: Add your own signing config for the release build. diff --git a/packages/firebase_app_check/firebase_app_check/android/build.gradle b/packages/firebase_app_check/firebase_app_check/android/build.gradle index 4a1c206e585a..d01f068830f4 100644 --- a/packages/firebase_app_check/firebase_app_check/android/build.gradle +++ b/packages/firebase_app_check/firebase_app_check/android/build.gradle @@ -39,21 +39,27 @@ android { if (project.android.hasProperty("namespace")) { namespace 'io.flutter.plugins.firebase.appcheck' } - buildFeatures { - buildConfig true - } + compileSdk 33 + + defaultConfig { + minSdk 19 + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } - defaultConfig { - minSdk 19 - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + + buildFeatures { + buildConfig true } + lintOptions { disable 'InvalidPackage' } + dependencies { api firebaseCoreProject implementation platform("com.google.firebase:firebase-bom:${getRootProjectExtOrCoreProperty("FirebaseSDKVersion", firebaseCoreProject)}") diff --git a/packages/firebase_app_check/firebase_app_check/example/android/app/build.gradle b/packages/firebase_app_check/firebase_app_check/example/android/app/build.gradle index f9cc88caf8f7..04b252d44dd5 100644 --- a/packages/firebase_app_check/firebase_app_check/example/android/app/build.gradle +++ b/packages/firebase_app_check/firebase_app_check/example/android/app/build.gradle @@ -29,11 +29,8 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace "io.flutter.plugins.firebase.appcheck.example" - compileSdk 33 - buildFeatures { - buildConfig true - } + compileSdk 33 defaultConfig { applicationId "io.flutter.plugins.firebase.appcheck.example" @@ -43,6 +40,10 @@ android { versionName flutterVersionName } + buildFeatures { + buildConfig true + } + buildTypes { release { // TODO: Add your own signing config for the release build. diff --git a/packages/firebase_app_installations/firebase_app_installations/android/build.gradle b/packages/firebase_app_installations/firebase_app_installations/android/build.gradle index 586a0050fc56..452734ea4579 100644 --- a/packages/firebase_app_installations/firebase_app_installations/android/build.gradle +++ b/packages/firebase_app_installations/firebase_app_installations/android/build.gradle @@ -42,13 +42,17 @@ android { compileSdk 33 + defaultConfig { + minSdk 19 + } + compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } - defaultConfig { - minSdk 19 + buildFeatures { + buildConfig true } dependencies { diff --git a/packages/firebase_app_installations/firebase_app_installations/example/android/app/build.gradle b/packages/firebase_app_installations/firebase_app_installations/example/android/app/build.gradle index 734bd2c4f025..199db593891b 100644 --- a/packages/firebase_app_installations/firebase_app_installations/example/android/app/build.gradle +++ b/packages/firebase_app_installations/firebase_app_installations/example/android/app/build.gradle @@ -28,8 +28,18 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.firebase.installations.example' + compileSdk 33 + defaultConfig { + // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). + applicationId "io.flutter.plugins.firebase.installations.example" + minSdk 21 + targetSdk 33 + versionCode flutterVersionCode.toInteger() + versionName flutterVersionName + } + compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 @@ -43,15 +53,6 @@ android { main.java.srcDirs += 'src/main/kotlin' } - defaultConfig { - // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). - applicationId "io.flutter.plugins.firebase.installations.example" - minSdk 21 - targetSdk 33 - versionCode flutterVersionCode.toInteger() - versionName flutterVersionName - } - buildTypes { release { // TODO: Add your own signing config for the release build. diff --git a/packages/firebase_auth/firebase_auth/android/build.gradle b/packages/firebase_auth/firebase_auth/android/build.gradle index f66ca3d58618..d6d88e5bbf51 100755 --- a/packages/firebase_auth/firebase_auth/android/build.gradle +++ b/packages/firebase_auth/firebase_auth/android/build.gradle @@ -39,18 +39,22 @@ android { if (project.android.hasProperty("namespace")) { namespace 'io.flutter.plugins.firebase.auth' } - buildFeatures { - buildConfig true - } + compileSdk 33 + + defaultConfig { + minSdk 19 + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } - defaultConfig { - minSdk 19 - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + + buildFeatures { + buildConfig true } + lintOptions { disable 'InvalidPackage' } diff --git a/packages/firebase_auth/firebase_auth/example/android/app/build.gradle b/packages/firebase_auth/firebase_auth/example/android/app/build.gradle index 80e12675207c..a47df03b58cc 100644 --- a/packages/firebase_auth/firebase_auth/example/android/app/build.gradle +++ b/packages/firebase_auth/firebase_auth/example/android/app/build.gradle @@ -31,7 +31,17 @@ android { namespace 'io.flutter.plugins.firebaseauthexample' } - compileSdk flutter.compileSdkVersion + compileSdk flutter.compileSdkVersion + + defaultConfig { + // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). + applicationId "io.flutter.plugins.firebase.auth.example" + minSdk 19 + targetSdkVersion flutter.targetSdkVersion + versionCode flutterVersionCode.toInteger() + versionName flutterVersionName + multiDexEnabled true + } compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 @@ -46,16 +56,6 @@ android { main.java.srcDirs += 'src/main/kotlin' } - defaultConfig { - // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). - applicationId "io.flutter.plugins.firebase.auth.example" - minSdk 19 - targetSdkVersion flutter.targetSdkVersion - versionCode flutterVersionCode.toInteger() - versionName flutterVersionName - multiDexEnabled true - } - buildTypes { release { // TODO: Add your own signing config for the release build. diff --git a/packages/firebase_core/firebase_core/android/build.gradle b/packages/firebase_core/firebase_core/android/build.gradle index b549bad811f7..ad307e3081ca 100644 --- a/packages/firebase_core/firebase_core/android/build.gradle +++ b/packages/firebase_core/firebase_core/android/build.gradle @@ -26,10 +26,6 @@ android { namespace 'io.flutter.plugins.firebase.core' } - buildFeatures { - buildConfig true - } - compileSdk 33 defaultConfig { @@ -42,6 +38,10 @@ android { targetCompatibility JavaVersion.VERSION_1_8 } + buildFeatures { + buildConfig true + } + lintOptions { disable 'InvalidPackage' } diff --git a/packages/firebase_core/firebase_core/example/android/app/build.gradle b/packages/firebase_core/firebase_core/example/android/app/build.gradle index 92c54711b33f..0ba55cfdf6ad 100644 --- a/packages/firebase_core/firebase_core/example/android/app/build.gradle +++ b/packages/firebase_core/firebase_core/example/android/app/build.gradle @@ -26,11 +26,8 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.firebasecoreexample' - compileSdk flutter.compileSdkVersion - buildFeatures { - buildConfig = true - } + compileSdk flutter.compileSdkVersion defaultConfig { applicationId "io.flutter.plugins.firebasecoreexample" @@ -45,6 +42,10 @@ android { targetCompatibility JavaVersion.VERSION_1_8 } + buildFeatures { + buildConfig = true + } + buildTypes { release { signingConfig signingConfigs.debug @@ -55,6 +56,3 @@ android { flutter { source '../..' } - -dependencies { -} diff --git a/packages/firebase_crashlytics/firebase_crashlytics/android/build.gradle b/packages/firebase_crashlytics/firebase_crashlytics/android/build.gradle index 66a69e9a743c..30b8f9e84172 100644 --- a/packages/firebase_crashlytics/firebase_crashlytics/android/build.gradle +++ b/packages/firebase_crashlytics/firebase_crashlytics/android/build.gradle @@ -41,8 +41,9 @@ android { compileSdk 33 - buildFeatures { - buildConfig = true + defaultConfig { + minSdk 19 + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } compileOptions { @@ -50,9 +51,8 @@ android { targetCompatibility JavaVersion.VERSION_1_8 } - defaultConfig { - minSdk 19 - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + buildFeatures { + buildConfig = true } lintOptions { diff --git a/packages/firebase_crashlytics/firebase_crashlytics/example/android/app/build.gradle b/packages/firebase_crashlytics/firebase_crashlytics/example/android/app/build.gradle index 8417af92bac2..a3cf8ac5b172 100644 --- a/packages/firebase_crashlytics/firebase_crashlytics/example/android/app/build.gradle +++ b/packages/firebase_crashlytics/firebase_crashlytics/example/android/app/build.gradle @@ -26,11 +26,8 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.firebasecrashlyticsexample' - compileSdk 33 - lintOptions { - disable 'InvalidPackage' - } + compileSdk 33 defaultConfig { applicationId 'io.flutter.plugins.firebasecrashlyticsexample' @@ -41,6 +38,10 @@ android { testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } + lintOptions { + disable 'InvalidPackage' + } + buildTypes { release { // TODO: Add your own signing config for the release build. diff --git a/packages/firebase_database/firebase_database/android/build.gradle b/packages/firebase_database/firebase_database/android/build.gradle index 35931a57cf1d..32df768a64fd 100755 --- a/packages/firebase_database/firebase_database/android/build.gradle +++ b/packages/firebase_database/firebase_database/android/build.gradle @@ -42,18 +42,18 @@ android { compileSdk 33 - buildFeatures { - buildConfig = true - } - defaultConfig { minSdk 19 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + + buildFeatures { + buildConfig = true } lintOptions { diff --git a/packages/firebase_database/firebase_database/example/android/app/build.gradle b/packages/firebase_database/firebase_database/example/android/app/build.gradle index 12f502b90546..d5ac4b01b77e 100755 --- a/packages/firebase_database/firebase_database/example/android/app/build.gradle +++ b/packages/firebase_database/firebase_database/example/android/app/build.gradle @@ -26,20 +26,21 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.firebase.database.example' - compileSdkVersion 33 - lintOptions { - disable 'InvalidPackage' - } + compileSdk 33 defaultConfig { applicationId 'io.flutter.plugins.firebase.database.example' - minSdkVersion 19 - targetSdkVersion 33 + minSdk 19 + targetSdk 33 versionCode flutterVersionCode.toInteger() versionName flutterVersionName } + lintOptions { + disable 'InvalidPackage' + } + buildTypes { release { signingConfig signingConfigs.debug diff --git a/packages/firebase_dynamic_links/firebase_dynamic_links/android/build.gradle b/packages/firebase_dynamic_links/firebase_dynamic_links/android/build.gradle index f2bc52cb6ba1..c48b5edeb993 100644 --- a/packages/firebase_dynamic_links/firebase_dynamic_links/android/build.gradle +++ b/packages/firebase_dynamic_links/firebase_dynamic_links/android/build.gradle @@ -42,8 +42,9 @@ android { compileSdk 33 - buildFeatures { - buildConfig = true + defaultConfig { + minSdk 19 + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } compileOptions { @@ -51,9 +52,8 @@ android { targetCompatibility JavaVersion.VERSION_1_8 } - defaultConfig { - minSdk 19 - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + buildFeatures { + buildConfig = true } lintOptions { diff --git a/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/app/build.gradle b/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/app/build.gradle index 4ac01ae5f071..aa64225e152f 100644 --- a/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/app/build.gradle +++ b/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/app/build.gradle @@ -29,14 +29,6 @@ android { compileSdk 33 - lintOptions { - disable 'InvalidPackage' - } - - buildFeatures { - buildConfig = true - } - defaultConfig { applicationId "io.flutter.plugins.firebase.dynamiclinksexample" minSdk 19 @@ -45,6 +37,14 @@ android { versionName flutterVersionName } + buildFeatures { + buildConfig = true + } + + lintOptions { + disable 'InvalidPackage' + } + buildTypes { release { signingConfig signingConfigs.debug diff --git a/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/build.gradle b/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/build.gradle index e3460cd2142a..a8140c98f49b 100644 --- a/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/build.gradle +++ b/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/build.gradle @@ -42,8 +42,9 @@ android { compileSdk 33 - buildFeatures { - buildConfig = true + defaultConfig { + minSdk 19 + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } compileOptions { @@ -51,9 +52,8 @@ android { targetCompatibility JavaVersion.VERSION_1_8 } - defaultConfig { - minSdk 19 - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + buildFeatures { + buildConfig = true } lintOptions { diff --git a/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/app/build.gradle b/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/app/build.gradle index d047eba58b14..921fd33721f3 100644 --- a/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/app/build.gradle +++ b/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/app/build.gradle @@ -26,11 +26,8 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.firebase.tests' - compileSdk 33 - lintOptions { - disable 'InvalidPackage' - } + compileSdk 33 defaultConfig { applicationId "io.flutter.plugins.firebase.tests" @@ -41,6 +38,10 @@ android { testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } + lintOptions { + disable 'InvalidPackage' + } + buildTypes { release { // TODO: Add your own signing config for the release build. diff --git a/packages/firebase_messaging/firebase_messaging/android/build.gradle b/packages/firebase_messaging/firebase_messaging/android/build.gradle index 7e486a480300..5c937f6b59f9 100644 --- a/packages/firebase_messaging/firebase_messaging/android/build.gradle +++ b/packages/firebase_messaging/firebase_messaging/android/build.gradle @@ -42,17 +42,18 @@ android { compileSdk 33 - buildFeatures { - buildConfig = true + defaultConfig { + minSdk 19 + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } - defaultConfig { - minSdk 19 - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + + buildFeatures { + buildConfig = true } lintOptions { diff --git a/packages/firebase_messaging/firebase_messaging/example/android/app/build.gradle b/packages/firebase_messaging/firebase_messaging/example/android/app/build.gradle index ed391925eb6a..f1cb80702305 100644 --- a/packages/firebase_messaging/firebase_messaging/example/android/app/build.gradle +++ b/packages/firebase_messaging/firebase_messaging/example/android/app/build.gradle @@ -26,15 +26,8 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.firebase.messaging.example' - compileSdk 33 - - lintOptions { - disable 'InvalidPackage' - } - buildFeatures { - buildConfig = true - } + compileSdk 33 defaultConfig { applicationId "io.flutter.plugins.firebase.messaging.example" @@ -44,6 +37,14 @@ android { versionName flutterVersionName } + buildFeatures { + buildConfig = true + } + + lintOptions { + disable 'InvalidPackage' + } + buildTypes { release { // TODO: Add your own signing config for the release build. diff --git a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/build.gradle b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/build.gradle index a500f4494a6f..d110cc13fc72 100644 --- a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/build.gradle +++ b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/build.gradle @@ -42,16 +42,16 @@ android { compileSdk 33 - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - defaultConfig { minSdk 19 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + lintOptions { disable 'InvalidPackage' } diff --git a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/app/build.gradle b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/app/build.gradle index 26c352401b74..bc055bbc662d 100644 --- a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/app/build.gradle +++ b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/app/build.gradle @@ -29,10 +29,15 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.firebase.tests' + compileSdk 33 - buildFeatures { - buildConfig = true + defaultConfig { + applicationId "io.flutter.plugins.firebase.tests" + minSdk 21 + targetSdk 33 + versionCode flutterVersionCode.toInteger() + versionName flutterVersionName } compileOptions { @@ -40,12 +45,8 @@ android { targetCompatibility JavaVersion.VERSION_1_8 } - defaultConfig { - applicationId "io.flutter.plugins.firebase.tests" - minSdk 21 - targetSdk 33 - versionCode flutterVersionCode.toInteger() - versionName flutterVersionName + buildFeatures { + buildConfig = true } buildTypes { diff --git a/packages/firebase_performance/firebase_performance/android/build.gradle b/packages/firebase_performance/firebase_performance/android/build.gradle index 87ba32ea2d67..0040b1b34a5f 100644 --- a/packages/firebase_performance/firebase_performance/android/build.gradle +++ b/packages/firebase_performance/firebase_performance/android/build.gradle @@ -48,8 +48,12 @@ android { } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + + buildFeatures { + buildConfig true } lintOptions { diff --git a/packages/firebase_performance/firebase_performance/example/android/app/build.gradle b/packages/firebase_performance/firebase_performance/example/android/app/build.gradle index 941f5645be1c..4ab2d63c1997 100644 --- a/packages/firebase_performance/firebase_performance/example/android/app/build.gradle +++ b/packages/firebase_performance/firebase_performance/example/android/app/build.gradle @@ -27,15 +27,8 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.firebase.tests' - compileSdk 33 - buildFeatures { - buildConfig = true - } - - lintOptions { - disable 'InvalidPackage' - } + compileSdk 33 defaultConfig { applicationId "io.flutter.plugins.firebase.tests" @@ -46,16 +39,24 @@ android { testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + + buildFeatures { + buildConfig = true + } + + lintOptions { + disable 'InvalidPackage' + } + buildTypes { release { signingConfig signingConfigs.debug } } - - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } } flutter { diff --git a/packages/firebase_remote_config/firebase_remote_config/android/build.gradle b/packages/firebase_remote_config/firebase_remote_config/android/build.gradle index 326fa746cf59..c2267503ea26 100644 --- a/packages/firebase_remote_config/firebase_remote_config/android/build.gradle +++ b/packages/firebase_remote_config/firebase_remote_config/android/build.gradle @@ -42,19 +42,20 @@ android { compileSdk 33 - buildFeatures { - buildConfig = true + defaultConfig { + minSdk 19 + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 } - defaultConfig { - minSdk 19 - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + buildFeatures { + buildConfig = true } + lintOptions { disable 'InvalidPackage' } diff --git a/packages/firebase_remote_config/firebase_remote_config/example/android/app/build.gradle b/packages/firebase_remote_config/firebase_remote_config/example/android/app/build.gradle index 780054e85de9..7a60d8f6e521 100644 --- a/packages/firebase_remote_config/firebase_remote_config/example/android/app/build.gradle +++ b/packages/firebase_remote_config/firebase_remote_config/example/android/app/build.gradle @@ -26,15 +26,8 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.firebase.remoteconfig.example' - compileSdk 33 - - buildFeatures { - buildConfig = true - } - lintOptions { - disable 'InvalidPackage' - } + compileSdk 33 defaultConfig { applicationId "io.flutter.plugins.firebase.remoteconfig.example" @@ -44,6 +37,14 @@ android { versionName flutterVersionName } + buildFeatures { + buildConfig = true + } + + lintOptions { + disable 'InvalidPackage' + } + buildTypes { release { signingConfig signingConfigs.debug diff --git a/packages/firebase_storage/firebase_storage/android/build.gradle b/packages/firebase_storage/firebase_storage/android/build.gradle index c6416d7cc991..6b4fde841fc6 100755 --- a/packages/firebase_storage/firebase_storage/android/build.gradle +++ b/packages/firebase_storage/firebase_storage/android/build.gradle @@ -50,8 +50,9 @@ android { compileSdk 33 - buildFeatures { - buildConfig = true + defaultConfig { + minSdk 19 + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } compileOptions { @@ -59,9 +60,8 @@ android { targetCompatibility JavaVersion.VERSION_1_8 } - defaultConfig { - minSdk 19 - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + buildFeatures { + buildConfig = true } lintOptions { diff --git a/packages/firebase_storage/firebase_storage/example/android/app/build.gradle b/packages/firebase_storage/firebase_storage/example/android/app/build.gradle index 579b2135f39a..5b439598d3cb 100755 --- a/packages/firebase_storage/firebase_storage/example/android/app/build.gradle +++ b/packages/firebase_storage/firebase_storage/example/android/app/build.gradle @@ -26,15 +26,8 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.firebasestorageexample' - compileSdk 33 - - buildFeatures { - buildConfig = true - } - lintOptions { - disable 'InvalidPackage' - } + compileSdk 33 defaultConfig { applicationId 'io.flutter.plugins.firebasestorageexample' @@ -45,6 +38,14 @@ android { testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } + buildFeatures { + buildConfig = true + } + + lintOptions { + disable 'InvalidPackage' + } + buildTypes { release { // TODO: Add your own signing config for the release build. diff --git a/tests/android/app/build.gradle b/tests/android/app/build.gradle index a708dc21a8bd..716cf2fcac97 100644 --- a/tests/android/app/build.gradle +++ b/tests/android/app/build.gradle @@ -67,5 +67,5 @@ flutter { } dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" } From 4f5c66b34cca03ee697d70066a71d3aee71580c1 Mon Sep 17 00:00:00 2001 From: Volodymyr Date: Fri, 13 Oct 2023 17:37:03 +0300 Subject: [PATCH 5/7] Revert "refactor(ci): Remove redundant Java installation step" This reverts commit 8e341809f0061306c5445cc178c8feac8cdb468a. --- .github/workflows/e2e_tests.yaml | 20 +++++++++++++++++++ .github/workflows/firebase_firestore_odm.yaml | 4 ++++ 2 files changed, 24 insertions(+) diff --git a/.github/workflows/e2e_tests.yaml b/.github/workflows/e2e_tests.yaml index e50642cc6ef0..f8b3945a31c4 100644 --- a/.github/workflows/e2e_tests.yaml +++ b/.github/workflows/e2e_tests.yaml @@ -38,6 +38,10 @@ jobs: name: Install Node.js 16 with: node-version: '16' + - uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 + with: + distribution: 'temurin' + java-version: '11' - uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 name: Gradle Cache with: @@ -107,6 +111,10 @@ jobs: name: Install Node.js 16 with: node-version: '16' + - uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 + with: + distribution: 'temurin' + java-version: '11' - uses: hendrikmuhs/ccache-action@ca3acd2731eef11f1572ccb126356c2f9298d35e name: Xcode Compile Cache with: @@ -178,6 +186,10 @@ jobs: name: Install Node.js 16 with: node-version: '16' + - uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 + with: + distribution: 'temurin' + java-version: '11' - uses: hendrikmuhs/ccache-action@ca3acd2731eef11f1572ccb126356c2f9298d35e name: Xcode Compile Cache with: @@ -243,6 +255,10 @@ jobs: name: Install Node.js 16 with: node-version: '16' + - uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 + with: + distribution: 'temurin' + java-version: '11' - uses: subosito/flutter-action@48cafc24713cca54bbe03cdc3a423187d413aafa with: channel: 'stable' @@ -283,6 +299,10 @@ jobs: timeout-minutes: 45 steps: - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 + - uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 + with: + distribution: 'temurin' + java-version: '11' - uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 name: Install Node.js 16 with: diff --git a/.github/workflows/firebase_firestore_odm.yaml b/.github/workflows/firebase_firestore_odm.yaml index 4e98ba74a3a5..1876a0b90025 100644 --- a/.github/workflows/firebase_firestore_odm.yaml +++ b/.github/workflows/firebase_firestore_odm.yaml @@ -58,6 +58,10 @@ jobs: name: Install Node.js 16 with: node-version: '16' + - uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 + with: + distribution: 'temurin' + java-version: '11' - uses: subosito/flutter-action@48cafc24713cca54bbe03cdc3a423187d413aafa with: channel: 'stable' From bff4f6377f7cb1372c478329e0567b37185475ee Mon Sep 17 00:00:00 2001 From: Volodymyr Date: Fri, 13 Oct 2023 17:38:51 +0300 Subject: [PATCH 6/7] chore(ci): Bump used Java version to 17 --- .github/workflows/e2e_tests.yaml | 10 +++++----- .github/workflows/firebase_firestore_odm.yaml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/e2e_tests.yaml b/.github/workflows/e2e_tests.yaml index f8b3945a31c4..69a875253441 100644 --- a/.github/workflows/e2e_tests.yaml +++ b/.github/workflows/e2e_tests.yaml @@ -41,7 +41,7 @@ jobs: - uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 with: distribution: 'temurin' - java-version: '11' + java-version: '17' - uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 name: Gradle Cache with: @@ -114,7 +114,7 @@ jobs: - uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 with: distribution: 'temurin' - java-version: '11' + java-version: '17' - uses: hendrikmuhs/ccache-action@ca3acd2731eef11f1572ccb126356c2f9298d35e name: Xcode Compile Cache with: @@ -189,7 +189,7 @@ jobs: - uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 with: distribution: 'temurin' - java-version: '11' + java-version: '17' - uses: hendrikmuhs/ccache-action@ca3acd2731eef11f1572ccb126356c2f9298d35e name: Xcode Compile Cache with: @@ -258,7 +258,7 @@ jobs: - uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 with: distribution: 'temurin' - java-version: '11' + java-version: '17' - uses: subosito/flutter-action@48cafc24713cca54bbe03cdc3a423187d413aafa with: channel: 'stable' @@ -302,7 +302,7 @@ jobs: - uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 with: distribution: 'temurin' - java-version: '11' + java-version: '17' - uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 name: Install Node.js 16 with: diff --git a/.github/workflows/firebase_firestore_odm.yaml b/.github/workflows/firebase_firestore_odm.yaml index 1876a0b90025..5b656a64711d 100644 --- a/.github/workflows/firebase_firestore_odm.yaml +++ b/.github/workflows/firebase_firestore_odm.yaml @@ -61,7 +61,7 @@ jobs: - uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 with: distribution: 'temurin' - java-version: '11' + java-version: '17' - uses: subosito/flutter-action@48cafc24713cca54bbe03cdc3a423187d413aafa with: channel: 'stable' From 51c4596e7b79e1f6bb257aeda7425787b92d7f5d Mon Sep 17 00:00:00 2001 From: Volodymyr Buberenko Date: Mon, 16 Oct 2023 18:46:00 +0300 Subject: [PATCH 7/7] Fix typo in cloud_firestore build.gradle --- packages/cloud_firestore/cloud_firestore/android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/cloud_firestore/cloud_firestore/android/build.gradle b/packages/cloud_firestore/cloud_firestore/android/build.gradle index f42d1869455a..5bbd296a1bd1 100755 --- a/packages/cloud_firestore/cloud_firestore/android/build.gradle +++ b/packages/cloud_firestore/cloud_firestore/android/build.gradle @@ -40,7 +40,7 @@ android { namespace 'io.flutter.plugins.firebase.firestore' } - compileSDK 33 + compileSdk 33 defaultConfig { minSdk 19