Update Android SDK dependency, including updated Gradle and compileSD…

…K version, and including GMA (#1473) * Update Android dependencies - Tue Oct 10 2023 [Triggered](https://github.com/firebase/firebase-android-sdk/actions/runs/6475704829) by [firebase-android-sdk Oct 10 release](firebase/firebase-android-sdk@a135c51). ### Android - com.google.android.gms.play_services_ads → 22.4.0 > Created by [Update Android and iOS dependencies workflow](https://github.com/firebase/firebase-cpp-sdk/actions/runs/6475709960). * Build GMA with Android 31. * Increment all gradle wrapper versions to 6.7.1. * Fix quote in classpath. * Update all gradle plugin versions to 4.2.1. * Force NDK path to environment variable for new Gradle version. * Update build tools version. * Add gradle.properties with useAndroidX=true flag. * Remove NDK path from unneeded gradle files. * Force name of included C++ SDK build to be firebase_cpp_sdk. This fixes a breaking change in Gradle 6 where included builds no longer have their name propagated, but instead they use their path (unless you explicitly set the name, as in this change). * Update Firestore internal test also. * Add gradle.properties files. * Update readme with new version. * Add cleanup directory. * Add to .gitignore. * Add changed .externalNativeBuild --> .cxx directory to script and ProGuard rules. * Revert "Add cleanup directory." This reverts commit ec1e046. * Add cleanup directory (again). * Project tweaks to build on Android SDK 33, required for GMA. * Update Android dependencies - Thu Oct 19 2023 (#1481) * Update Android dependencies - Thu Oct 19 2023 ### Android - com.google.firebase.firebase_bom → 32.4.0 > Created by [Update Android and iOS dependencies workflow](https://github.com/firebase/firebase-cpp-sdk/actions/runs/6580059572). * Enable multidex. --------- Co-authored-by: firebase-workflow-trigger-bot <[email protected]> Co-authored-by: Jon Simantov <[email protected]> * Update to 32.4.1 bom. * Update readme. * Update Android dependencies to 32.7.0. (#1498) --------- Co-authored-by: firebase-workflow-trigger-bot <[email protected]> Co-authored-by: firebase-workflow-trigger[bot] <80733318+firebase-workflow-trigger[bot]@users.noreply.github.com>
firebase · Dec 13, 2023 · 46f1f0b · 46f1f0b
1 parent cc05b85
commit 46f1f0b
Show file tree

Hide file tree

Showing 110 changed files with 266 additions and 180 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,6 +13,7 @@ __pycache__/
 .gradle
 **/build/
 **/.externalNativeBuild/
+**/.cxx/
 
 ### IDE generated files
 .vscode/

diff --git a/Android/firebase_dependencies.gradle b/Android/firebase_dependencies.gradle
@@ -27,7 +27,7 @@ def firebaseDependenciesMap = [
   'dynamic_links' : ['com.google.firebase:firebase-dynamic-links'],
   'firestore' : ['com.google.firebase:firebase-firestore'],
   'functions' : ['com.google.firebase:firebase-functions'],
-  'gma' : ['com.google.android.gms:play-services-ads:22.3.0',
+  'gma' : ['com.google.android.gms:play-services-ads:22.6.0',
            'com.google.android.ump:user-messaging-platform:2.1.0'],
   'installations' : ['com.google.firebase:firebase-installations'],
   'invites' : ['com.google.firebase:firebase-invites'],
@@ -159,7 +159,7 @@ project.afterEvaluate {
 
     // Add the bill-of-materials
     project.dependencies {
-      implementation platform('com.google.firebase:firebase-bom:32.3.1')
+      implementation platform('com.google.firebase:firebase-bom:32.7.0')
     }
     for (String lib : firebaseCpp.dependencies.libSet) {
       // Generate and include the proguard file

diff --git a/analytics/build.gradle b/analytics/build.gradle
@@ -18,7 +18,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.3.3'
+    classpath 'com.android.tools.build:gradle:4.2.1'
   }
 }
 allprojects {
@@ -31,8 +31,9 @@ allprojects {
 apply plugin: 'com.android.library'
 
 android {
-  compileSdkVersion 28
-  buildToolsVersion '28.0.3'
+  compileSdkVersion 33
+  ndkPath System.getenv('ANDROID_NDK_HOME')
+  buildToolsVersion '30.0.2'
 
   sourceSets {
     main {

diff --git a/analytics/integration_test/AndroidManifest.xml b/analytics/integration_test/AndroidManifest.xml
@@ -22,7 +22,6 @@
   <uses-permission android:name="android.permission.INTERNET" />
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
   <uses-permission android:name="android.permission.WAKE_LOCK" />
-  <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="28" />
   <application android:label="@string/app_name">
     <activity android:name="android.app.NativeActivity"
               android:screenOrientation="portrait"

diff --git a/analytics/integration_test/build.gradle b/analytics/integration_test/build.gradle
@@ -20,7 +20,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.3.3'
+    classpath 'com.android.tools.build:gradle:4.2.1'
     classpath 'com.google.gms:google-services:4.0.1'
   }
 }
@@ -40,8 +40,9 @@ android {
     sourceCompatibility 1.8
     targetCompatibility 1.8
   }
-  compileSdkVersion 28
-  buildToolsVersion '28.0.3'
+  compileSdkVersion 33
+  ndkPath System.getenv('ANDROID_NDK_HOME')
+  buildToolsVersion '30.0.2'
 
   sourceSets {
     main {

diff --git a/analytics/integration_test/gradle.properties b/analytics/integration_test/gradle.properties
@@ -0,0 +1,2 @@
+android.useAndroidX = true
+org.gradle.jvmargs=-Xmx2560m
diff --git a/analytics/integration_test/gradle/wrapper/gradle-wrapper.properties b/analytics/integration_test/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https://services.gradle.org/distributions/gradle-6.7.1-all.zip
diff --git a/analytics/integration_test/settings.gradle b/analytics/integration_test/settings.gradle
@@ -36,4 +36,6 @@ if (!(new File(firebase_cpp_sdk_dir)).exists()) {
             firebase_cpp_sdk_dir))
 }
 gradle.ext.firebase_cpp_sdk_dir = "$firebase_cpp_sdk_dir"
-includeBuild "$firebase_cpp_sdk_dir"
+includeBuild("$firebase_cpp_sdk_dir") {
+  name = "firebase_cpp_sdk"
+}
diff --git a/android_build_files/generate_proguard.gradle b/android_build_files/generate_proguard.gradle
@@ -72,7 +72,7 @@ def defineGenerateProguardFile(String subproject, String buildType,
       String nativeBuildDir =
           project.android.externalNativeBuild.cmake.buildStagingDirectory
       if (nativeBuildDir == null || nativeBuildDir.isEmpty()) {
-        nativeBuildDir = file('.externalNativeBuild/cmake').absolutePath
+        nativeBuildDir = file('.cxx/cmake').absolutePath
       }
 
       // Find the static library that was built. Note that there are multiple

diff --git a/app/app_resources/build.gradle b/app/app_resources/build.gradle
@@ -18,7 +18,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.3.3'
+    classpath 'com.android.tools.build:gradle:4.2.1'
     classpath 'com.google.gms:google-services:4.2.0'
   }
 }
@@ -36,7 +36,7 @@ android {
     sourceCompatibility 1.8
     targetCompatibility 1.8
   }
-  compileSdkVersion 28
+  compileSdkVersion 33
 
   sourceSets {
     main {
@@ -50,7 +50,7 @@ android {
 }
 
 dependencies {
-  implementation platform('com.google.firebase:firebase-bom:32.3.1')
+  implementation platform('com.google.firebase:firebase-bom:32.7.0')
   implementation 'com.google.firebase:firebase-analytics'
 }
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -18,7 +18,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.3.3'
+    classpath 'com.android.tools.build:gradle:4.2.1'
   }
 }
 allprojects {
@@ -31,8 +31,9 @@ allprojects {
 apply plugin: 'com.android.library'
 
 android {
-  compileSdkVersion 28
-  buildToolsVersion '28.0.3'
+  compileSdkVersion 33
+  ndkPath System.getenv('ANDROID_NDK_HOME')
+  buildToolsVersion '30.0.2'
 
   sourceSets {
     main {

diff --git a/app/google_api_resources/build.gradle b/app/google_api_resources/build.gradle
@@ -18,7 +18,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.3.3'
+    classpath 'com.android.tools.build:gradle:4.2.1'
     classpath 'com.google.gms:google-services:4.2.0'
   }
 }
@@ -36,7 +36,7 @@ android {
     sourceCompatibility 1.8
     targetCompatibility 1.8
   }
-  compileSdkVersion 28
+  compileSdkVersion 33
 
   sourceSets {
     main {
@@ -53,7 +53,7 @@ android {
 }
 
 dependencies {
-  implementation platform('com.google.firebase:firebase-bom:32.3.1')
+  implementation platform('com.google.firebase:firebase-bom:32.7.0')
   implementation 'com.google.firebase:firebase-analytics'
   implementation 'com.google.android.gms:play-services-base:18.2.0'
   implementation project(':app:app_resources')

diff --git a/app/integration_test/AndroidManifest.xml b/app/integration_test/AndroidManifest.xml
@@ -22,7 +22,6 @@
   <uses-permission android:name="android.permission.INTERNET" />
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
   <uses-permission android:name="android.permission.WAKE_LOCK" />
-  <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="28" />
   <application android:label="@string/app_name">
     <activity android:name="android.app.NativeActivity"
               android:screenOrientation="portrait"

diff --git a/app/integration_test/build.gradle b/app/integration_test/build.gradle
@@ -20,7 +20,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.3.3'
+    classpath 'com.android.tools.build:gradle:4.2.1'
     classpath 'com.google.gms:google-services:4.0.1'
   }
 }
@@ -40,8 +40,9 @@ android {
     sourceCompatibility 1.8
     targetCompatibility 1.8
   }
-  compileSdkVersion 28
-  buildToolsVersion '28.0.3'
+  compileSdkVersion 33
+  ndkPath System.getenv('ANDROID_NDK_HOME')
+  buildToolsVersion '30.0.2'
 
   sourceSets {
     main {

diff --git a/app/integration_test/gradle.properties b/app/integration_test/gradle.properties
@@ -0,0 +1,2 @@
+android.useAndroidX = true
+org.gradle.jvmargs=-Xmx2560m
diff --git a/app/integration_test/gradle/wrapper/gradle-wrapper.properties b/app/integration_test/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https://services.gradle.org/distributions/gradle-6.7.1-all.zip
diff --git a/app/integration_test/settings.gradle b/app/integration_test/settings.gradle
@@ -36,4 +36,6 @@ if (!(new File(firebase_cpp_sdk_dir)).exists()) {
             firebase_cpp_sdk_dir))
 }
 gradle.ext.firebase_cpp_sdk_dir = "$firebase_cpp_sdk_dir"
-includeBuild "$firebase_cpp_sdk_dir"
+includeBuild("$firebase_cpp_sdk_dir") {
+  name = "firebase_cpp_sdk"
+}
diff --git a/app/invites_resources/build.gradle b/app/invites_resources/build.gradle
@@ -18,7 +18,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.3.3'
+    classpath 'com.android.tools.build:gradle:4.2.1'
     classpath 'com.google.gms:google-services:4.2.0'
   }
 }
@@ -36,7 +36,7 @@ android {
     sourceCompatibility 1.8
     targetCompatibility 1.8
   }
-  compileSdkVersion 28
+  compileSdkVersion 33
 
   sourceSets {
     main {
@@ -49,7 +49,7 @@ android {
 }
 
 dependencies {
-  implementation platform('com.google.firebase:firebase-bom:32.3.1')
+  implementation platform('com.google.firebase:firebase-bom:32.7.0')
   implementation 'com.google.firebase:firebase-analytics'
   implementation 'com.google.firebase:firebase-dynamic-links'
   implementation project(':app:app_resources')

diff --git a/app/test_resources/build.gradle b/app/test_resources/build.gradle
@@ -18,7 +18,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.3.3'
+    classpath 'com.android.tools.build:gradle:4.2.1'
     classpath 'com.google.gms:google-services:4.2.0'
   }
 }
@@ -32,7 +32,7 @@ allprojects {
 apply plugin: 'com.android.library'
 
 android {
-  compileSdkVersion 28
+  compileSdkVersion 33
 
   sourceSets {
     main {

diff --git a/app_check/app_check_resources/build.gradle b/app_check/app_check_resources/build.gradle
@@ -18,7 +18,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.3.3'
+    classpath 'com.android.tools.build:gradle:4.2.1'
     classpath 'com.google.gms:google-services:4.2.0'
   }
 }
@@ -36,7 +36,7 @@ android {
     sourceCompatibility 1.8
     targetCompatibility 1.8
   }
-  compileSdkVersion 28
+  compileSdkVersion 33
 
   sourceSets {
     main {
@@ -49,7 +49,7 @@ android {
 }
 
 dependencies {
-  implementation platform('com.google.firebase:firebase-bom:32.3.1')
+  implementation platform('com.google.firebase:firebase-bom:32.7.0')
   implementation 'com.google.firebase:firebase-appcheck'
 }
 

diff --git a/app_check/build.gradle b/app_check/build.gradle
@@ -18,7 +18,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.3.3'
+    classpath 'com.android.tools.build:gradle:4.2.1'
   }
 }
 allprojects {
@@ -31,8 +31,9 @@ allprojects {
 apply plugin: 'com.android.library'
 
 android {
-  compileSdkVersion 28
-  buildToolsVersion '28.0.3'
+  compileSdkVersion 33
+  ndkPath System.getenv('ANDROID_NDK_HOME')
+  buildToolsVersion '30.0.2'
 
   sourceSets {
     main {

diff --git a/app_check/integration_test/AndroidManifest.xml b/app_check/integration_test/AndroidManifest.xml
@@ -22,7 +22,6 @@
   <uses-permission android:name="android.permission.INTERNET" />
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
   <uses-permission android:name="android.permission.WAKE_LOCK" />
-  <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="28" />
   <application android:label="@string/app_name">
     <activity android:name="android.app.NativeActivity"
               android:screenOrientation="portrait"

diff --git a/app_check/integration_test/build.gradle b/app_check/integration_test/build.gradle
@@ -20,7 +20,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.3.3'
+    classpath 'com.android.tools.build:gradle:4.2.1'
     classpath 'com.google.gms:google-services:4.0.1'
   }
 }
@@ -40,8 +40,9 @@ android {
     sourceCompatibility 1.8
     targetCompatibility 1.8
   }
-  compileSdkVersion 28
-  buildToolsVersion '28.0.3'
+  compileSdkVersion 33
+  ndkPath System.getenv('ANDROID_NDK_HOME')
+  buildToolsVersion '30.0.2'
 
   sourceSets {
     main {

diff --git a/app_check/integration_test/gradle.properties b/app_check/integration_test/gradle.properties
@@ -0,0 +1,2 @@
+android.useAndroidX = true
+org.gradle.jvmargs=-Xmx2560m
diff --git a/app_check/integration_test/gradle/wrapper/gradle-wrapper.properties b/app_check/integration_test/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https://services.gradle.org/distributions/gradle-6.7.1-all.zip
diff --git a/app_check/integration_test/settings.gradle b/app_check/integration_test/settings.gradle
@@ -36,4 +36,6 @@ if (!(new File(firebase_cpp_sdk_dir)).exists()) {
             firebase_cpp_sdk_dir))
 }
 gradle.ext.firebase_cpp_sdk_dir = "$firebase_cpp_sdk_dir"
-includeBuild "$firebase_cpp_sdk_dir"
+includeBuild("$firebase_cpp_sdk_dir") {
+  name = "firebase_cpp_sdk"
+}
diff --git a/auth/auth_resources/build.gradle b/auth/auth_resources/build.gradle
@@ -18,7 +18,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.3.3'
+    classpath 'com.android.tools.build:gradle:4.2.1'
     classpath 'com.google.gms:google-services:4.2.0'
   }
 }
@@ -36,7 +36,7 @@ android {
     sourceCompatibility 1.8
     targetCompatibility 1.8
   }
-  compileSdkVersion 28
+  compileSdkVersion 33
 
   sourceSets {
     main {
@@ -49,7 +49,7 @@ android {
 }
 
 dependencies {
-  implementation platform('com.google.firebase:firebase-bom:32.3.1')
+  implementation platform('com.google.firebase:firebase-bom:32.7.0')
   implementation 'com.google.firebase:firebase-analytics'
   implementation 'com.google.firebase:firebase-auth'
   implementation project(':app:app_resources')
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		android.useAndroidX = true
		org.gradle.jvmargs=-Xmx2560m