diff --git a/.github/workflows/e2e_tests.yaml b/.github/workflows/e2e_tests.yaml index fb3a5d54dea2..f042179c18e0 100644 --- a/.github/workflows/e2e_tests.yaml +++ b/.github/workflows/e2e_tests.yaml @@ -41,7 +41,7 @@ jobs: - uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 with: distribution: 'temurin' - java-version: '11' + java-version: '17' - uses: actions/cache@69d9d449aced6a2ede0bc19182fadc3a0a42d2b0 name: Gradle Cache with: @@ -113,7 +113,7 @@ jobs: - uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 with: distribution: 'temurin' - java-version: '11' + java-version: '17' - uses: hendrikmuhs/ccache-action@ca3acd2731eef11f1572ccb126356c2f9298d35e name: Xcode Compile Cache with: @@ -188,7 +188,7 @@ jobs: - uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 with: distribution: 'temurin' - java-version: '11' + java-version: '17' - uses: hendrikmuhs/ccache-action@ca3acd2731eef11f1572ccb126356c2f9298d35e name: Xcode Compile Cache with: @@ -257,7 +257,7 @@ jobs: - uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 with: distribution: 'temurin' - java-version: '11' + java-version: '17' - uses: subosito/flutter-action@48cafc24713cca54bbe03cdc3a423187d413aafa with: channel: 'stable' diff --git a/.github/workflows/firebase_firestore_odm.yaml b/.github/workflows/firebase_firestore_odm.yaml index f09597e69941..57c140c4620d 100644 --- a/.github/workflows/firebase_firestore_odm.yaml +++ b/.github/workflows/firebase_firestore_odm.yaml @@ -61,7 +61,7 @@ jobs: - uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 with: distribution: 'temurin' - java-version: '11' + java-version: '17' - uses: subosito/flutter-action@48cafc24713cca54bbe03cdc3a423187d413aafa with: channel: 'stable' diff --git a/packages/cloud_firestore/cloud_firestore/android/build.gradle b/packages/cloud_firestore/cloud_firestore/android/build.gradle index 526144adac7d..1e604fa5dc95 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.0.2' } } @@ -39,7 +39,11 @@ android { if (project.android.hasProperty("namespace")) { namespace 'io.flutter.plugins.firebase.firestore' } - compileSdkVersion 31 + buildFeatures { + buildConfig = true + } + + compileSdk 33 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 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..3430cdcac207 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-jdk8:$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..27fbf75fa445 100644 --- a/packages/cloud_firestore/cloud_firestore/example/android/build.gradle +++ b/packages/cloud_firestore/cloud_firestore/example/android/build.gradle @@ -1,12 +1,12 @@ buildscript { - ext.kotlin_version = '1.7.10' + ext.kotlin_version = '1.9.0' repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.android.tools.build:gradle:8.0.2' // START: FlutterFire Configuration classpath 'com.google.gms:google-services:4.3.15' // END: FlutterFire Configuration diff --git a/packages/cloud_firestore/cloud_firestore/example/android/gradle.properties b/packages/cloud_firestore/cloud_firestore/example/android/gradle.properties index b9a9a2464056..b69a3d14f594 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..84a0b92f9af2 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.2.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/cloud_functions/cloud_functions/android/build.gradle b/packages/cloud_functions/cloud_functions/android/build.gradle index 0750dbb4f75f..c9eda49a8f43 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.0.2' } } @@ -39,8 +39,11 @@ android { if (project.android.hasProperty("namespace")) { namespace 'io.flutter.plugins.firebase.functions' } + buildFeatures { + buildConfig = true + } - compileSdkVersion 31 + compileSdk 33 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 @@ -56,7 +59,7 @@ android { api firebaseCoreProject implementation platform("com.google.firebase:firebase-bom:${getRootProjectExtOrCoreProperty("FirebaseSDKVersion", firebaseCoreProject)}") implementation 'com.google.firebase:firebase-functions' - implementation 'androidx.annotation:annotation:1.0.0' + implementation 'androidx.annotation:annotation:1.6.0' } } diff --git a/packages/cloud_functions/cloud_functions/example/android/app/gradle/wrapper/gradle-wrapper.properties b/packages/cloud_functions/cloud_functions/example/android/app/gradle/wrapper/gradle-wrapper.properties index da1db5f04e88..84a0b92f9af2 100644 --- a/packages/cloud_functions/cloud_functions/example/android/app/gradle/wrapper/gradle-wrapper.properties +++ b/packages/cloud_functions/cloud_functions/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.2.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/cloud_functions/cloud_functions/example/android/build.gradle b/packages/cloud_functions/cloud_functions/example/android/build.gradle index fe9f643af12d..945da8369027 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.0.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..b69a3d14f594 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..84a0b92f9af2 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.2.1-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..bda60775e586 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.0.2' } } @@ -39,8 +39,11 @@ android { if (project.android.hasProperty("namespace")) { namespace 'io.flutter.plugins.firebase.analytics' } - - compileSdkVersion 31 + buildFeatures { + buildConfig = true + } + + compileSdk 33 defaultConfig { minSdkVersion 19 diff --git a/packages/firebase_analytics/firebase_analytics/android/gradle.properties b/packages/firebase_analytics/firebase_analytics/android/gradle.properties index 1310f7a8fc01..b69a3d14f594 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..e7dbdf482ba6 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' 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 index 0ebb3108e207..84a0b92f9af2 100644 --- 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 @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/firebase_analytics/firebase_analytics/example/android/build.gradle b/packages/firebase_analytics/firebase_analytics/example/android/build.gradle index 0cdd38a12388..87672991fe50 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() } dependencies { - classpath 'com.android.tools.build:gradle:8.0.1' + classpath 'com.android.tools.build:gradle:8.0.2' classpath 'com.google.gms:google-services:4.3.15' } } @@ -14,7 +13,6 @@ buildscript { allprojects { repositories { google() - jcenter() mavenLocal() } } diff --git a/packages/firebase_analytics/firebase_analytics/example/android/gradle.properties b/packages/firebase_analytics/firebase_analytics/example/android/gradle.properties index 1310f7a8fc01..b69a3d14f594 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..84a0b92f9af2 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.2.1-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..9279b5d592c5 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.0.2' } } @@ -39,8 +39,11 @@ android { if (project.android.hasProperty("namespace")) { namespace 'io.flutter.plugins.firebase.appcheck' } + buildFeatures { + buildConfig = true + } - compileSdkVersion 31 + compileSdk 33 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 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..84a0b92f9af2 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.2.1-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..0dbe80b698c6 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,7 +29,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace "io.flutter.plugins.firebase.appcheck.example" - compileSdkVersion 33 + compileSdk 33 defaultConfig { applicationId "io.flutter.plugins.firebase.appcheck.example" 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..fd810ff849b7 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.0.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..b69a3d14f594 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..84a0b92f9af2 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.2.1-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..cc7fd3f9c67d 100644 --- a/packages/firebase_app_installations/firebase_app_installations/android/build.gradle +++ b/packages/firebase_app_installations/firebase_app_installations/android/build.gradle @@ -39,8 +39,11 @@ android { if (project.android.hasProperty("namespace")) { namespace 'io.flutter.plugins.firebase.installations.firebase_app_installations' } + buildFeatures { + buildConfig = true + } - compileSdkVersion 31 + compileSdk 33 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 @@ -59,7 +62,7 @@ android { } dependencies { - implementation 'androidx.annotation:annotation:1.1.0' + implementation 'androidx.annotation:annotation:1.6.0' } apply from: file("./user-agent.gradle") 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..84a0b92f9af2 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.2.1-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..099acaaef65b 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 @@ -66,5 +66,5 @@ flutter { } dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$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..e05d8e99bbfc 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 @@ -1,12 +1,12 @@ buildscript { - ext.kotlin_version = '1.7.10' + ext.kotlin_version = '1.9.0' repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:8.0.1' + classpath 'com.android.tools.build:gradle:8.0.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath 'com.google.gms:google-services:4.3.15' } diff --git a/packages/firebase_app_installations/firebase_app_installations/example/android/gradle.properties b/packages/firebase_app_installations/firebase_app_installations/example/android/gradle.properties index 1310f7a8fc01..b69a3d14f594 100644 --- a/packages/firebase_app_installations/firebase_app_installations/example/android/gradle.properties +++ b/packages/firebase_app_installations/firebase_app_installations/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_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..84a0b92f9af2 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.2.1-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..b74f9b13d8f8 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.0.2' } } @@ -39,7 +39,11 @@ 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 @@ -55,7 +59,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.6.0' } } 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..84a0b92f9af2 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.2.1-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..e57212075db8 100644 --- a/packages/firebase_auth/firebase_auth/example/android/app/build.gradle +++ b/packages/firebase_auth/firebase_auth/example/android/app/build.gradle @@ -30,8 +30,11 @@ android { if (project.android.hasProperty("namespace")) { namespace 'io.flutter.plugins.firebaseauthexample' } + buildFeatures { + buildConfig = true + } - compileSdkVersion flutter.compileSdkVersion + compileSdk 33 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 diff --git a/packages/firebase_auth/firebase_auth/example/android/build.gradle b/packages/firebase_auth/firebase_auth/example/android/build.gradle index 75986dc5d7ee..ba99240a2f3b 100644 --- a/packages/firebase_auth/firebase_auth/example/android/build.gradle +++ b/packages/firebase_auth/firebase_auth/example/android/build.gradle @@ -1,5 +1,5 @@ buildscript { - ext.kotlin_version = '1.7.10' + ext.kotlin_version = '1.9.0' repositories { google() mavenCentral() diff --git a/packages/firebase_auth/firebase_auth/example/android/gradle.properties b/packages/firebase_auth/firebase_auth/example/android/gradle.properties index 1310f7a8fc01..b69a3d14f594 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..84a0b92f9af2 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.2.1-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..97a5aa31c5df 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.0.2' } } @@ -25,8 +25,11 @@ android { if (project.android.hasProperty("namespace")) { namespace 'io.flutter.plugins.firebase.core' } + buildFeatures { + buildConfig = true + } - compileSdkVersion 31 + compileSdk 33 defaultConfig { minSdkVersion 16 @@ -43,7 +46,7 @@ android { 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.6.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..84a0b92f9af2 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.2.1-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..e5b0164e8526 100644 --- a/packages/firebase_core/firebase_core/example/android/app/build.gradle +++ b/packages/firebase_core/firebase_core/example/android/app/build.gradle @@ -26,7 +26,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.firebasecoreexample' - compileSdkVersion flutter.compileSdkVersion + compileSdk 33 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 diff --git a/packages/firebase_core/firebase_core/example/android/build.gradle b/packages/firebase_core/firebase_core/example/android/build.gradle index 8237b734dca2..a3b34c3b478a 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.0.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..b69a3d14f594 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..84a0b92f9af2 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.2.1-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..a5162b8175a6 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.0.2' } } @@ -38,8 +38,11 @@ android { if (project.android.hasProperty("namespace")) { namespace 'io.flutter.plugins.firebase.crashlytics' } + buildFeatures { + buildConfig = true + } - compileSdkVersion 31 + compileSdk 33 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 @@ -57,7 +60,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.6.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..ad83e6dda9ac 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' diff --git a/packages/firebase_crashlytics/firebase_crashlytics/example/android/build.gradle b/packages/firebase_crashlytics/firebase_crashlytics/example/android/build.gradle index e3aa19badb73..6af814ec9694 100644 --- a/packages/firebase_crashlytics/firebase_crashlytics/example/android/build.gradle +++ b/packages/firebase_crashlytics/firebase_crashlytics/example/android/build.gradle @@ -1,20 +1,20 @@ buildscript { repositories { google() - jcenter() + mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:8.0.1' + classpath 'com.android.tools.build:gradle:8.0.2' classpath 'com.google.gms:google-services:4.3.15' - classpath 'com.google.firebase:firebase-crashlytics-gradle:2.8.1' + classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.7' } } 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..b69a3d14f594 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..84a0b92f9af2 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.2.1-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..c1c7c951a20f 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.0.2' } } @@ -39,8 +39,11 @@ android { if (project.android.hasProperty("namespace")) { namespace 'io.flutter.plugins.firebase.database' } + buildFeatures { + buildConfig = true + } - compileSdkVersion 31 + compileSdk 33 defaultConfig { minSdkVersion 19 @@ -53,7 +56,7 @@ android { 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' + implementation 'androidx.annotation:annotation:1.6.0' } compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 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..2fee87ac23ed 100755 --- a/packages/firebase_database/firebase_database/example/android/app/build.gradle +++ b/packages/firebase_database/firebase_database/example/android/app/build.gradle @@ -26,7 +26,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.firebase.database.example' - compileSdkVersion 33 + compileSdk 33 lintOptions { disable 'InvalidPackage' 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 index da1db5f04e88..84a0b92f9af2 100644 --- 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 @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/firebase_database/firebase_database/example/android/build.gradle b/packages/firebase_database/firebase_database/example/android/build.gradle index fe9f643af12d..945da8369027 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.0.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..b69a3d14f594 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..84a0b92f9af2 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.2.1-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..48a9aac1b52d 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.0.2' } } @@ -39,8 +39,11 @@ android { if (project.android.hasProperty("namespace")) { namespace 'io.flutter.plugins.firebase.dynamiclinks' } + buildFeatures { + buildConfig = true + } - compileSdkVersion 31 + compileSdk 33 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 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..b8d7070b131c 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,7 +26,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.firebase.dynamiclinksexample' - compileSdkVersion 33 + compileSdk 33 lintOptions { disable 'InvalidPackage' 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 index da1db5f04e88..84a0b92f9af2 100644 --- 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 @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists 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..945da8369027 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.0.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..b69a3d14f594 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..84a0b92f9af2 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.2.1-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..9a32019922c7 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.0.2' } } @@ -39,8 +39,11 @@ android { if (project.android.hasProperty("namespace")) { namespace 'io.flutter.plugins.firebase.inappmessaging' } + buildFeatures { + buildConfig = true + } - compileSdkVersion 31 + compileSdk 33 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 @@ -56,7 +59,7 @@ android { 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.6.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..7be3d8b46841 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,2 @@ 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..8ac6a7bf3da4 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' 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..945da8369027 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.0.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..b69a3d14f594 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..84a0b92f9af2 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.2.1-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..811413d4e54e 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.0.2' } } @@ -39,8 +39,11 @@ android { if (project.android.hasProperty("namespace")) { namespace 'io.flutter.plugins.firebase.messaging' } + buildFeatures { + buildConfig = true + } - compileSdkVersion 33 + compileSdk 33 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 @@ -57,7 +60,7 @@ android { 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.6.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 96fb245e2cdd..1233527e4b71 100644 --- a/packages/firebase_messaging/firebase_messaging/example/android/app/build.gradle +++ b/packages/firebase_messaging/firebase_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.messaging.example' - compileSdkVersion 33 + compileSdk 33 lintOptions { disable 'InvalidPackage' diff --git a/packages/firebase_messaging/firebase_messaging/example/android/build.gradle b/packages/firebase_messaging/firebase_messaging/example/android/build.gradle index f51ab63f5983..04a966bd5ef5 100644 --- a/packages/firebase_messaging/firebase_messaging/example/android/build.gradle +++ b/packages/firebase_messaging/firebase_messaging/example/android/build.gradle @@ -1,11 +1,11 @@ buildscript { repositories { google() - jcenter() + mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.4.1' + classpath 'com.android.tools.build:gradle:8.0.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_messaging/firebase_messaging/example/android/gradle.properties b/packages/firebase_messaging/firebase_messaging/example/android/gradle.properties index 1310f7a8fc01..b69a3d14f594 100644 --- a/packages/firebase_messaging/firebase_messaging/example/android/gradle.properties +++ b/packages/firebase_messaging/firebase_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_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..84a0b92f9af2 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.2.1-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..976540260dcb 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.0.2' } } @@ -39,8 +39,11 @@ android { if (project.android.hasProperty("namespace")) { namespace 'io.flutter.plugins.firebase.firebase_ml_model_downloader' } - - compileSdkVersion 31 + buildFeatures { + buildConfig = true + } + + compileSdk 33 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 @@ -56,7 +59,7 @@ android { 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.6.0' } } 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..84a0b92f9af2 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.2.1-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..51f967c63347 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,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.firebase.tests' - compileSdkVersion 33 + compileSdk 33 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 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..171a56be03ae 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.0.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..b69a3d14f594 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..84a0b92f9af2 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.2.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/lib/main.dart b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/lib/main.dart index 8a95f2065f12..a19069f8cda5 100644 --- a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/lib/main.dart +++ b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/lib/main.dart @@ -34,7 +34,7 @@ class _MyAppState extends State { FirebaseCustomModel? model; - /// Initially get the lcoal model if found, and asynchronously get the latest one in background. + /// Initially get the local model if found, and asynchronously get the latest one in background. initWithLocalModel() async { final _model = await FirebaseModelDownloader.instance.getModel( kModelName, FirebaseModelDownloadType.localModelUpdateInBackground); diff --git a/packages/firebase_performance/firebase_performance/android/build.gradle b/packages/firebase_performance/firebase_performance/android/build.gradle index 69adadc53e7d..e5fc4056cb0e 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.0.2' } } @@ -39,8 +39,11 @@ android { if (project.android.hasProperty("namespace")) { namespace 'io.flutter.plugins.firebase.performance' } + buildFeatures { + buildConfig = true + } - compileSdkVersion 31 + compileSdk 33 defaultConfig { minSdkVersion 16 @@ -53,7 +56,7 @@ android { 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.6.0' } compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 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..f38d5ac0fa6f 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,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.firebase.tests' - compileSdkVersion 33 + compileSdk 33 lintOptions { disable 'InvalidPackage' 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..84a0b92f9af2 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.2.1-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..50502a530780 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() } dependencies { - classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.android.tools.build:gradle:8.0.2' classpath 'com.google.gms:google-services:4.3.15' classpath 'com.google.firebase:perf-plugin:1.4.2' } @@ -15,7 +14,6 @@ buildscript { allprojects { repositories { google() - jcenter() mavenLocal() } } diff --git a/packages/firebase_performance/firebase_performance/example/android/gradle.properties b/packages/firebase_performance/firebase_performance/example/android/gradle.properties index 1310f7a8fc01..b69a3d14f594 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_performance/firebase_performance/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_performance/firebase_performance/example/android/gradle/wrapper/gradle-wrapper.properties index da1db5f04e88..84a0b92f9af2 100644 --- a/packages/firebase_performance/firebase_performance/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/firebase_performance/firebase_performance/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.2.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists 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..2a7618104d91 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.0.2' } } @@ -39,8 +39,11 @@ android { if (project.android.hasProperty("namespace")) { namespace 'io.flutter.plugins.firebase.firebaseremoteconfig' } + buildFeatures { + buildConfig = true + } - compileSdkVersion 31 + compileSdk 33 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 @@ -56,7 +59,7 @@ android { 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.6.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..b836b51f8458 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,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.firebase.remoteconfig.example' - compileSdkVersion 33 + compileSdk 33 lintOptions { disable 'InvalidPackage' 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 index da1db5f04e88..84a0b92f9af2 100644 --- 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 @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists 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..945da8369027 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.0.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..b69a3d14f594 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..84a0b92f9af2 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.2.1-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..062b2d811196 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.0.2' } } @@ -47,8 +47,11 @@ android { if (project.android.hasProperty("namespace")) { namespace 'io.flutter.plugins.firebase.storage' } + buildFeatures { + buildConfig = true + } - compileSdkVersion 31 + compileSdk 33 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 @@ -64,7 +67,7 @@ android { 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.6.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..0e43238df1e3 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,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.firebasestorageexample' - compileSdkVersion 33 + compileSdk 33 lintOptions { disable 'InvalidPackage' 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 index da1db5f04e88..84a0b92f9af2 100644 --- 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 @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/firebase_storage/firebase_storage/example/android/build.gradle b/packages/firebase_storage/firebase_storage/example/android/build.gradle index 05226cc38ae5..945da8369027 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.0.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..b69a3d14f594 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..84a0b92f9af2 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.2.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/firebase_ui_auth/example/android/app/build.gradle b/packages/firebase_ui_auth/example/android/app/build.gradle index 052a91890330..ce936b685f42 100644 --- a/packages/firebase_ui_auth/example/android/app/build.gradle +++ b/packages/firebase_ui_auth/example/android/app/build.gradle @@ -27,7 +27,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.firebase_ui_example' - compileSdkVersion flutter.compileSdkVersion + compileSdk 33 ndkVersion flutter.ndkVersion compileOptions { @@ -65,5 +65,5 @@ flutter { } dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" } diff --git a/packages/firebase_ui_auth/example/android/build.gradle b/packages/firebase_ui_auth/example/android/build.gradle index cadf1cf06ca4..0efbaa6624a6 100644 --- a/packages/firebase_ui_auth/example/android/build.gradle +++ b/packages/firebase_ui_auth/example/android/build.gradle @@ -1,12 +1,12 @@ buildscript { - ext.kotlin_version = '1.7.10' + ext.kotlin_version = '1.9.0' repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.android.tools.build:gradle:8.0.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } diff --git a/packages/firebase_ui_auth/example/android/gradle.properties b/packages/firebase_ui_auth/example/android/gradle.properties index 1310f7a8fc01..b69a3d14f594 100644 --- a/packages/firebase_ui_auth/example/android/gradle.properties +++ b/packages/firebase_ui_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_ui_auth/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_ui_auth/example/android/gradle/wrapper/gradle-wrapper.properties index da1db5f04e88..84a0b92f9af2 100644 --- a/packages/firebase_ui_auth/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/firebase_ui_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.2.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/firebase_ui_database/example/android/app/build.gradle b/packages/firebase_ui_database/example/android/app/build.gradle index af854b63eee5..68e1f88e851f 100644 --- a/packages/firebase_ui_database/example/android/app/build.gradle +++ b/packages/firebase_ui_database/example/android/app/build.gradle @@ -30,7 +30,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.firebase_ui_example' - compileSdkVersion flutter.compileSdkVersion + compileSdk 33 ndkVersion flutter.ndkVersion compileOptions { @@ -68,5 +68,5 @@ flutter { } dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" } diff --git a/packages/firebase_ui_database/example/android/build.gradle b/packages/firebase_ui_database/example/android/build.gradle index e5969960677d..12865fc59627 100644 --- a/packages/firebase_ui_database/example/android/build.gradle +++ b/packages/firebase_ui_database/example/android/build.gradle @@ -1,12 +1,12 @@ buildscript { - ext.kotlin_version = '1.6.10' + ext.kotlin_version = '1.9.0' repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.android.tools.build:gradle:8.0.2' // START: FlutterFire Configuration classpath 'com.google.gms:google-services:4.3.15' // END: FlutterFire Configuration diff --git a/packages/firebase_ui_database/example/android/gradle.properties b/packages/firebase_ui_database/example/android/gradle.properties index 1310f7a8fc01..b69a3d14f594 100644 --- a/packages/firebase_ui_database/example/android/gradle.properties +++ b/packages/firebase_ui_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_ui_database/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_ui_database/example/android/gradle/wrapper/gradle-wrapper.properties index da1db5f04e88..84a0b92f9af2 100644 --- a/packages/firebase_ui_database/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/firebase_ui_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.2.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/firebase_ui_firestore/example/android/app/build.gradle b/packages/firebase_ui_firestore/example/android/app/build.gradle index af854b63eee5..68e1f88e851f 100644 --- a/packages/firebase_ui_firestore/example/android/app/build.gradle +++ b/packages/firebase_ui_firestore/example/android/app/build.gradle @@ -30,7 +30,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.firebase_ui_example' - compileSdkVersion flutter.compileSdkVersion + compileSdk 33 ndkVersion flutter.ndkVersion compileOptions { @@ -68,5 +68,5 @@ flutter { } dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" } diff --git a/packages/firebase_ui_firestore/example/android/build.gradle b/packages/firebase_ui_firestore/example/android/build.gradle index e5969960677d..12865fc59627 100644 --- a/packages/firebase_ui_firestore/example/android/build.gradle +++ b/packages/firebase_ui_firestore/example/android/build.gradle @@ -1,12 +1,12 @@ buildscript { - ext.kotlin_version = '1.6.10' + ext.kotlin_version = '1.9.0' repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.android.tools.build:gradle:8.0.2' // START: FlutterFire Configuration classpath 'com.google.gms:google-services:4.3.15' // END: FlutterFire Configuration diff --git a/packages/firebase_ui_firestore/example/android/gradle.properties b/packages/firebase_ui_firestore/example/android/gradle.properties index 1310f7a8fc01..b69a3d14f594 100644 --- a/packages/firebase_ui_firestore/example/android/gradle.properties +++ b/packages/firebase_ui_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 \ No newline at end of file +android.nonFinalResIds=false diff --git a/packages/firebase_ui_firestore/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_ui_firestore/example/android/gradle/wrapper/gradle-wrapper.properties index da1db5f04e88..84a0b92f9af2 100644 --- a/packages/firebase_ui_firestore/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/firebase_ui_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.2.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/firebase_ui_localizations/example/android/app/build.gradle b/packages/firebase_ui_localizations/example/android/app/build.gradle index cc2e3f3e9558..82431e5112f0 100644 --- a/packages/firebase_ui_localizations/example/android/app/build.gradle +++ b/packages/firebase_ui_localizations/example/android/app/build.gradle @@ -27,7 +27,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.firebase_ui_localizations_example' - compileSdkVersion flutter.compileSdkVersion + compileSdk 33 ndkVersion flutter.ndkVersion compileOptions { @@ -65,5 +65,5 @@ flutter { } dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" } diff --git a/packages/firebase_ui_localizations/example/android/build.gradle b/packages/firebase_ui_localizations/example/android/build.gradle index 4eb693a2dc3e..0efbaa6624a6 100644 --- a/packages/firebase_ui_localizations/example/android/build.gradle +++ b/packages/firebase_ui_localizations/example/android/build.gradle @@ -1,12 +1,12 @@ buildscript { - ext.kotlin_version = '1.6.10' + ext.kotlin_version = '1.9.0' repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.android.tools.build:gradle:8.0.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } diff --git a/packages/firebase_ui_localizations/example/android/gradle.properties b/packages/firebase_ui_localizations/example/android/gradle.properties index 1310f7a8fc01..b69a3d14f594 100644 --- a/packages/firebase_ui_localizations/example/android/gradle.properties +++ b/packages/firebase_ui_localizations/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_ui_localizations/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_ui_localizations/example/android/gradle/wrapper/gradle-wrapper.properties index da1db5f04e88..84a0b92f9af2 100644 --- a/packages/firebase_ui_localizations/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/firebase_ui_localizations/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.2.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/firebase_ui_oauth/example/android/app/build.gradle b/packages/firebase_ui_oauth/example/android/app/build.gradle index 5bfe5bf1e748..2467c05e468e 100644 --- a/packages/firebase_ui_oauth/example/android/app/build.gradle +++ b/packages/firebase_ui_oauth/example/android/app/build.gradle @@ -30,7 +30,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.firebase_ui_oauth_example' - compileSdkVersion flutter.compileSdkVersion + 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-jdk8:$kotlin_version" } diff --git a/packages/firebase_ui_oauth/example/android/build.gradle b/packages/firebase_ui_oauth/example/android/build.gradle index 0d1b7eed9d19..12865fc59627 100644 --- a/packages/firebase_ui_oauth/example/android/build.gradle +++ b/packages/firebase_ui_oauth/example/android/build.gradle @@ -1,12 +1,12 @@ buildscript { - ext.kotlin_version = '1.7.10' + ext.kotlin_version = '1.9.0' repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.android.tools.build:gradle:8.0.2' // START: FlutterFire Configuration classpath 'com.google.gms:google-services:4.3.15' // END: FlutterFire Configuration diff --git a/packages/firebase_ui_oauth/example/android/gradle.properties b/packages/firebase_ui_oauth/example/android/gradle.properties index 1310f7a8fc01..b69a3d14f594 100644 --- a/packages/firebase_ui_oauth/example/android/gradle.properties +++ b/packages/firebase_ui_oauth/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_ui_oauth/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_ui_oauth/example/android/gradle/wrapper/gradle-wrapper.properties index da1db5f04e88..84a0b92f9af2 100644 --- a/packages/firebase_ui_oauth/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/firebase_ui_oauth/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.2.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/firebase_ui_storage/example/android/app/build.gradle b/packages/firebase_ui_storage/example/android/app/build.gradle index f7c4c0f863f6..1e144f70c4e7 100644 --- a/packages/firebase_ui_storage/example/android/app/build.gradle +++ b/packages/firebase_ui_storage/example/android/app/build.gradle @@ -27,7 +27,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.firebase_ui_example' - compileSdkVersion flutter.compileSdkVersion + compileSdk 33 ndkVersion flutter.ndkVersion compileOptions { @@ -65,5 +65,5 @@ flutter { } dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" } diff --git a/packages/firebase_ui_storage/example/android/build.gradle b/packages/firebase_ui_storage/example/android/build.gradle index ce647a433bd0..d214c9eed427 100644 --- a/packages/firebase_ui_storage/example/android/build.gradle +++ b/packages/firebase_ui_storage/example/android/build.gradle @@ -1,12 +1,12 @@ buildscript { - ext.kotlin_version = '1.7.10' + ext.kotlin_version = '1.9.0' repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.android.tools.build:gradle:8.0.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } diff --git a/packages/firebase_ui_storage/example/android/gradle.properties b/packages/firebase_ui_storage/example/android/gradle.properties index 1310f7a8fc01..b69a3d14f594 100644 --- a/packages/firebase_ui_storage/example/android/gradle.properties +++ b/packages/firebase_ui_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_ui_storage/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_ui_storage/example/android/gradle/wrapper/gradle-wrapper.properties index da1db5f04e88..84a0b92f9af2 100644 --- a/packages/firebase_ui_storage/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/firebase_ui_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.2.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/tests/android/app/build.gradle b/tests/android/app/build.gradle index a708dc21a8bd..2fab034d7caf 100644 --- a/tests/android/app/build.gradle +++ b/tests/android/app/build.gradle @@ -29,7 +29,15 @@ apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 33 + // Conditional for compatibility with AGP <4.2. + if (project.android.hasProperty("namespace")) { + namespace 'io.flutter.plugins.firebase.tests' + } + buildFeatures { + buildConfig = true + } + + compileSdk 33 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 @@ -67,5 +75,5 @@ flutter { } dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" } diff --git a/tests/android/build.gradle b/tests/android/build.gradle index 5aaf6b10f869..29178d15aa0d 100644 --- a/tests/android/build.gradle +++ b/tests/android/build.gradle @@ -1,12 +1,12 @@ buildscript { - ext.kotlin_version = '1.7.10' + ext.kotlin_version = '1.9.0' repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.android.tools.build:gradle:8.0.2' // START: FlutterFire Configuration classpath 'com.google.gms:google-services:4.3.15' classpath 'com.google.firebase:perf-plugin:1.4.2' diff --git a/tests/android/gradle/wrapper/gradle-wrapper.properties b/tests/android/gradle/wrapper/gradle-wrapper.properties index da1db5f04e88..84a0b92f9af2 100644 --- a/tests/android/gradle/wrapper/gradle-wrapper.properties +++ b/tests/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.2.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists