Merge branch 'am-gradle_update' into try-merging-gradle-7-change

firebase · Sep 25, 2024 · 54dea84 · 54dea84
2 parents 74507c5 + 1b4725a
commit 54dea84
Show file tree

Hide file tree

Showing 69 changed files with 327 additions and 236 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -54,10 +54,9 @@ jobs:
       - name: setup Xcode version (macos)
         if: runner.os == 'macOS'
         run: sudo xcode-select -s /Applications/Xcode_${{ env.xcodeVersion }}.app/Contents/Developer
-      - 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: Store git credentials for all git commands
         # Forces all git commands to use authenticated https, to prevent throttling.
         shell: bash

diff --git a/.github/workflows/cpp-packaging.yml b/.github/workflows/cpp-packaging.yml
@@ -248,6 +248,9 @@ jobs:
     strategy:
       fail-fast: false
     steps:
+      - name: Force Java 11
+        shell: bash
+        run: echo "JAVA_HOME=${JAVA_HOME_11_X64}" >> $GITHUB_ENV
       - name: fetch SDK
         uses: actions/checkout@v3
         with:

diff --git 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/CMakeLists.txt b/CMakeLists.txt
@@ -180,6 +180,7 @@ endif()
 # Set directories needed by the Firebase subprojects
 # Directory to store generated files.
 set(FIREBASE_GEN_FILE_DIR ${CMAKE_BINARY_DIR}/generated)
+
 # Directory for any shared scripts.
 set(FIREBASE_SCRIPT_DIR ${CMAKE_CURRENT_LIST_DIR})
 
@@ -227,20 +228,34 @@ set(FIRESTORE_INCLUDE_OBJC OFF CACHE BOOL "Disabled for the CPP SDK")
 set(RE2_BUILD_TESTING OFF CACHE BOOL "")
 
 if(FIREBASE_CPP_USE_PRIOR_GRADLE_BUILD)
-  # Quote meta characters in ${CMAKE_CURRENT_LIST_DIR} so we can
-  # match it in a regex.
-  # For example, '/path/with/+meta/char.acters' will become
-  # '/path/with/\+meta/char\.acters'.
-  string(REGEX REPLACE
-         "([][+.*()^])" "\\\\\\1"  # Yes, this many \'s is correct.
-         current_list_dir_regex
-         "${CMAKE_CURRENT_LIST_DIR}")
-  # Figure out where app's binary_dir was.
-  string(REGEX REPLACE
-    "${current_list_dir_regex}/[^/]+/(.*)"
-    "${CMAKE_CURRENT_LIST_DIR}/app/\\1"
-    APP_BINARY_DIR "${FIREBASE_BINARY_DIR}")
-
+  # Gradle now adds a random hash to each separate NDK cmake build.
+  # Scan the previously built directories to find the one containing app's header.
+  set(header_to_scan_for "generated/app/src/include/firebase/version.h")
+  set(prev_build_path "${CMAKE_BINARY_DIR}/../../../../../app/.cxx/${CMAKE_BUILD_TYPE}/*/${CMAKE_ANDROID_ARCH_ABI}")
+  file(GLOB possible_prev_build_dirs "${prev_build_path}")
+  # In case there are multiple matches, take the one with the newest timestamp.
+  set(newest_timestamp 0)
+  foreach(possible_prev_build_dir IN LISTS possible_prev_build_dirs)
+    message("CONSIDERING ${possible_prev_build_dir}")
+    if(IS_DIRECTORY ${possible_prev_build_dir})
+      if(EXISTS "${possible_prev_build_dir}/${header_to_scan_for}")
+        # Check if it's newer than any other files.
+        message("FOUND ${possible_prev_build_dir}/${header_to_scan_for}")
+        file(TIMESTAMP "${possible_prev_build_dir}/${header_to_scan_for}" timestamp "%s")
+	message("GOT TIMESTAMP: ${timestamp}")
+        if(${timestamp} GREATER ${newest_timestamp})
+          message("USING ${possible_prev_build_dir}")
+          set(APP_BINARY_DIR ${possible_prev_build_dir})
+          set(newest_timestamp ${timestamp})
+        endif()
+      endif()
+    endif()
+  endforeach()
+  if (IS_DIRECTORY "${APP_BINARY_DIR}")
+    message("Found previous Firebase App build in ${APP_BINARY_DIR}")
+  else()
+    message(FATAL_ERROR "Could not find previous Firebase App build under ${prev_build_path}")
+  endif()
   set(FIRESTORE_SOURCE_DIR ${APP_BINARY_DIR}/external/src/firestore)
 else()
   # Run the CMake build logic that will download all the external dependencies.
@@ -579,6 +594,7 @@ if(NOT FIREBASE_CPP_USE_PRIOR_GRADLE_BUILD)
 else()
   # Add firebase_app as a target on the previously built app.
   add_library(firebase_app STATIC IMPORTED GLOBAL)
+
   file(MAKE_DIRECTORY "${APP_BINARY_DIR}/generated")
   file(MAKE_DIRECTORY "${FIREBASE_BINARY_DIR}/generated")
   set(app_include_dirs

diff --git a/analytics/CMakeLists.txt b/analytics/CMakeLists.txt
@@ -16,6 +16,7 @@
 
 # Analytics generates header files for default events, parameters, and
 # properties based on the iOS SDK, that are used across all platforms.
+
 set(analytics_generated_headers_dir
     "${FIREBASE_GEN_FILE_DIR}/analytics/src/include/firebase/analytics")
 set(event_names_header "${analytics_generated_headers_dir}/event_names.h")

diff --git 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"
@@ -85,4 +85,5 @@ apply from: "$rootDir/android_build_files/extract_and_dex.gradle"
 apply from: "$rootDir/android_build_files/generate_proguard.gradle"
 project.afterEvaluate {
   generateProguardFile('analytics')
+  preBuild.dependsOn(':app:build')
 }
diff --git 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
@@ -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
@@ -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
@@ -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,16 @@ 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 24
+    targetSdkVersion 34
+  }
 
   sourceSets {
     main {

diff --git 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
@@ -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,16 @@ 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 24
+    targetSdkVersion 34
+  }
 
   sourceSets {
     main {

diff --git 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
@@ -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
@@ -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,16 @@ 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 24
+    targetSdkVersion 34
+  }
 
   sourceSets {
     main {