fix: add support for AGP 8.0 (#10901)

* fix: add support for AGP 8.0 * fix: add support for AGP 8.0 * fix: add support for AGP 8.0 * fix: add support for AGP 8.0 * fix: add support for AGP 8.0 * fix: add support for AGP 8.0 * fix: add support for AGP 8.0 * fix: add support for AGP 8.0 * fix: add support for AGP 8.0 * fix: add support for AGP 8.0 * fix: add support for AGP 8.0 * fix: add support for AGP 8.0 * fix: add support for AGP 8.0
firebase · May 4, 2023 · a3b9673 · a3b9673
1 parent 4bd7e59
commit a3b9673
Show file tree

Hide file tree

Showing 161 changed files with 315 additions and 319 deletions.
diff --git 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:7.0.2'
+        classpath 'com.android.tools.build:gradle:8.0.1'
     }
 }
 
@@ -35,6 +35,10 @@ def getRootProjectExtOrCoreProperty(name, firebaseCoreProject) {
 }
 
 android {
+    // Conditional for compatibility with AGP <4.2.
+    if (project.android.hasProperty("namespace")) {
+      namespace 'io.flutter.plugins.firebase.firestore'
+    }
     compileSdkVersion 31
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -51,7 +55,6 @@ android {
         api firebaseCoreProject
         implementation platform("com.google.firebase:firebase-bom:${getRootProjectExtOrCoreProperty("FirebaseSDKVersion", firebaseCoreProject)}")
         implementation 'com.google.firebase:firebase-firestore'
-        implementation 'androidx.annotation:annotation:1.2.0'
     }
 }
 

diff --git a/packages/cloud_firestore/cloud_firestore/example/android/app/build.gradle b/packages/cloud_firestore/cloud_firestore/example/android/app/build.gradle
@@ -45,13 +45,12 @@ android {
     }
 
     defaultConfig {
-        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "io.flutter.plugins.firebase.firestore.example"
-        minSdkVersion 19
+        minSdkVersion 21
         targetSdkVersion 33
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
-        multiDexEnabled true
+
     }
 
     buildTypes {
@@ -61,6 +60,7 @@ android {
             signingConfig signingConfigs.debug
         }
     }
+    namespace 'io.flutter.plugins.firebase.firestore.example'
 }
 
 flutter {

diff --git a/packages/cloud_firestore/cloud_firestore/example/android/gradle.properties b/packages/cloud_firestore/cloud_firestore/example/android/gradle.properties
@@ -1,3 +1,6 @@
 org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
 android.enableJetifier=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
diff --git a/.../cloud_firestore/cloud_firestore/example/android/gradle/wrapper/gradle-wrapper.properties b/.../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-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-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
@@ -35,6 +35,11 @@ def getRootProjectExtOrCoreProperty(name, firebaseCoreProject) {
 }
 
 android {
+  // Conditional for compatibility with AGP <4.2.
+  if (project.android.hasProperty("namespace")) {
+    namespace 'io.flutter.plugins.firebase.functions'
+  }
+
   compileSdkVersion 31
   compileOptions {
     sourceCompatibility JavaVersion.VERSION_1_8

diff --git a/packages/cloud_functions/cloud_functions/android/src/debug/AndroidManifest.xml b/packages/cloud_functions/cloud_functions/android/src/debug/AndroidManifest.xml
diff --git a/packages/cloud_functions/cloud_functions/example/android/app/build.gradle b/packages/cloud_functions/cloud_functions/example/android/app/build.gradle
@@ -25,7 +25,8 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 31
+    namespace 'io.flutter.plugins.firebase.functions.example'
+    compileSdkVersion 33
 
     lintOptions {
         disable 'InvalidPackage'
@@ -34,7 +35,7 @@ android {
     defaultConfig {
         applicationId "io.flutter.plugins.firebase.functions.example"
         minSdkVersion 16
-        targetSdkVersion 28
+        targetSdkVersion 33
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

diff --git a/...ud_functions/cloud_functions/example/android/app/gradle/wrapper/gradle-wrapper.properties b/...ud_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-5.6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/packages/cloud_functions/cloud_functions/example/android/app/src/main/AndroidManifest.xml b/packages/cloud_functions/cloud_functions/example/android/app/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="io.flutter.plugins.firebase.functions.example">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!-- The INTERNET permission is required for development. Specifically,
          flutter needs it to communicate with the running application
@@ -15,7 +14,8 @@
           android:theme="@android:style/Theme.Black.NoTitleBar"
           android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale"
           android:hardwareAccelerated="true"
-          android:windowSoftInputMode="adjustResize">
+          android:windowSoftInputMode="adjustResize"
+          android:exported="true">
           <meta-data
             android:name="io.flutter.app.android.SplashScreenUntilFirstFrame"
             android:value="true" />

diff --git a/packages/cloud_functions/cloud_functions/example/android/build.gradle b/packages/cloud_functions/cloud_functions/example/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.2'
+        classpath 'com.android.tools.build:gradle:8.0.1'
         classpath 'com.google.gms:google-services:4.3.15'
     }
 }

diff --git a/packages/cloud_functions/cloud_functions/example/android/gradle.properties b/packages/cloud_functions/cloud_functions/example/android/gradle.properties
@@ -1,4 +1,6 @@
 org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
 android.enableJetifier=true
-android.enableR8=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
diff --git a/.../cloud_functions/cloud_functions/example/android/gradle/wrapper/gradle-wrapper.properties b/.../cloud_functions/cloud_functions/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Fri Jun 23 08:50:38 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
diff --git 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:3.5.4'
+        classpath 'com.android.tools.build:gradle:8.0.1'
     }
 }
 
@@ -35,6 +35,11 @@ def getRootProjectExtOrCoreProperty(name, firebaseCoreProject) {
 }
 
 android {
+    // Conditional for compatibility with AGP <4.2.
+    if (project.android.hasProperty("namespace")) {
+        namespace 'io.flutter.plugins.firebase.analytics'
+    }
+
     compileSdkVersion 31
 
     defaultConfig {

diff --git a/packages/firebase_analytics/firebase_analytics/android/gradle.properties b/packages/firebase_analytics/firebase_analytics/android/gradle.properties
@@ -1,3 +1,6 @@
 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/firebase_analytics/firebase_analytics/example/android/app/build.gradle b/packages/firebase_analytics/firebase_analytics/example/android/app/build.gradle
@@ -26,6 +26,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 apply plugin: 'com.google.gms.google-services'
 
 android {
+    namespace 'io.flutter.plugins.firebase.analytics.example'
     compileSdkVersion 33
 
     lintOptions {

diff --git a/...es/firebase_analytics/firebase_analytics/example/android/app/src/main/AndroidManifest.xml b/...es/firebase_analytics/firebase_analytics/example/android/app/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="io.flutter.plugins.firebaseanalyticsexample">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET"/>
 

diff --git a/packages/firebase_analytics/firebase_analytics/example/android/build.gradle b/packages/firebase_analytics/firebase_analytics/example/android/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-      classpath 'com.android.tools.build:gradle:4.1.2'
+      classpath 'com.android.tools.build:gradle:8.0.1'
       classpath 'com.google.gms:google-services:4.3.15'
     }
 }

diff --git a/packages/firebase_analytics/firebase_analytics/example/android/gradle.properties b/packages/firebase_analytics/firebase_analytics/example/android/gradle.properties
@@ -1,4 +1,6 @@
 org.gradle.jvmargs=-Xmx1536M
-android.enableJetifier=true
 android.useAndroidX=true
-android.enableR8=true
+android.enableJetifier=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
diff --git a/...ase_analytics/firebase_analytics/example/android/gradle/wrapper/gradle-wrapper.properties b/...ase_analytics/firebase_analytics/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Wed Jul 31 23:52:55 BRT 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
diff --git a/packages/firebase_app_check/firebase_app_check/android/build.gradle b/packages/firebase_app_check/firebase_app_check/android/build.gradle
@@ -35,6 +35,11 @@ def getRootProjectExtOrCoreProperty(name, firebaseCoreProject) {
 }
 
 android {
+  // Conditional for compatibility with AGP <4.2.
+  if (project.android.hasProperty("namespace")) {
+    namespace 'io.flutter.plugins.firebase.appcheck'
+  }
+
   compileSdkVersion 31
   compileOptions {
     sourceCompatibility JavaVersion.VERSION_1_8

diff --git a/...es/firebase_app_check/firebase_app_check/android/gradle/wrapper/gradle-wrapper.properties b/...es/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
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
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
@@ -28,16 +28,15 @@ apply plugin: 'com.google.gms.google-services'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
+    namespace "io.flutter.plugins.firebase.appcheck.example"
     compileSdkVersion 33
 
     defaultConfig {
-        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "io.flutter.plugins.firebase.appcheck.example"
-        minSdkVersion 19
+        minSdkVersion 21
         targetSdkVersion 33
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
-        multiDexEnabled true
     }
 
     buildTypes {

diff --git a/...s/firebase_app_check/firebase_app_check/example/android/app/src/debug/AndroidManifest.xml b/...s/firebase_app_check/firebase_app_check/example/android/app/src/debug/AndroidManifest.xml
diff --git a/...es/firebase_app_check/firebase_app_check/example/android/app/src/main/AndroidManifest.xml b/...es/firebase_app_check/firebase_app_check/example/android/app/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="io.flutter.plugins.firebase.appcheck.example">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
    <application
         android:label="example"
         android:icon="@mipmap/ic_launcher">

diff --git a/...firebase_app_check/firebase_app_check/example/android/app/src/profile/AndroidManifest.xml b/...firebase_app_check/firebase_app_check/example/android/app/src/profile/AndroidManifest.xml
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
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.3'
+        classpath 'com.android.tools.build:gradle:8.0.1'
         // 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
@@ -1,3 +1,6 @@
 org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
 android.enableJetifier=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
diff --git a/...ase_app_check/firebase_app_check/example/android/gradle/wrapper/gradle-wrapper.properties b/...ase_app_check/firebase_app_check/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Fri Jun 23 08:50:38 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
diff --git a/packages/firebase_app_installations/firebase_app_installations/android/build.gradle b/packages/firebase_app_installations/firebase_app_installations/android/build.gradle
@@ -35,6 +35,11 @@ def getRootProjectExtOrCoreProperty(name, firebaseCoreProject) {
 }
 
 android {
+    // Conditional for compatibility with AGP <4.2.
+    if (project.android.hasProperty("namespace")) {
+      namespace 'io.flutter.plugins.firebase.installations.firebase_app_installations'
+    }
+
     compileSdkVersion 31
 
     compileOptions {

diff --git a/...installations/firebase_app_installations/android/gradle/wrapper/gradle-wrapper.properties b/...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
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
diff --git a/...es/firebase_app_installations/firebase_app_installations/example/android/app/build.gradle b/...es/firebase_app_installations/firebase_app_installations/example/android/app/build.gradle
@@ -27,7 +27,8 @@ apply plugin: 'com.google.gms.google-services'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 31
+    namespace 'io.flutter.plugins.firebase.installations.example'
+    compileSdkVersion 33
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -45,8 +46,8 @@ android {
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "io.flutter.plugins.firebase.installations.example"
-        minSdkVersion 19
-        targetSdkVersion 30
+        minSdkVersion 21
+        targetSdkVersion 33
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }

diff --git a/...nstallations/firebase_app_installations/example/android/app/src/debug/AndroidManifest.xml b/...nstallations/firebase_app_installations/example/android/app/src/debug/AndroidManifest.xml
diff --git a/...installations/firebase_app_installations/example/android/app/src/main/AndroidManifest.xml b/...installations/firebase_app_installations/example/android/app/src/main/AndroidManifest.xml
@@ -1,11 +1,11 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="io.flutter.plugins.firebase.installations.example">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
    <application
         android:label="example"
         android:icon="@mipmap/ic_launcher">
         <activity
             android:name=".MainActivity"
             android:launchMode="singleTop"
+            android:exported="true"
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"

diff --git a/...tallations/firebase_app_installations/example/android/app/src/profile/AndroidManifest.xml b/...tallations/firebase_app_installations/example/android/app/src/profile/AndroidManifest.xml