diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 754e1ff2d..9e1b7fd96 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -22,7 +22,7 @@ jobs: - name: run apiCheck run: ./gradlew apiCheck jobMatrixSetup: - runs-on: macos-latest + runs-on: ubuntu-latest outputs: emulator_jobs_matrix: ${{ steps.dataStep.outputs.emulator_jobs_matrix }} ios_test_jobs_matrix: ${{ steps.dataStep.outputs.ios_test_jobs_matrix }} diff --git a/firebase-analytics/build.gradle.kts b/firebase-analytics/build.gradle.kts index e496277d9..c08326622 100644 --- a/firebase-analytics/build.gradle.kts +++ b/firebase-analytics/build.gradle.kts @@ -80,7 +80,7 @@ kotlin { iosX64() iosSimulatorArm64() cocoapods { - ios.deploymentTarget = "12.0" + ios.deploymentTarget = libs.versions.ios.deploymentTarget.get() framework { baseName = "FirebaseAnalytics" } diff --git a/firebase-app/build.gradle.kts b/firebase-app/build.gradle.kts index 48ad17696..3fd1f228e 100644 --- a/firebase-app/build.gradle.kts +++ b/firebase-app/build.gradle.kts @@ -81,13 +81,14 @@ kotlin { iosSimulatorArm64() cocoapods { - ios.deploymentTarget = "12.0" + ios.deploymentTarget = libs.versions.ios.deploymentTarget.get() framework { baseName = "FirebaseApp" } noPodspec() pod("FirebaseCore") { version = libs.versions.firebase.cocoapods.get() + extraOpts += listOf("-compiler-option", "-fmodules") } } } diff --git a/firebase-auth/build.gradle.kts b/firebase-auth/build.gradle.kts index a528f3302..71b469696 100644 --- a/firebase-auth/build.gradle.kts +++ b/firebase-auth/build.gradle.kts @@ -82,13 +82,14 @@ kotlin { iosX64().enableKeychainForTests() iosSimulatorArm64().enableKeychainForTests() cocoapods { - ios.deploymentTarget = "12.0" + ios.deploymentTarget = libs.versions.ios.deploymentTarget.get() framework { baseName = "FirebaseAuth" } noPodspec() pod("FirebaseAuth") { version = libs.versions.firebase.cocoapods.get() + extraOpts += listOf("-compiler-option", "-fmodules") } } } diff --git a/firebase-config/build.gradle.kts b/firebase-config/build.gradle.kts index 51874a16d..09f84c3c0 100644 --- a/firebase-config/build.gradle.kts +++ b/firebase-config/build.gradle.kts @@ -85,13 +85,14 @@ kotlin { iosX64() iosSimulatorArm64() cocoapods { - ios.deploymentTarget = "12.0" + ios.deploymentTarget = libs.versions.ios.deploymentTarget.get() framework { baseName = "FirebaseConfig" } noPodspec() pod("FirebaseRemoteConfig") { version = libs.versions.firebase.cocoapods.get() + extraOpts += listOf("-compiler-option", "-fmodules") } } } diff --git a/firebase-crashlytics/build.gradle.kts b/firebase-crashlytics/build.gradle.kts index 4312f5a28..d35821e1e 100644 --- a/firebase-crashlytics/build.gradle.kts +++ b/firebase-crashlytics/build.gradle.kts @@ -81,7 +81,7 @@ kotlin { iosX64() iosSimulatorArm64() cocoapods { - ios.deploymentTarget = "12.0" + ios.deploymentTarget = libs.versions.ios.deploymentTarget.get() framework { baseName = "FirebaseCrashlytics" } diff --git a/firebase-database/build.gradle.kts b/firebase-database/build.gradle.kts index 76f9c916e..664d7e873 100644 --- a/firebase-database/build.gradle.kts +++ b/firebase-database/build.gradle.kts @@ -81,13 +81,14 @@ kotlin { iosX64() iosSimulatorArm64() cocoapods { - ios.deploymentTarget = "12.0" + ios.deploymentTarget = libs.versions.ios.deploymentTarget.get() framework { baseName = "FirebaseDatabase" } noPodspec() pod("FirebaseDatabase") { version = libs.versions.firebase.cocoapods.get() + extraOpts += listOf("-compiler-option", "-fmodules") } } } diff --git a/firebase-firestore/build.gradle.kts b/firebase-firestore/build.gradle.kts index 3cf3d1c71..3cdbeb172 100644 --- a/firebase-firestore/build.gradle.kts +++ b/firebase-firestore/build.gradle.kts @@ -83,7 +83,7 @@ kotlin { iosX64() iosSimulatorArm64() cocoapods { - ios.deploymentTarget = "12.0" + ios.deploymentTarget = libs.versions.ios.deploymentTarget.get() framework { baseName = "FirebaseFirestore" } @@ -92,6 +92,7 @@ kotlin { // Adding it manually seems to resolve the issue pod("FirebaseFirestoreInternal") { version = libs.versions.firebase.cocoapods.get() + extraOpts += listOf("-compiler-option", "-fmodules") } pod("FirebaseFirestore") { version = libs.versions.firebase.cocoapods.get() diff --git a/firebase-functions/build.gradle.kts b/firebase-functions/build.gradle.kts index c096f47e5..6ea08f49a 100644 --- a/firebase-functions/build.gradle.kts +++ b/firebase-functions/build.gradle.kts @@ -80,7 +80,7 @@ kotlin { iosX64() iosSimulatorArm64() cocoapods { - ios.deploymentTarget = "12.0" + ios.deploymentTarget = libs.versions.ios.deploymentTarget.get() framework { baseName = "FirebaseFunctions" } diff --git a/firebase-installations/build.gradle.kts b/firebase-installations/build.gradle.kts index 8c0e125d8..afa349258 100644 --- a/firebase-installations/build.gradle.kts +++ b/firebase-installations/build.gradle.kts @@ -80,13 +80,14 @@ kotlin { iosX64() iosSimulatorArm64() cocoapods { - ios.deploymentTarget = "12.0" + ios.deploymentTarget = libs.versions.ios.deploymentTarget.get() framework { baseName = "FirebaseInstallations" } noPodspec() pod("FirebaseInstallations") { version = libs.versions.firebase.cocoapods.get() + extraOpts += listOf("-compiler-option", "-fmodules") } } } diff --git a/firebase-messaging/build.gradle.kts b/firebase-messaging/build.gradle.kts index 6ede39801..b12e350bf 100644 --- a/firebase-messaging/build.gradle.kts +++ b/firebase-messaging/build.gradle.kts @@ -80,13 +80,14 @@ kotlin { iosX64() iosSimulatorArm64() cocoapods { - ios.deploymentTarget = "12.0" + ios.deploymentTarget = libs.versions.ios.deploymentTarget.get() framework { baseName = "FirebaseMessaging" } noPodspec() pod("FirebaseMessaging") { - version = "10.25.0" + version = libs.versions.firebase.cocoapods.get() + extraOpts += listOf("-compiler-option", "-fmodules") } } } diff --git a/firebase-perf/build.gradle.kts b/firebase-perf/build.gradle.kts index 3a4356d8c..c5856d202 100644 --- a/firebase-perf/build.gradle.kts +++ b/firebase-perf/build.gradle.kts @@ -81,13 +81,14 @@ kotlin { iosX64() iosSimulatorArm64() cocoapods { - ios.deploymentTarget = "12.0" + ios.deploymentTarget = libs.versions.ios.deploymentTarget.get() framework { baseName = "FirebasePerformance" } noPodspec() pod("FirebasePerformance") { version = libs.versions.firebase.cocoapods.get() + extraOpts += listOf("-compiler-option", "-fmodules") } } } diff --git a/firebase-storage/build.gradle.kts b/firebase-storage/build.gradle.kts index 76ac9a7cc..fbe0ccdac 100644 --- a/firebase-storage/build.gradle.kts +++ b/firebase-storage/build.gradle.kts @@ -80,7 +80,7 @@ kotlin { iosX64() iosSimulatorArm64() cocoapods { - ios.deploymentTarget = "12.0" + ios.deploymentTarget = libs.versions.ios.deploymentTarget.get() framework { baseName = "FirebaseStorage" } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a50f9598a..58844b470 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,25 +1,26 @@ [versions] -agp = "8.2.2" -androidx-test-core = "1.6.0" -androidx-test-junit = "1.2.0" -androidx-test-runner = "1.6.0" +agp = "8.5.2" +androidx-test-core = "1.6.1" +androidx-test-junit = "1.2.1" +androidx-test-runner = "1.6.2" ben-manes-versions = "0.51.0" -firebase-bom = "33.1.1" +firebase-bom = "33.2.0" gitlive-firebase-java-sdk = "0.4.3" gson = "2.11.0" junit = "4.13.2" kotlin = "2.0.0" -kotlinx-coroutines = "1.9.0-RC" -kotlinx-serialization = "1.7.0" +kotlinx-coroutines = "1.9.0-RC.2" +kotlinx-serialization = "1.7.1" kotlinx-binarycompatibilityvalidator = "0.15.0-Beta.2" -kotlinx-datetime = "0.6.0" +kotlinx-datetime = "0.6.1" kotlinter = "4.4.0" settings-api = "2.0" settings-language = "2.0" firebase-cocoapods = "10.28.0" +ios-deploymentTarget = "13.0" test-logger-plugin = "3.2.0" dokka = "1.9.20" -desugar-libs = "2.0.3" +desugar-libs = "2.1.0" [libraries] android-gradle-plugin = { module = "com.android.tools.build:gradle", version.ref = "agp" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7454180f2..a4b76b953 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0d1842103..9355b4155 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 1b6c78733..f5feea6d6 100755 --- a/gradlew +++ b/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -55,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,13 +82,12 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -133,22 +134,29 @@ location of your Java installation." fi else JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -193,11 +201,15 @@ if "$cygwin" || "$msys" ; then done fi -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ @@ -205,6 +217,12 @@ set -- \ org.gradle.wrapper.GradleWrapperMain \ "$@" +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + # Use "xargs" to parse quoted args. # # With -n1 it outputs one arg per line, with the quotes and backslashes removed. diff --git a/gradlew.bat b/gradlew.bat index 107acd32c..9b42019c7 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,89 +1,94 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega