Skip to content

Commit 46f1f0b

Browse files
jonsimantovfirebase-workflow-trigger-botfirebase-workflow-trigger[bot]
authored
Update Android SDK dependency, including updated Gradle and compileSDK 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 <firebase-workflow-trigger-bot@google.com> Co-authored-by: Jon Simantov <jsimantov@google.com> * Update to 32.4.1 bom. * Update readme. * Update Android dependencies to 32.7.0. (#1498) --------- Co-authored-by: firebase-workflow-trigger-bot <firebase-workflow-trigger-bot@google.com> Co-authored-by: firebase-workflow-trigger[bot] <80733318+firebase-workflow-trigger[bot]@users.noreply.github.com>
1 parent cc05b85 commit 46f1f0b

File tree

110 files changed

+266
-180
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

110 files changed

+266
-180
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ __pycache__/
1313
.gradle
1414
**/build/
1515
**/.externalNativeBuild/
16+
**/.cxx/
1617

1718
### IDE generated files
1819
.vscode/

‎Android/firebase_dependencies.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ def firebaseDependenciesMap = [
2727
'dynamic_links' : ['com.google.firebase:firebase-dynamic-links'],
2828
'firestore' : ['com.google.firebase:firebase-firestore'],
2929
'functions' : ['com.google.firebase:firebase-functions'],
30-
'gma' : ['com.google.android.gms:play-services-ads:22.3.0',
30+
'gma' : ['com.google.android.gms:play-services-ads:22.6.0',
3131
'com.google.android.ump:user-messaging-platform:2.1.0'],
3232
'installations' : ['com.google.firebase:firebase-installations'],
3333
'invites' : ['com.google.firebase:firebase-invites'],
@@ -159,7 +159,7 @@ project.afterEvaluate {
159159

160160
// Add the bill-of-materials
161161
project.dependencies {
162-
implementation platform('com.google.firebase:firebase-bom:32.3.1')
162+
implementation platform('com.google.firebase:firebase-bom:32.7.0')
163163
}
164164
for (String lib : firebaseCpp.dependencies.libSet) {
165165
// Generate and include the proguard file

‎analytics/build.gradle‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ buildscript {
1818
mavenCentral()
1919
}
2020
dependencies {
21-
classpath 'com.android.tools.build:gradle:3.3.3'
21+
classpath 'com.android.tools.build:gradle:4.2.1'
2222
}
2323
}
2424
allprojects {
@@ -31,8 +31,9 @@ allprojects {
3131
apply plugin: 'com.android.library'
3232

3333
android {
34-
compileSdkVersion 28
35-
buildToolsVersion '28.0.3'
34+
compileSdkVersion 33
35+
ndkPath System.getenv('ANDROID_NDK_HOME')
36+
buildToolsVersion '30.0.2'
3637

3738
sourceSets {
3839
main {

‎analytics/integration_test/AndroidManifest.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
<uses-permission android:name="android.permission.INTERNET" />
2323
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
2424
<uses-permission android:name="android.permission.WAKE_LOCK" />
25-
<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="28" />
2625
<application android:label="@string/app_name">
2726
<activity android:name="android.app.NativeActivity"
2827
android:screenOrientation="portrait"

‎analytics/integration_test/build.gradle‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ buildscript {
2020
mavenCentral()
2121
}
2222
dependencies {
23-
classpath 'com.android.tools.build:gradle:3.3.3'
23+
classpath 'com.android.tools.build:gradle:4.2.1'
2424
classpath 'com.google.gms:google-services:4.0.1'
2525
}
2626
}
@@ -40,8 +40,9 @@ android {
4040
sourceCompatibility 1.8
4141
targetCompatibility 1.8
4242
}
43-
compileSdkVersion 28
44-
buildToolsVersion '28.0.3'
43+
compileSdkVersion 33
44+
ndkPath System.getenv('ANDROID_NDK_HOME')
45+
buildToolsVersion '30.0.2'
4546

4647
sourceSets {
4748
main {

‎analytics/integration_test/gradle.properties‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
android.useAndroidX = true
2+
org.gradle.jvmargs=-Xmx2560m

‎analytics/integration_test/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https://services.gradle.org/distributions/gradle-5.6.4-all.zip
6+
distributionUrl=https://services.gradle.org/distributions/gradle-6.7.1-all.zip

‎analytics/integration_test/settings.gradle‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,6 @@ if (!(new File(firebase_cpp_sdk_dir)).exists()) {
3636
firebase_cpp_sdk_dir))
3737
}
3838
gradle.ext.firebase_cpp_sdk_dir = "$firebase_cpp_sdk_dir"
39-
includeBuild "$firebase_cpp_sdk_dir"
39+
includeBuild("$firebase_cpp_sdk_dir") {
40+
name = "firebase_cpp_sdk"
41+
}

‎android_build_files/generate_proguard.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ def defineGenerateProguardFile(String subproject, String buildType,
7272
String nativeBuildDir =
7373
project.android.externalNativeBuild.cmake.buildStagingDirectory
7474
if (nativeBuildDir == null || nativeBuildDir.isEmpty()) {
75-
nativeBuildDir = file('.externalNativeBuild/cmake').absolutePath
75+
nativeBuildDir = file('.cxx/cmake').absolutePath
7676
}
7777

7878
// Find the static library that was built. Note that there are multiple

‎app/app_resources/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ buildscript {
1818
mavenCentral()
1919
}
2020
dependencies {
21-
classpath 'com.android.tools.build:gradle:3.3.3'
21+
classpath 'com.android.tools.build:gradle:4.2.1'
2222
classpath 'com.google.gms:google-services:4.2.0'
2323
}
2424
}
@@ -36,7 +36,7 @@ android {
3636
sourceCompatibility 1.8
3737
targetCompatibility 1.8
3838
}
39-
compileSdkVersion 28
39+
compileSdkVersion 33
4040

4141
sourceSets {
4242
main {
@@ -50,7 +50,7 @@ android {
5050
}
5151

5252
dependencies {
53-
implementation platform('com.google.firebase:firebase-bom:32.3.1')
53+
implementation platform('com.google.firebase:firebase-bom:32.7.0')
5454
implementation 'com.google.firebase:firebase-analytics'
5555
}
5656

0 commit comments

Comments
 (0)