Skip to content

Commit 0b0cee3

Browse files
nbransbynbransby
authored
Merge pull request GitLiveApp#589 from siarhei-luskanau/deps_update
Bumped dependencies and Gradle wrapper
2 parents a331c4c + b5b5e73 commit 0b0cee3

File tree

18 files changed

+160
-126
lines changed

18 files changed

+160
-126
lines changed

‎.github/workflows/pull_request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: run apiCheck
2323
run: ./gradlew apiCheck
2424
jobMatrixSetup:
25-
runs-on: macos-latest
25+
runs-on: ubuntu-latest
2626
outputs:
2727
emulator_jobs_matrix: ${{ steps.dataStep.outputs.emulator_jobs_matrix }}
2828
ios_test_jobs_matrix: ${{ steps.dataStep.outputs.ios_test_jobs_matrix }}

‎firebase-analytics/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ kotlin {
8080
iosX64()
8181
iosSimulatorArm64()
8282
cocoapods {
83-
ios.deploymentTarget = "12.0"
83+
ios.deploymentTarget = libs.versions.ios.deploymentTarget.get()
8484
framework {
8585
baseName = "FirebaseAnalytics"
8686
}

‎firebase-app/build.gradle.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,13 +81,14 @@ kotlin {
8181
iosSimulatorArm64()
8282

8383
cocoapods {
84-
ios.deploymentTarget = "12.0"
84+
ios.deploymentTarget = libs.versions.ios.deploymentTarget.get()
8585
framework {
8686
baseName = "FirebaseApp"
8787
}
8888
noPodspec()
8989
pod("FirebaseCore") {
9090
version = libs.versions.firebase.cocoapods.get()
91+
extraOpts += listOf("-compiler-option", "-fmodules")
9192
}
9293
}
9394
}

‎firebase-auth/build.gradle.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,13 +82,14 @@ kotlin {
8282
iosX64().enableKeychainForTests()
8383
iosSimulatorArm64().enableKeychainForTests()
8484
cocoapods {
85-
ios.deploymentTarget = "12.0"
85+
ios.deploymentTarget = libs.versions.ios.deploymentTarget.get()
8686
framework {
8787
baseName = "FirebaseAuth"
8888
}
8989
noPodspec()
9090
pod("FirebaseAuth") {
9191
version = libs.versions.firebase.cocoapods.get()
92+
extraOpts += listOf("-compiler-option", "-fmodules")
9293
}
9394
}
9495
}

‎firebase-config/build.gradle.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,13 +85,14 @@ kotlin {
8585
iosX64()
8686
iosSimulatorArm64()
8787
cocoapods {
88-
ios.deploymentTarget = "12.0"
88+
ios.deploymentTarget = libs.versions.ios.deploymentTarget.get()
8989
framework {
9090
baseName = "FirebaseConfig"
9191
}
9292
noPodspec()
9393
pod("FirebaseRemoteConfig") {
9494
version = libs.versions.firebase.cocoapods.get()
95+
extraOpts += listOf("-compiler-option", "-fmodules")
9596
}
9697
}
9798
}

‎firebase-crashlytics/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ kotlin {
8181
iosX64()
8282
iosSimulatorArm64()
8383
cocoapods {
84-
ios.deploymentTarget = "12.0"
84+
ios.deploymentTarget = libs.versions.ios.deploymentTarget.get()
8585
framework {
8686
baseName = "FirebaseCrashlytics"
8787
}

‎firebase-database/build.gradle.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,13 +81,14 @@ kotlin {
8181
iosX64()
8282
iosSimulatorArm64()
8383
cocoapods {
84-
ios.deploymentTarget = "12.0"
84+
ios.deploymentTarget = libs.versions.ios.deploymentTarget.get()
8585
framework {
8686
baseName = "FirebaseDatabase"
8787
}
8888
noPodspec()
8989
pod("FirebaseDatabase") {
9090
version = libs.versions.firebase.cocoapods.get()
91+
extraOpts += listOf("-compiler-option", "-fmodules")
9192
}
9293
}
9394
}

‎firebase-firestore/build.gradle.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ kotlin {
8383
iosX64()
8484
iosSimulatorArm64()
8585
cocoapods {
86-
ios.deploymentTarget = "12.0"
86+
ios.deploymentTarget = libs.versions.ios.deploymentTarget.get()
8787
framework {
8888
baseName = "FirebaseFirestore"
8989
}
@@ -92,6 +92,7 @@ kotlin {
9292
// Adding it manually seems to resolve the issue
9393
pod("FirebaseFirestoreInternal") {
9494
version = libs.versions.firebase.cocoapods.get()
95+
extraOpts += listOf("-compiler-option", "-fmodules")
9596
}
9697
pod("FirebaseFirestore") {
9798
version = libs.versions.firebase.cocoapods.get()

‎firebase-functions/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ kotlin {
8080
iosX64()
8181
iosSimulatorArm64()
8282
cocoapods {
83-
ios.deploymentTarget = "12.0"
83+
ios.deploymentTarget = libs.versions.ios.deploymentTarget.get()
8484
framework {
8585
baseName = "FirebaseFunctions"
8686
}

‎firebase-installations/build.gradle.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,13 +80,14 @@ kotlin {
8080
iosX64()
8181
iosSimulatorArm64()
8282
cocoapods {
83-
ios.deploymentTarget = "12.0"
83+
ios.deploymentTarget = libs.versions.ios.deploymentTarget.get()
8484
framework {
8585
baseName = "FirebaseInstallations"
8686
}
8787
noPodspec()
8888
pod("FirebaseInstallations") {
8989
version = libs.versions.firebase.cocoapods.get()
90+
extraOpts += listOf("-compiler-option", "-fmodules")
9091
}
9192
}
9293
}

‎firebase-messaging/build.gradle.kts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,13 +80,14 @@ kotlin {
8080
iosX64()
8181
iosSimulatorArm64()
8282
cocoapods {
83-
ios.deploymentTarget = "12.0"
83+
ios.deploymentTarget = libs.versions.ios.deploymentTarget.get()
8484
framework {
8585
baseName = "FirebaseMessaging"
8686
}
8787
noPodspec()
8888
pod("FirebaseMessaging") {
89-
version = "10.25.0"
89+
version = libs.versions.firebase.cocoapods.get()
90+
extraOpts += listOf("-compiler-option", "-fmodules")
9091
}
9192
}
9293
}

‎firebase-perf/build.gradle.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,13 +81,14 @@ kotlin {
8181
iosX64()
8282
iosSimulatorArm64()
8383
cocoapods {
84-
ios.deploymentTarget = "12.0"
84+
ios.deploymentTarget = libs.versions.ios.deploymentTarget.get()
8585
framework {
8686
baseName = "FirebasePerformance"
8787
}
8888
noPodspec()
8989
pod("FirebasePerformance") {
9090
version = libs.versions.firebase.cocoapods.get()
91+
extraOpts += listOf("-compiler-option", "-fmodules")
9192
}
9293
}
9394
}

‎firebase-storage/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ kotlin {
8080
iosX64()
8181
iosSimulatorArm64()
8282
cocoapods {
83-
ios.deploymentTarget = "12.0"
83+
ios.deploymentTarget = libs.versions.ios.deploymentTarget.get()
8484
framework {
8585
baseName = "FirebaseStorage"
8686
}

‎gradle/libs.versions.toml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,26 @@
11
[versions]
2-
agp = "8.2.2"
3-
androidx-test-core = "1.6.0"
4-
androidx-test-junit = "1.2.0"
5-
androidx-test-runner = "1.6.0"
2+
agp = "8.5.2"
3+
androidx-test-core = "1.6.1"
4+
androidx-test-junit = "1.2.1"
5+
androidx-test-runner = "1.6.2"
66
ben-manes-versions = "0.51.0"
7-
firebase-bom = "33.1.1"
7+
firebase-bom = "33.2.0"
88
gitlive-firebase-java-sdk = "0.4.3"
99
gson = "2.11.0"
1010
junit = "4.13.2"
1111
kotlin = "2.0.0"
12-
kotlinx-coroutines = "1.9.0-RC"
13-
kotlinx-serialization = "1.7.0"
12+
kotlinx-coroutines = "1.9.0-RC.2"
13+
kotlinx-serialization = "1.7.1"
1414
kotlinx-binarycompatibilityvalidator = "0.15.0-Beta.2"
15-
kotlinx-datetime = "0.6.0"
15+
kotlinx-datetime = "0.6.1"
1616
kotlinter = "4.4.0"
1717
settings-api = "2.0"
1818
settings-language = "2.0"
1919
firebase-cocoapods = "10.28.0"
20+
ios-deploymentTarget = "13.0"
2021
test-logger-plugin = "3.2.0"
2122
dokka = "1.9.20"
22-
desugar-libs = "2.0.3"
23+
desugar-libs = "2.1.0"
2324

2425
[libraries]
2526
android-gradle-plugin = { module = "com.android.tools.build:gradle", version.ref = "agp" }

‎gradle/wrapper/gradle-wrapper.jar

-15.6 KB
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
46
zipStoreBase=GRADLE_USER_HOME
57
zipStorePath=wrapper/dists

‎gradlew

Lines changed: 31 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
# See the License for the specific language governing permissions and
1616
# limitations under the License.
1717
#
18+
# SPDX-License-Identifier: Apache-2.0
19+
#
1820

1921
##############################################################################
2022
#
@@ -55,7 +57,7 @@
5557
# Darwin, MinGW, and NonStop.
5658
#
5759
# (3) This script is generated from the Groovy template
58-
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
60+
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
5961
# within the Gradle project.
6062
#
6163
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +82,12 @@ do
8082
esac
8183
done
8284

83-
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
84-
85-
APP_NAME="Gradle"
85+
# This is normally unused
86+
# shellcheck disable=SC2034
8687
APP_BASE_NAME=${0##*/}
87-
88-
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
89-
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
88+
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
89+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
90+
' "$PWD" ) || exit
9091

9192
# Use the maximum available, or set MAX_FD != -1 to use that value.
9293
MAX_FD=maximum
@@ -133,22 +134,29 @@ location of your Java installation."
133134
fi
134135
else
135136
JAVACMD=java
136-
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
137+
if ! command -v java >/dev/null 2>&1
138+
then
139+
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
137140
138141
Please set the JAVA_HOME variable in your environment to match the
139142
location of your Java installation."
143+
fi
140144
fi
141145

142146
# Increase the maximum file descriptors if we can.
143147
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
144148
case $MAX_FD in #(
145149
max*)
150+
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
151+
# shellcheck disable=SC2039,SC3045
146152
MAX_FD=$( ulimit -H -n ) ||
147153
warn "Could not query maximum file descriptor limit"
148154
esac
149155
case $MAX_FD in #(
150156
'' | soft) :;; #(
151157
*)
158+
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
159+
# shellcheck disable=SC2039,SC3045
152160
ulimit -n "$MAX_FD" ||
153161
warn "Could not set maximum file descriptor limit to $MAX_FD"
154162
esac
@@ -193,18 +201,28 @@ if "$cygwin" || "$msys" ; then
193201
done
194202
fi
195203

196-
# Collect all arguments for the java command;
197-
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
198-
# shell script including quotes and variable substitutions, so put them in
199-
# double quotes to make sure that they get re-expanded; and
200-
# * put everything else in single quotes, so that it's not re-expanded.
204+
205+
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
206+
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
207+
208+
# Collect all arguments for the java command:
209+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
210+
# and any embedded shellness will be escaped.
211+
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
212+
# treated as '${Hostname}' itself on the command line.
201213

202214
set -- \
203215
"-Dorg.gradle.appname=$APP_BASE_NAME" \
204216
-classpath "$CLASSPATH" \
205217
org.gradle.wrapper.GradleWrapperMain \
206218
"$@"
207219

220+
# Stop when "xargs" is not available.
221+
if ! command -v xargs >/dev/null 2>&1
222+
then
223+
die "xargs is not available"
224+
fi
225+
208226
# Use "xargs" to parse quoted args.
209227
#
210228
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.

0 commit comments

Comments
 (0)