diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index fa9ae5c37f..b94a5d0c75 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -426,10 +426,9 @@ jobs: with: ref: ${{needs.check_and_prepare.outputs.github_ref}} submodules: true - - name: Force Java 8 (macOS) - if: startsWith(matrix.os, 'macos') + - name: Force Java 11 shell: bash - run: echo "JAVA_HOME=${JAVA_HOME_8_X64}" >> $GITHUB_ENV + run: echo "JAVA_HOME=${JAVA_HOME_11_X64}" >> $GITHUB_ENV - name: Add msbuild to PATH (Windows) if: startsWith(matrix.os, 'windows') uses: microsoft/setup-msbuild@v1.1 @@ -1058,11 +1057,11 @@ jobs: run: | echo "device_type=$( python scripts/gha/print_matrix_configuration.py -k ${{ matrix.android_device }} -get_device_type)" >> $GITHUB_OUTPUT echo "device=$( python scripts/gha/print_matrix_configuration.py -k ${{ matrix.android_device }} -get_ftl_device_list)" >> $GITHUB_OUTPUT - - name: Setup java 8 for test_simulator.py + - name: Setup java 11 for test_simulator.py uses: actions/setup-java@v3 with: distribution: 'temurin' - java-version: '8' + java-version: '11' - name: Run Android integration tests on Emulator locally timeout-minutes: 180 if: steps.device-info.outputs.device_type == 'virtual' diff --git a/Android/firebase_dependencies.gradle b/Android/firebase_dependencies.gradle index 81ea08c322..be97003a80 100644 --- a/Android/firebase_dependencies.gradle +++ b/Android/firebase_dependencies.gradle @@ -159,7 +159,7 @@ project.afterEvaluate { // Add the bill-of-materials project.dependencies { - implementation platform('com.google.firebase:firebase-bom:33.1.2') + implementation platform('com.google.firebase:firebase-bom:33.2.0') } for (String lib : firebaseCpp.dependencies.libSet) { // Generate and include the proguard file diff --git a/analytics/build.gradle b/analytics/build.gradle index b1e1705baa..4eae16890f 100644 --- a/analytics/build.gradle +++ b/analytics/build.gradle @@ -18,7 +18,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' + classpath 'com.android.tools.build:gradle:7.4.2' } } allprojects { @@ -33,7 +33,7 @@ apply plugin: 'com.android.library' android { compileSdkVersion 34 ndkPath System.getenv('ANDROID_NDK_HOME') - buildToolsVersion '30.0.2' + buildToolsVersion '32.0.0' sourceSets { main { @@ -48,7 +48,7 @@ android { } defaultConfig { - minSdkVersion 23 + minSdkVersion 24 targetSdkVersion 34 versionCode 1 versionName "1.0" diff --git a/analytics/integration_test/build.gradle b/analytics/integration_test/build.gradle index 29621bd352..d4185f86fd 100644 --- a/analytics/integration_test/build.gradle +++ b/analytics/integration_test/build.gradle @@ -20,8 +20,8 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' - classpath 'com.google.gms:google-services:4.0.1' + classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.google.gms:google-services:4.4.1' } } @@ -37,12 +37,12 @@ apply plugin: 'com.android.application' android { compileOptions { - sourceCompatibility 1.8 - targetCompatibility 1.8 + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 } compileSdkVersion 34 ndkPath System.getenv('ANDROID_NDK_HOME') - buildToolsVersion '30.0.2' + buildToolsVersion '32.0.0' sourceSets { main { @@ -55,7 +55,7 @@ android { defaultConfig { applicationId 'com.google.android.analytics.testapp' - minSdkVersion 23 + minSdkVersion 24 targetSdkVersion 34 versionCode 1 versionName '1.0' diff --git a/analytics/integration_test/gradle/wrapper/gradle-wrapper.properties b/analytics/integration_test/gradle/wrapper/gradle-wrapper.properties index 65340c1b59..2eb04a3b17 100644 --- 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-6.7.1-all.zip +distributionUrl=https://services.gradle.org/distributions/gradle-7.5.1-all.zip diff --git a/android_build_files/extract_and_dex.gradle b/android_build_files/extract_and_dex.gradle index 2173973339..65541a2177 100644 --- a/android_build_files/extract_and_dex.gradle +++ b/android_build_files/extract_and_dex.gradle @@ -58,15 +58,11 @@ def defineExtractionTasks(String resourceName, String buildType) { outputs.file "$outPro" // Convert the jar format using the dx tool. - String dex_path = "${sdk_dir}/build-tools/${buildToolsVersion}/dx" - if (org.gradle.internal.os.OperatingSystem.current().isWindows()) { - dex_path = "${dex_path}.bat" - } - - commandLine "${dex_path}", - '--dex', - "--output=$dexedJar", - "$buildDir/classes.jar" + String dex_path = "${sdk_dir}/build-tools/${buildToolsVersion}/lib/d8.jar" + commandLine "java", "-cp", "${dex_path}", "com.android.tools.r8.D8", + "$buildDir/classes.jar", + "--output", + "$dexedJar" } // Once the dexed jar has been made, generate a proguard file for it. diff --git a/app/app_resources/build.gradle b/app/app_resources/build.gradle index 8351e562db..20a3b9e70f 100644 --- a/app/app_resources/build.gradle +++ b/app/app_resources/build.gradle @@ -18,8 +18,8 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' - classpath 'com.google.gms:google-services:4.2.0' + classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.google.gms:google-services:4.4.1' } } allprojects { @@ -33,10 +33,11 @@ apply plugin: 'com.android.library' android { compileOptions { - sourceCompatibility 1.8 - targetCompatibility 1.8 + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 } compileSdkVersion 34 + buildToolsVersion '32.0.0' sourceSets { main { @@ -50,7 +51,7 @@ android { } dependencies { - implementation platform('com.google.firebase:firebase-bom:33.1.2') + implementation platform('com.google.firebase:firebase-bom:33.2.0') implementation 'com.google.firebase:firebase-analytics' } diff --git a/app/build.gradle b/app/build.gradle index fa2a2aae91..4ceb729572 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -18,7 +18,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' + classpath 'com.android.tools.build:gradle:7.4.2' } } allprojects { @@ -33,7 +33,7 @@ apply plugin: 'com.android.library' android { compileSdkVersion 34 ndkPath System.getenv('ANDROID_NDK_HOME') - buildToolsVersion '30.0.2' + buildToolsVersion '32.0.0' sourceSets { main { @@ -48,7 +48,7 @@ android { } defaultConfig { - minSdkVersion 23 + minSdkVersion 24 targetSdkVersion 34 versionCode 1 versionName "1.0" diff --git a/app/google_api_resources/build.gradle b/app/google_api_resources/build.gradle index 7ee92162e2..8eef739f77 100644 --- a/app/google_api_resources/build.gradle +++ b/app/google_api_resources/build.gradle @@ -18,8 +18,8 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' - classpath 'com.google.gms:google-services:4.2.0' + classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.google.gms:google-services:4.4.1' } } allprojects { @@ -33,10 +33,11 @@ apply plugin: 'com.android.library' android { compileOptions { - sourceCompatibility 1.8 - targetCompatibility 1.8 + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 } compileSdkVersion 34 + buildToolsVersion '32.0.0' sourceSets { main { @@ -53,7 +54,7 @@ android { } dependencies { - implementation platform('com.google.firebase:firebase-bom:33.1.2') + implementation platform('com.google.firebase:firebase-bom:33.2.0') implementation 'com.google.firebase:firebase-analytics' implementation 'com.google.android.gms:play-services-base:18.5.0' implementation project(':app:app_resources') diff --git a/app/integration_test/build.gradle b/app/integration_test/build.gradle index 3cec305c79..50bf9496d3 100644 --- a/app/integration_test/build.gradle +++ b/app/integration_test/build.gradle @@ -20,8 +20,8 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' - classpath 'com.google.gms:google-services:4.0.1' + classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.google.gms:google-services:4.4.1' } } @@ -37,12 +37,12 @@ apply plugin: 'com.android.application' android { compileOptions { - sourceCompatibility 1.8 - targetCompatibility 1.8 + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 } compileSdkVersion 34 ndkPath System.getenv('ANDROID_NDK_HOME') - buildToolsVersion '30.0.2' + buildToolsVersion '32.0.0' sourceSets { main { @@ -55,7 +55,7 @@ android { defaultConfig { applicationId 'com.google.android.analytics.testapp' - minSdkVersion 23 + minSdkVersion 24 targetSdkVersion 34 versionCode 1 versionName '1.0' diff --git a/app/integration_test/gradle/wrapper/gradle-wrapper.properties b/app/integration_test/gradle/wrapper/gradle-wrapper.properties index 65340c1b59..2eb04a3b17 100644 --- 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-6.7.1-all.zip +distributionUrl=https://services.gradle.org/distributions/gradle-7.5.1-all.zip diff --git a/app/invites_resources/build.gradle b/app/invites_resources/build.gradle index 1adbca0ae7..2d3701ba65 100644 --- a/app/invites_resources/build.gradle +++ b/app/invites_resources/build.gradle @@ -18,8 +18,8 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' - classpath 'com.google.gms:google-services:4.2.0' + classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.google.gms:google-services:4.4.1' } } allprojects { @@ -33,10 +33,11 @@ apply plugin: 'com.android.library' android { compileOptions { - sourceCompatibility 1.8 - targetCompatibility 1.8 + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 } compileSdkVersion 34 + buildToolsVersion '32.0.0' sourceSets { main { @@ -49,7 +50,7 @@ android { } dependencies { - implementation platform('com.google.firebase:firebase-bom:33.1.2') + implementation platform('com.google.firebase:firebase-bom:33.2.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 index 53c2d0e136..5588b40340 100644 --- a/app/test_resources/build.gradle +++ b/app/test_resources/build.gradle @@ -18,8 +18,8 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' - classpath 'com.google.gms:google-services:4.2.0' + classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.google.gms:google-services:4.4.1' } } allprojects { @@ -33,6 +33,7 @@ apply plugin: 'com.android.library' android { compileSdkVersion 34 + buildToolsVersion '32.0.0' sourceSets { main { diff --git a/app_check/app_check_resources/build.gradle b/app_check/app_check_resources/build.gradle index 6cc09ba1df..101b79de6d 100644 --- a/app_check/app_check_resources/build.gradle +++ b/app_check/app_check_resources/build.gradle @@ -18,8 +18,8 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' - classpath 'com.google.gms:google-services:4.2.0' + classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.google.gms:google-services:4.4.1' } } allprojects { @@ -33,10 +33,11 @@ apply plugin: 'com.android.library' android { compileOptions { - sourceCompatibility 1.8 - targetCompatibility 1.8 + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 } compileSdkVersion 34 + buildToolsVersion '32.0.0' sourceSets { main { @@ -49,7 +50,7 @@ android { } dependencies { - implementation platform('com.google.firebase:firebase-bom:33.1.2') + implementation platform('com.google.firebase:firebase-bom:33.2.0') implementation 'com.google.firebase:firebase-appcheck' } diff --git a/app_check/build.gradle b/app_check/build.gradle index 82ca483612..2b8d1eb44e 100644 --- a/app_check/build.gradle +++ b/app_check/build.gradle @@ -18,7 +18,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' + classpath 'com.android.tools.build:gradle:7.4.2' } } allprojects { @@ -33,7 +33,7 @@ apply plugin: 'com.android.library' android { compileSdkVersion 34 ndkPath System.getenv('ANDROID_NDK_HOME') - buildToolsVersion '30.0.2' + buildToolsVersion '32.0.0' sourceSets { main { @@ -48,7 +48,7 @@ android { } defaultConfig { - minSdkVersion 23 + minSdkVersion 24 targetSdkVersion 34 versionCode 1 versionName "1.0" diff --git a/app_check/integration_test/build.gradle b/app_check/integration_test/build.gradle index 4877125e27..ef0edf02a9 100644 --- a/app_check/integration_test/build.gradle +++ b/app_check/integration_test/build.gradle @@ -20,8 +20,8 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' - classpath 'com.google.gms:google-services:4.0.1' + classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.google.gms:google-services:4.4.1' } } @@ -37,12 +37,12 @@ apply plugin: 'com.android.application' android { compileOptions { - sourceCompatibility 1.8 - targetCompatibility 1.8 + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 } compileSdkVersion 34 ndkPath System.getenv('ANDROID_NDK_HOME') - buildToolsVersion '30.0.2' + buildToolsVersion '32.0.0' sourceSets { main { @@ -55,7 +55,7 @@ android { defaultConfig { applicationId 'com.google.firebase.cpp.appcheck.testapp' - minSdkVersion 23 + minSdkVersion 24 targetSdkVersion 34 versionCode 1 versionName '1.0' @@ -85,6 +85,7 @@ android { } packagingOptions { pickFirst 'META-INF/**/coroutines.pro' + pickFirst 'META-INF/third_party.java_src.protobuf.current.java.com.google.protobuf.*.kotlin_module' } } diff --git a/app_check/integration_test/gradle/wrapper/gradle-wrapper.properties b/app_check/integration_test/gradle/wrapper/gradle-wrapper.properties index 65340c1b59..2eb04a3b17 100644 --- 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-6.7.1-all.zip +distributionUrl=https://services.gradle.org/distributions/gradle-7.5.1-all.zip diff --git a/auth/auth_resources/build.gradle b/auth/auth_resources/build.gradle index 00564f2957..26d8510a13 100644 --- a/auth/auth_resources/build.gradle +++ b/auth/auth_resources/build.gradle @@ -18,8 +18,8 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' - classpath 'com.google.gms:google-services:4.2.0' + classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.google.gms:google-services:4.4.1' } } allprojects { @@ -33,10 +33,11 @@ apply plugin: 'com.android.library' android { compileOptions { - sourceCompatibility 1.8 - targetCompatibility 1.8 + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 } compileSdkVersion 34 + buildToolsVersion '32.0.0' sourceSets { main { @@ -49,7 +50,7 @@ android { } dependencies { - implementation platform('com.google.firebase:firebase-bom:33.1.2') + implementation platform('com.google.firebase:firebase-bom:33.2.0') implementation 'com.google.firebase:firebase-analytics' implementation 'com.google.firebase:firebase-auth' implementation project(':app:app_resources') diff --git a/auth/build.gradle b/auth/build.gradle index 7ddc5e4e8d..8825c85463 100644 --- a/auth/build.gradle +++ b/auth/build.gradle @@ -18,7 +18,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' + classpath 'com.android.tools.build:gradle:7.4.2' } } allprojects { @@ -33,7 +33,7 @@ apply plugin: 'com.android.library' android { compileSdkVersion 34 ndkPath System.getenv('ANDROID_NDK_HOME') - buildToolsVersion '30.0.2' + buildToolsVersion '32.0.0' sourceSets { main { @@ -48,7 +48,7 @@ android { } defaultConfig { - minSdkVersion 23 + minSdkVersion 24 targetSdkVersion 34 versionCode 1 versionName "1.0" diff --git a/auth/integration_test/build.gradle b/auth/integration_test/build.gradle index 942a05b0d6..56b5b22b9b 100644 --- a/auth/integration_test/build.gradle +++ b/auth/integration_test/build.gradle @@ -20,8 +20,8 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' - classpath 'com.google.gms:google-services:4.0.1' + classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.google.gms:google-services:4.4.1' } } @@ -37,12 +37,12 @@ apply plugin: 'com.android.application' android { compileOptions { - sourceCompatibility 1.8 - targetCompatibility 1.8 + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 } compileSdkVersion 34 ndkPath System.getenv('ANDROID_NDK_HOME') - buildToolsVersion '30.0.2' + buildToolsVersion '32.0.0' sourceSets { main { @@ -55,7 +55,7 @@ android { defaultConfig { applicationId 'com.google.android.auth.testapp' - minSdkVersion 23 + minSdkVersion 24 targetSdkVersion 34 versionCode 1 versionName '1.0' @@ -76,6 +76,7 @@ android { } packagingOptions { pickFirst 'META-INF/**/coroutines.pro' + pickFirst 'META-INF/third_party.java_src.protobuf.current.java.com.google.protobuf.*.kotlin_module' } } diff --git a/auth/integration_test/gradle/wrapper/gradle-wrapper.properties b/auth/integration_test/gradle/wrapper/gradle-wrapper.properties index 65340c1b59..2eb04a3b17 100644 --- a/auth/integration_test/gradle/wrapper/gradle-wrapper.properties +++ b/auth/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-6.7.1-all.zip +distributionUrl=https://services.gradle.org/distributions/gradle-7.5.1-all.zip diff --git a/database/build.gradle b/database/build.gradle index 51cf8c0dfa..881aa9ca3e 100644 --- a/database/build.gradle +++ b/database/build.gradle @@ -18,7 +18,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' + classpath 'com.android.tools.build:gradle:7.4.2' } } allprojects { @@ -33,7 +33,7 @@ apply plugin: 'com.android.library' android { compileSdkVersion 34 ndkPath System.getenv('ANDROID_NDK_HOME') - buildToolsVersion '30.0.2' + buildToolsVersion '32.0.0' sourceSets { main { @@ -48,7 +48,7 @@ android { } defaultConfig { - minSdkVersion 23 + minSdkVersion 24 targetSdkVersion 34 versionCode 1 versionName "1.0" diff --git a/database/database_resources/build.gradle b/database/database_resources/build.gradle index 4cfb882e01..032235fd00 100644 --- a/database/database_resources/build.gradle +++ b/database/database_resources/build.gradle @@ -18,8 +18,8 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' - classpath 'com.google.gms:google-services:4.2.0' + classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.google.gms:google-services:4.4.1' } } allprojects { @@ -33,6 +33,7 @@ apply plugin: 'com.android.library' android { compileSdkVersion 34 + buildToolsVersion '32.0.0' sourceSets { main { @@ -45,7 +46,7 @@ android { } dependencies { - implementation platform('com.google.firebase:firebase-bom:33.1.2') + implementation platform('com.google.firebase:firebase-bom:33.2.0') implementation 'com.google.firebase:firebase-analytics' implementation 'com.google.firebase:firebase-database' //implementation project(':app:app_resources') diff --git a/database/integration_test/build.gradle b/database/integration_test/build.gradle index 86907f840f..ac7a7cc5f9 100644 --- a/database/integration_test/build.gradle +++ b/database/integration_test/build.gradle @@ -20,8 +20,8 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' - classpath 'com.google.gms:google-services:4.0.1' + classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.google.gms:google-services:4.4.1' } } @@ -37,12 +37,12 @@ apply plugin: 'com.android.application' android { compileOptions { - sourceCompatibility 1.8 - targetCompatibility 1.8 + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 } compileSdkVersion 34 ndkPath System.getenv('ANDROID_NDK_HOME') - buildToolsVersion '30.0.2' + buildToolsVersion '32.0.0' sourceSets { main { @@ -55,7 +55,7 @@ android { defaultConfig { applicationId 'com.google.firebase.cpp.database.testapp' - minSdkVersion 23 + minSdkVersion 24 targetSdkVersion 34 versionCode 1 versionName '1.0' @@ -76,6 +76,7 @@ android { } packagingOptions { pickFirst 'META-INF/**/coroutines.pro' + pickFirst 'META-INF/third_party.java_src.protobuf.current.java.com.google.protobuf.*.kotlin_module' } } diff --git a/database/integration_test/gradle/wrapper/gradle-wrapper.properties b/database/integration_test/gradle/wrapper/gradle-wrapper.properties index 65340c1b59..2eb04a3b17 100644 --- a/database/integration_test/gradle/wrapper/gradle-wrapper.properties +++ b/database/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-6.7.1-all.zip +distributionUrl=https://services.gradle.org/distributions/gradle-7.5.1-all.zip diff --git a/dynamic_links/build.gradle b/dynamic_links/build.gradle index 7a8fee4af8..6add551ed6 100644 --- a/dynamic_links/build.gradle +++ b/dynamic_links/build.gradle @@ -18,7 +18,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' + classpath 'com.android.tools.build:gradle:7.4.2' } } allprojects { @@ -33,7 +33,7 @@ apply plugin: 'com.android.library' android { compileSdkVersion 34 ndkPath System.getenv('ANDROID_NDK_HOME') - buildToolsVersion '30.0.2' + buildToolsVersion '32.0.0' sourceSets { main { @@ -48,7 +48,7 @@ android { } defaultConfig { - minSdkVersion 23 + minSdkVersion 24 targetSdkVersion 34 versionCode 1 versionName "1.0" diff --git a/dynamic_links/integration_test/build.gradle b/dynamic_links/integration_test/build.gradle index 92f1978cad..e523684703 100644 --- a/dynamic_links/integration_test/build.gradle +++ b/dynamic_links/integration_test/build.gradle @@ -20,8 +20,8 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' - classpath 'com.google.gms:google-services:4.0.1' + classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.google.gms:google-services:4.4.1' } } @@ -37,12 +37,12 @@ apply plugin: 'com.android.application' android { compileOptions { - sourceCompatibility 1.8 - targetCompatibility 1.8 + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 } compileSdkVersion 34 ndkPath System.getenv('ANDROID_NDK_HOME') - buildToolsVersion '30.0.2' + buildToolsVersion '32.0.0' sourceSets { main { @@ -55,7 +55,7 @@ android { defaultConfig { applicationId 'com.google.android.dynamiclinks.testapp' - minSdkVersion 23 + minSdkVersion 24 targetSdkVersion 34 versionCode 1 versionName '1.0' diff --git a/dynamic_links/integration_test/gradle/wrapper/gradle-wrapper.properties b/dynamic_links/integration_test/gradle/wrapper/gradle-wrapper.properties index 65340c1b59..2eb04a3b17 100644 --- a/dynamic_links/integration_test/gradle/wrapper/gradle-wrapper.properties +++ b/dynamic_links/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-6.7.1-all.zip +distributionUrl=https://services.gradle.org/distributions/gradle-7.5.1-all.zip diff --git a/firestore/build.gradle b/firestore/build.gradle index 4c3d7c0800..85c83d6c82 100644 --- a/firestore/build.gradle +++ b/firestore/build.gradle @@ -18,7 +18,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' + classpath 'com.android.tools.build:gradle:7.4.2' } } allprojects { @@ -33,7 +33,7 @@ apply plugin: 'com.android.library' android { compileSdkVersion 34 ndkPath System.getenv('ANDROID_NDK_HOME') - buildToolsVersion '30.0.2' + buildToolsVersion '32.0.0' sourceSets { main { @@ -49,7 +49,7 @@ android { defaultConfig { // Jelly Bean is the minimum supported version needed by Firebase. - minSdkVersion 23 + minSdkVersion 24 targetSdkVersion 34 versionCode 1 versionName "1.0" diff --git a/firestore/firestore_resources/build.gradle b/firestore/firestore_resources/build.gradle index 93439900aa..1f6e5f186f 100644 --- a/firestore/firestore_resources/build.gradle +++ b/firestore/firestore_resources/build.gradle @@ -18,8 +18,8 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' - classpath 'com.google.gms:google-services:4.2.0' + classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.google.gms:google-services:4.4.1' } } allprojects { @@ -33,10 +33,11 @@ apply plugin: 'com.android.library' android { compileOptions { - sourceCompatibility 1.8 - targetCompatibility 1.8 + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 } compileSdkVersion 34 + buildToolsVersion '32.0.0' sourceSets { main { @@ -53,7 +54,7 @@ android { } dependencies { - implementation platform('com.google.firebase:firebase-bom:33.1.2') + implementation platform('com.google.firebase:firebase-bom:33.2.0') implementation 'com.google.firebase:firebase-analytics' implementation 'com.google.firebase:firebase-firestore' } diff --git a/firestore/integration_test/build.gradle b/firestore/integration_test/build.gradle index 37efea8216..38e90b51b3 100644 --- a/firestore/integration_test/build.gradle +++ b/firestore/integration_test/build.gradle @@ -20,8 +20,8 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' - classpath 'com.google.gms:google-services:4.0.1' + classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.google.gms:google-services:4.4.1' } } @@ -37,12 +37,12 @@ apply plugin: 'com.android.application' android { compileOptions { - sourceCompatibility 1.8 - targetCompatibility 1.8 + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 } compileSdkVersion 34 ndkPath System.getenv('ANDROID_NDK_HOME') - buildToolsVersion '30.0.2' + buildToolsVersion '32.0.0' sourceSets { main { @@ -55,7 +55,7 @@ android { defaultConfig { applicationId 'com.google.firebase.cpp.firestore.testapp' - minSdkVersion 23 + minSdkVersion 24 targetSdkVersion 34 versionCode 1 versionName '1.0' @@ -76,6 +76,7 @@ android { } packagingOptions { pickFirst 'META-INF/**/coroutines.pro' + pickFirst 'META-INF/third_party.java_src.protobuf.current.java.com.google.protobuf.*.kotlin_module' } } diff --git a/firestore/integration_test/gradle/wrapper/gradle-wrapper.properties b/firestore/integration_test/gradle/wrapper/gradle-wrapper.properties index 65340c1b59..2eb04a3b17 100644 --- a/firestore/integration_test/gradle/wrapper/gradle-wrapper.properties +++ b/firestore/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-6.7.1-all.zip +distributionUrl=https://services.gradle.org/distributions/gradle-7.5.1-all.zip diff --git a/firestore/integration_test_internal/build.gradle b/firestore/integration_test_internal/build.gradle index f1bb9b4f3b..046f95d0a2 100644 --- a/firestore/integration_test_internal/build.gradle +++ b/firestore/integration_test_internal/build.gradle @@ -20,8 +20,8 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' - classpath 'com.google.gms:google-services:4.0.1' + classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.google.gms:google-services:4.4.1' } } @@ -37,12 +37,12 @@ apply plugin: 'com.android.application' android { compileOptions { - sourceCompatibility 1.8 - targetCompatibility 1.8 + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 } compileSdkVersion 34 ndkPath System.getenv('ANDROID_NDK_HOME') - buildToolsVersion '30.0.2' + buildToolsVersion '32.0.0' sourceSets { main { @@ -63,7 +63,7 @@ android { defaultConfig { applicationId 'com.google.firebase.cpp.firestore.testapp' - minSdkVersion 23 + minSdkVersion 24 targetSdkVersion 34 versionCode 1 versionName '1.0' @@ -89,9 +89,6 @@ android { proguardFile file('proguard.pro') } } - packagingOptions { - pickFirst 'META-INF/**/coroutines.pro' - } lintOptions { abortOnError false } diff --git a/firestore/integration_test_internal/gradle/wrapper/gradle-wrapper.properties b/firestore/integration_test_internal/gradle/wrapper/gradle-wrapper.properties index 65340c1b59..2eb04a3b17 100644 --- a/firestore/integration_test_internal/gradle/wrapper/gradle-wrapper.properties +++ b/firestore/integration_test_internal/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-6.7.1-all.zip +distributionUrl=https://services.gradle.org/distributions/gradle-7.5.1-all.zip diff --git a/functions/build.gradle b/functions/build.gradle index bdecc2819f..f0ba967d9f 100644 --- a/functions/build.gradle +++ b/functions/build.gradle @@ -18,7 +18,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' + classpath 'com.android.tools.build:gradle:7.4.2' } } allprojects { @@ -33,7 +33,7 @@ apply plugin: 'com.android.library' android { compileSdkVersion 34 ndkPath System.getenv('ANDROID_NDK_HOME') - buildToolsVersion '30.0.2' + buildToolsVersion '32.0.0' sourceSets { main { @@ -48,7 +48,7 @@ android { } defaultConfig { - minSdkVersion 23 + minSdkVersion 24 targetSdkVersion 34 versionCode 1 versionName "1.0" diff --git a/functions/integration_test/build.gradle b/functions/integration_test/build.gradle index d773468cb1..1e6387d99c 100644 --- a/functions/integration_test/build.gradle +++ b/functions/integration_test/build.gradle @@ -20,8 +20,8 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' - classpath 'com.google.gms:google-services:4.0.1' + classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.google.gms:google-services:4.4.1' } } @@ -37,12 +37,12 @@ apply plugin: 'com.android.application' android { compileOptions { - sourceCompatibility 1.8 - targetCompatibility 1.8 + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 } compileSdkVersion 34 ndkPath System.getenv('ANDROID_NDK_HOME') - buildToolsVersion '30.0.2' + buildToolsVersion '32.0.0' sourceSets { main { @@ -55,7 +55,7 @@ android { defaultConfig { applicationId 'com.google.firebase.cpp.functions.testapp' - minSdkVersion 23 + minSdkVersion 24 targetSdkVersion 34 versionCode 1 versionName '1.0' @@ -76,6 +76,7 @@ android { } packagingOptions { pickFirst 'META-INF/**/coroutines.pro' + pickFirst 'META-INF/third_party.java_src.protobuf.current.java.com.google.protobuf.*.kotlin_module' } } diff --git a/functions/integration_test/gradle/wrapper/gradle-wrapper.properties b/functions/integration_test/gradle/wrapper/gradle-wrapper.properties index 65340c1b59..2eb04a3b17 100644 --- a/functions/integration_test/gradle/wrapper/gradle-wrapper.properties +++ b/functions/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-6.7.1-all.zip +distributionUrl=https://services.gradle.org/distributions/gradle-7.5.1-all.zip diff --git a/gma/build.gradle b/gma/build.gradle index bd0bab6803..50a0b56b2c 100644 --- a/gma/build.gradle +++ b/gma/build.gradle @@ -18,7 +18,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' + classpath 'com.android.tools.build:gradle:7.4.2' } } allprojects { @@ -33,7 +33,7 @@ apply plugin: 'com.android.library' android { compileSdkVersion 34 ndkPath System.getenv('ANDROID_NDK_HOME') - buildToolsVersion '30.0.2' + buildToolsVersion '32.0.0' sourceSets { main { @@ -48,7 +48,7 @@ android { } defaultConfig { - minSdkVersion 23 + minSdkVersion 24 targetSdkVersion 34 versionCode 1 versionName "1.0" diff --git a/gma/gma_resources/build.gradle b/gma/gma_resources/build.gradle index bd1a8144c3..12cbfc5e5e 100644 --- a/gma/gma_resources/build.gradle +++ b/gma/gma_resources/build.gradle @@ -18,8 +18,8 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' - classpath 'com.google.gms:google-services:4.2.0' + classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.google.gms:google-services:4.4.1' } } allprojects { @@ -33,11 +33,12 @@ apply plugin: 'com.android.library' android { compileOptions { - sourceCompatibility 1.8 - targetCompatibility 1.8 + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 } compileSdkVersion 34 + buildToolsVersion '32.0.0' sourceSets { main { @@ -50,7 +51,7 @@ android { } dependencies { - implementation platform('com.google.firebase:firebase-bom:33.1.2') + implementation platform('com.google.firebase:firebase-bom:33.2.0') implementation 'com.google.firebase:firebase-analytics' implementation 'com.google.android.gms:play-services-ads:23.0.0' implementation 'com.google.android.ump:user-messaging-platform:2.2.0' diff --git a/gma/integration_test/build.gradle b/gma/integration_test/build.gradle index 58cdfd4a82..0e78ade8b9 100644 --- a/gma/integration_test/build.gradle +++ b/gma/integration_test/build.gradle @@ -20,8 +20,8 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' - classpath 'com.google.gms:google-services:4.0.1' + classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.google.gms:google-services:4.4.1' } } @@ -37,12 +37,12 @@ apply plugin: 'com.android.application' android { compileOptions { - sourceCompatibility 1.8 - targetCompatibility 1.8 + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 } compileSdkVersion 34 ndkPath System.getenv('ANDROID_NDK_HOME') - buildToolsVersion '30.0.2' + buildToolsVersion '32.0.0' sourceSets { main { @@ -55,7 +55,7 @@ android { defaultConfig { applicationId 'com.google.android.admob.testapp' - minSdkVersion 23 + minSdkVersion 24 targetSdkVersion 34 versionCode 1 versionName '1.0' diff --git a/gma/integration_test/gradle/wrapper/gradle-wrapper.properties b/gma/integration_test/gradle/wrapper/gradle-wrapper.properties index 65340c1b59..2eb04a3b17 100644 --- a/gma/integration_test/gradle/wrapper/gradle-wrapper.properties +++ b/gma/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-6.7.1-all.zip +distributionUrl=https://services.gradle.org/distributions/gradle-7.5.1-all.zip diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 39e18027f1..78b9533282 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https://services.gradle.org/distributions/gradle-6.7.1-all.zip +distributionUrl=https://services.gradle.org/distributions/gradle-7.5.1-all.zip diff --git a/installations/build.gradle b/installations/build.gradle index ba4d234524..f9de82e6b9 100644 --- a/installations/build.gradle +++ b/installations/build.gradle @@ -18,7 +18,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' + classpath 'com.android.tools.build:gradle:7.4.2' } } allprojects { @@ -33,7 +33,7 @@ apply plugin: 'com.android.library' android { compileSdkVersion 34 ndkPath System.getenv('ANDROID_NDK_HOME') - buildToolsVersion '30.0.2' + buildToolsVersion '32.0.0' sourceSets { main { @@ -48,7 +48,7 @@ android { } defaultConfig { - minSdkVersion 23 + minSdkVersion 24 targetSdkVersion 34 versionCode 1 versionName "1.0" diff --git a/installations/integration_test/build.gradle b/installations/integration_test/build.gradle index 9c501b9e25..daad7ca6e1 100644 --- a/installations/integration_test/build.gradle +++ b/installations/integration_test/build.gradle @@ -20,8 +20,8 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' - classpath 'com.google.gms:google-services:4.0.1' + classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.google.gms:google-services:4.4.1' } } @@ -37,12 +37,12 @@ apply plugin: 'com.android.application' android { compileOptions { - sourceCompatibility 1.8 - targetCompatibility 1.8 + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 } compileSdkVersion 34 ndkPath System.getenv('ANDROID_NDK_HOME') - buildToolsVersion '30.0.2' + buildToolsVersion '32.0.0' sourceSets { main { @@ -55,7 +55,7 @@ android { defaultConfig { applicationId 'com.google.firebase.fis.testapp' - minSdkVersion 23 + minSdkVersion 24 targetSdkVersion 34 versionCode 1 versionName '1.0' diff --git a/installations/integration_test/gradle/wrapper/gradle-wrapper.properties b/installations/integration_test/gradle/wrapper/gradle-wrapper.properties index 65340c1b59..2eb04a3b17 100644 --- a/installations/integration_test/gradle/wrapper/gradle-wrapper.properties +++ b/installations/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-6.7.1-all.zip +distributionUrl=https://services.gradle.org/distributions/gradle-7.5.1-all.zip diff --git a/messaging/build.gradle b/messaging/build.gradle index 6068dfb54c..f9a585abe6 100644 --- a/messaging/build.gradle +++ b/messaging/build.gradle @@ -18,7 +18,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' + classpath 'com.android.tools.build:gradle:7.4.2' } } allprojects { @@ -33,7 +33,7 @@ apply plugin: 'com.android.library' android { compileSdkVersion 34 ndkPath System.getenv('ANDROID_NDK_HOME') - buildToolsVersion '30.0.2' + buildToolsVersion '32.0.0' sourceSets { main { @@ -48,7 +48,7 @@ android { } defaultConfig { - minSdkVersion 23 + minSdkVersion 24 targetSdkVersion 34 versionCode 1 versionName "1.0" diff --git a/messaging/integration_test/build.gradle b/messaging/integration_test/build.gradle index 9bbc92c059..7f274e868b 100644 --- a/messaging/integration_test/build.gradle +++ b/messaging/integration_test/build.gradle @@ -20,8 +20,8 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' - classpath 'com.google.gms:google-services:4.0.1' + classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.google.gms:google-services:4.4.1' } } @@ -37,12 +37,12 @@ apply plugin: 'com.android.application' android { compileOptions { - sourceCompatibility 1.8 - targetCompatibility 1.8 + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 } compileSdkVersion 34 ndkPath System.getenv('ANDROID_NDK_HOME') - buildToolsVersion '30.0.2' + buildToolsVersion '32.0.0' sourceSets { main { @@ -55,7 +55,7 @@ android { defaultConfig { applicationId 'com.google.firebase.cpp.messaging.testapp' - minSdkVersion 23 + minSdkVersion 24 targetSdkVersion 34 versionCode 1 versionName '1.0' diff --git a/messaging/integration_test/gradle/wrapper/gradle-wrapper.properties b/messaging/integration_test/gradle/wrapper/gradle-wrapper.properties index 65340c1b59..2eb04a3b17 100644 --- a/messaging/integration_test/gradle/wrapper/gradle-wrapper.properties +++ b/messaging/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-6.7.1-all.zip +distributionUrl=https://services.gradle.org/distributions/gradle-7.5.1-all.zip diff --git a/messaging/messaging_java/build.gradle b/messaging/messaging_java/build.gradle index a268401ee7..697b447c1f 100644 --- a/messaging/messaging_java/build.gradle +++ b/messaging/messaging_java/build.gradle @@ -18,8 +18,8 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' - classpath 'com.google.gms:google-services:4.2.0' + classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.google.gms:google-services:4.4.1' // This uses Flatbuffers at 1.9 because the 1.10 version added a feature // that requires using a newer version of the JDK and at least Android N. // This has already been fixed at head, but a tagged release is not yet @@ -38,13 +38,14 @@ apply plugin: 'com.android.library' android { compileOptions { - sourceCompatibility 1.8 - targetCompatibility 1.8 + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 } compileSdkVersion 34 + buildToolsVersion '32.0.0' defaultConfig { - minSdkVersion 23 + minSdkVersion 24 } sourceSets { @@ -59,7 +60,7 @@ android { } dependencies { - implementation platform('com.google.firebase:firebase-bom:33.1.2') + implementation platform('com.google.firebase:firebase-bom:33.2.0') implementation 'com.google.firebase:firebase-analytics' implementation 'com.google.firebase:firebase-messaging' implementation 'com.google.flatbuffers:flatbuffers-java:1.12.0' diff --git a/release_build_files/Android/firebase_dependencies.gradle b/release_build_files/Android/firebase_dependencies.gradle index b80aed1531..be73d6578e 100644 --- a/release_build_files/Android/firebase_dependencies.gradle +++ b/release_build_files/Android/firebase_dependencies.gradle @@ -132,7 +132,7 @@ project.afterEvaluate { // Add the bill-of-materials project.dependencies { - implementation platform('com.google.firebase:firebase-bom:33.1.2') + implementation platform('com.google.firebase:firebase-bom:33.2.0') } for (String lib : firebaseCpp.dependencies.libSet) { // Messaging includes an aar, which to be depended on properly requires diff --git a/release_build_files/readme.md b/release_build_files/readme.md index 5a169fff5c..16aebf6e2c 100644 --- a/release_build_files/readme.md +++ b/release_build_files/readme.md @@ -86,7 +86,7 @@ distributed as part of the core Firebase Feature | Required Libraries and Gradle Packages -------------------------- | -------------------------------------- -All Firebase SDKs | platform(com.google.firebase:firebase-bom:33.1.2) +All Firebase SDKs | platform(com.google.firebase:firebase-bom:33.2.0) | | (Android Bill of Materials) Firebase Analytics | libfirebase_analytics.a | | libfirebase_app.a diff --git a/remote_config/build.gradle b/remote_config/build.gradle index 720d8c770e..1809f8aaeb 100644 --- a/remote_config/build.gradle +++ b/remote_config/build.gradle @@ -18,7 +18,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' + classpath 'com.android.tools.build:gradle:7.4.2' } } allprojects { @@ -33,7 +33,7 @@ apply plugin: 'com.android.library' android { compileSdkVersion 34 ndkPath System.getenv('ANDROID_NDK_HOME') - buildToolsVersion '30.0.2' + buildToolsVersion '32.0.0' sourceSets { main { @@ -48,7 +48,7 @@ android { } defaultConfig { - minSdkVersion 23 + minSdkVersion 24 targetSdkVersion 34 versionCode 1 versionName "1.0" diff --git a/remote_config/integration_test/build.gradle b/remote_config/integration_test/build.gradle index 5c669ad9cc..66e0a3e1e9 100644 --- a/remote_config/integration_test/build.gradle +++ b/remote_config/integration_test/build.gradle @@ -20,8 +20,8 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' - classpath 'com.google.gms:google-services:4.0.1' + classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.google.gms:google-services:4.4.1' } } @@ -37,12 +37,12 @@ apply plugin: 'com.android.application' android { compileOptions { - sourceCompatibility 1.8 - targetCompatibility 1.8 + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 } compileSdkVersion 34 ndkPath System.getenv('ANDROID_NDK_HOME') - buildToolsVersion '30.0.2' + buildToolsVersion '32.0.0' sourceSets { main { @@ -55,7 +55,7 @@ android { defaultConfig { applicationId 'com.google.android.remoteconfig.testapp' - minSdkVersion 23 + minSdkVersion 24 targetSdkVersion 34 versionCode 1 versionName '1.0' diff --git a/remote_config/integration_test/gradle/wrapper/gradle-wrapper.properties b/remote_config/integration_test/gradle/wrapper/gradle-wrapper.properties index 65340c1b59..2eb04a3b17 100644 --- a/remote_config/integration_test/gradle/wrapper/gradle-wrapper.properties +++ b/remote_config/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-6.7.1-all.zip +distributionUrl=https://services.gradle.org/distributions/gradle-7.5.1-all.zip diff --git a/remote_config/remote_config_resources/build.gradle b/remote_config/remote_config_resources/build.gradle index 9a766490da..82bc74843c 100644 --- a/remote_config/remote_config_resources/build.gradle +++ b/remote_config/remote_config_resources/build.gradle @@ -18,8 +18,8 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' - classpath 'com.google.gms:google-services:4.2.0' + classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.google.gms:google-services:4.4.1' } } allprojects { @@ -33,10 +33,11 @@ apply plugin: 'com.android.library' android { compileOptions { - sourceCompatibility 1.8 - targetCompatibility 1.8 + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 } compileSdkVersion 34 + buildToolsVersion '32.0.0' sourceSets { main { @@ -49,7 +50,7 @@ android { } dependencies { - implementation platform('com.google.firebase:firebase-bom:33.1.2') + implementation platform('com.google.firebase:firebase-bom:33.2.0') implementation 'com.google.firebase:firebase-config' } diff --git a/scripts/gha/build_testapps.py b/scripts/gha/build_testapps.py index a4f8fd8fd3..867202f71e 100644 --- a/scripts/gha/build_testapps.py +++ b/scripts/gha/build_testapps.py @@ -59,13 +59,11 @@ JAVA_HOME=/Library/Java/JavaVirtualMachines/jdk-8-latest/Contents/Home ANDROID_HOME=/Users/user_name/Library/Android/sdk - ANDROID_SDK_HOME=/Users/user_name/Library/Android/sdk ANDROID_NDK_HOME=/Users/user_name/Library/Android/sdk/ndk-bundle Or on Linux: JAVA_HOME=/usr/local/buildtools/java/jdk/ ANDROID_HOME=~/Android/Sdk - ANDROID_SDK_HOME=~/Android/Sdk ANDROID_NDK_HOME=~/Android/Sdk/ndk If using this tool frequently, you will likely find it convenient to @@ -97,7 +95,6 @@ # Environment variables _JAVA_HOME = "JAVA_HOME" _ANDROID_HOME = "ANDROID_HOME" -_ANDROID_SDK_HOME = "ANDROID_SDK_HOME" _NDK_ROOT = "NDK_ROOT" _ANDROID_NDK_HOME = "ANDROID_NDK_HOME" @@ -538,12 +535,8 @@ def _validate_android_environment_variables(): android_home = os.environ.get(_ANDROID_HOME) if not os.environ.get(_JAVA_HOME): logging.warning("%s not set", _JAVA_HOME) - if not os.environ.get(_ANDROID_SDK_HOME): - if android_home: # Use ANDROID_HOME as backup for ANDROID_SDK_HOME - os.environ[_ANDROID_SDK_HOME] = android_home - logging.info("%s not found, using %s", _ANDROID_SDK_HOME, _ANDROID_HOME) - else: - logging.warning("Missing: %s and %s", _ANDROID_SDK_HOME, _ANDROID_HOME) + if not android_home: + logging.warning("Missing ANDROID_HOME: %s", _ANDROID_HOME) # Different environments may have different NDK env vars specified. We look # for these, in this order, and set the others to the first found. # If none are set, we check the default location for the ndk. diff --git a/scripts/gha/integration_testing/gameloop_android/build.gradle b/scripts/gha/integration_testing/gameloop_android/build.gradle index dfcc273d9e..e6b5bb1ca5 100644 --- a/scripts/gha/integration_testing/gameloop_android/build.gradle +++ b/scripts/gha/integration_testing/gameloop_android/build.gradle @@ -6,7 +6,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' + classpath 'com.android.tools.build:gradle:7.4.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong diff --git a/scripts/gha/integration_testing/gameloop_android/gradle/wrapper/gradle-wrapper.properties b/scripts/gha/integration_testing/gameloop_android/gradle/wrapper/gradle-wrapper.properties index 82458a4184..b9c7d0a07e 100644 --- a/scripts/gha/integration_testing/gameloop_android/gradle/wrapper/gradle-wrapper.properties +++ b/scripts/gha/integration_testing/gameloop_android/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-6.7.1-all.zip +distributionUrl=https://services.gradle.org/distributions/gradle-7.5.1-all.zip diff --git a/scripts/gha/ui_testing/uitest_android/app/build.gradle b/scripts/gha/ui_testing/uitest_android/app/build.gradle index 8b765ec0fd..f9a4ee5282 100644 --- a/scripts/gha/ui_testing/uitest_android/app/build.gradle +++ b/scripts/gha/ui_testing/uitest_android/app/build.gradle @@ -17,11 +17,11 @@ apply plugin: 'com.android.application' android { compileSdkVersion 34 ndkPath System.getenv('ANDROID_NDK_HOME') - buildToolsVersion '30.0.2' + buildToolsVersion '32.0.0' defaultConfig { applicationId "com.google.firebase.uitest" - minSdkVersion 23 + minSdkVersion 24 targetSdkVersion 34 versionCode 1 versionName "1.0" diff --git a/scripts/gha/ui_testing/uitest_android/build.gradle b/scripts/gha/ui_testing/uitest_android/build.gradle index 2bd3427703..2de22e71e1 100644 --- a/scripts/gha/ui_testing/uitest_android/build.gradle +++ b/scripts/gha/ui_testing/uitest_android/build.gradle @@ -18,7 +18,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' + classpath 'com.android.tools.build:gradle:7.4.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -33,7 +33,7 @@ allprojects { } ext { - buildToolsVersion = "28.0.3" + buildToolsVersion = "32.0.0" androidxLibVersion = "1.0.0" coreVersion = "1.3.0-alpha04" extJUnitVersion = "1.1.2-alpha04" diff --git a/scripts/gha/ui_testing/uitest_android/gradle/wrapper/gradle-wrapper.properties b/scripts/gha/ui_testing/uitest_android/gradle/wrapper/gradle-wrapper.properties index a802084a46..d95d870842 100644 --- a/scripts/gha/ui_testing/uitest_android/gradle/wrapper/gradle-wrapper.properties +++ b/scripts/gha/ui_testing/uitest_android/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-6.7.1-all.zip +distributionUrl=https://services.gradle.org/distributions/gradle-7.5.1-all.zip diff --git a/storage/build.gradle b/storage/build.gradle index ebc6e14f12..ba1d700c3e 100644 --- a/storage/build.gradle +++ b/storage/build.gradle @@ -18,7 +18,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' + classpath 'com.android.tools.build:gradle:7.4.2' } } allprojects { @@ -33,7 +33,7 @@ apply plugin: 'com.android.library' android { compileSdkVersion 34 ndkPath System.getenv('ANDROID_NDK_HOME') - buildToolsVersion '30.0.2' + buildToolsVersion '32.0.0' sourceSets { main { @@ -48,7 +48,7 @@ android { } defaultConfig { - minSdkVersion 23 + minSdkVersion 24 targetSdkVersion 34 versionCode 1 versionName "1.0" diff --git a/storage/integration_test/build.gradle b/storage/integration_test/build.gradle index 2aa85d28e2..1b2d545f5d 100644 --- a/storage/integration_test/build.gradle +++ b/storage/integration_test/build.gradle @@ -20,8 +20,8 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' - classpath 'com.google.gms:google-services:4.0.1' + classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.google.gms:google-services:4.4.1' } } @@ -37,12 +37,12 @@ apply plugin: 'com.android.application' android { compileOptions { - sourceCompatibility 1.8 - targetCompatibility 1.8 + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 } compileSdkVersion 34 ndkPath System.getenv('ANDROID_NDK_HOME') - buildToolsVersion '30.0.2' + buildToolsVersion '32.0.0' sourceSets { main { @@ -55,7 +55,7 @@ android { defaultConfig { applicationId 'com.google.firebase.cpp.storage.testapp' - minSdkVersion 23 + minSdkVersion 24 targetSdkVersion 34 versionCode 1 versionName '1.0' @@ -76,6 +76,7 @@ android { } packagingOptions { pickFirst 'META-INF/**/coroutines.pro' + pickFirst 'META-INF/third_party.java_src.protobuf.current.java.com.google.protobuf.*.kotlin_module' } } diff --git a/storage/integration_test/gradle/wrapper/gradle-wrapper.properties b/storage/integration_test/gradle/wrapper/gradle-wrapper.properties index 65340c1b59..2eb04a3b17 100644 --- a/storage/integration_test/gradle/wrapper/gradle-wrapper.properties +++ b/storage/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-6.7.1-all.zip +distributionUrl=https://services.gradle.org/distributions/gradle-7.5.1-all.zip diff --git a/storage/storage_resources/build.gradle b/storage/storage_resources/build.gradle index 12282470b4..7e0236b60e 100644 --- a/storage/storage_resources/build.gradle +++ b/storage/storage_resources/build.gradle @@ -18,8 +18,8 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' - classpath 'com.google.gms:google-services:4.2.0' + classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.google.gms:google-services:4.4.1' } } allprojects { @@ -33,10 +33,11 @@ apply plugin: 'com.android.library' android { compileOptions { - sourceCompatibility 1.8 - targetCompatibility 1.8 + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 } compileSdkVersion 34 + buildToolsVersion '32.0.0' sourceSets { main { @@ -49,7 +50,7 @@ android { } dependencies { - implementation platform('com.google.firebase:firebase-bom:33.1.2') + implementation platform('com.google.firebase:firebase-bom:33.2.0') implementation 'com.google.firebase:firebase-analytics' implementation 'com.google.firebase:firebase-storage' } diff --git a/testing/build.gradle b/testing/build.gradle index 40b236689c..06d5e0b58b 100644 --- a/testing/build.gradle +++ b/testing/build.gradle @@ -18,8 +18,8 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' - classpath 'com.google.gms:google-services:4.2.0' + classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.google.gms:google-services:4.4.1' classpath 'com.google.flatbuffers:flatbuffers-java:1.12.0' } } @@ -36,7 +36,7 @@ apply plugin: 'com.android.library' android { compileSdkVersion 34 ndkPath System.getenv('ANDROID_NDK_HOME') - buildToolsVersion '30.0.2' + buildToolsVersion '32.0.0' sourceSets { main { @@ -49,7 +49,7 @@ android { } defaultConfig { - minSdkVersion 23 + minSdkVersion 24 targetSdkVersion 34 versionCode 1 versionName "1.0"