diff --git a/app/build.gradle b/app/build.gradle index 193efb6..5587674 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -36,7 +36,7 @@ dependencies { implementation libs.slice.core implementation libs.slice.view - releaseImplementation platform('com.google.firebase:firebase-bom:32.1.0') + releaseImplementation platform(libs.firebase.bom) releaseImplementation libs.firebase.analytics releaseImplementation libs.firebase.crashlytics releaseImplementation libs.firebase.perf diff --git a/buildSrc/src/main/groovy/compose-conventions.gradle b/buildSrc/src/main/groovy/compose-conventions.gradle index e639144..fb50fc6 100644 --- a/buildSrc/src/main/groovy/compose-conventions.gradle +++ b/buildSrc/src/main/groovy/compose-conventions.gradle @@ -5,7 +5,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion '1.5.2' + kotlinCompilerExtensionVersion '1.5.8' } } \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 975c1a5..50bb060 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,37 +1,39 @@ [versions] -activity = "1.8.0-alpha07" +activity = "1.8.2" appcompat = "1.7.0-alpha03" -coil = "2.4.0" +coil = "2.5.0" firebase-analytics = "21.3.0" +firebase-bom = "32.7.1" firebase-crashlytics-plugin = "2.9.5" firebase-crashlytics = "18.3.7" firebase-perf = "20.3.2" -compose = "1.6.0-alpha04" +compose = "1.6.0-rc01" google-services = "4.3.15" -hilt-android = "2.47" -hilt-work = "1.0.0" -hilt-navigation-compose = "1.1.0-alpha01" -ktor = "2.3.2" +hilt-android = "2.50" +hilt-work = "1.1.0" +hilt-navigation-compose = "1.1.0" +ktor = "2.3.7" kxml2 = "2.3.0" -lifecycle = "2.6.1" -material = "1.10.0-alpha06" -material3 = "1.2.0-alpha06" -mockito-core = "5.4.0" -mockito-kotlin = "5.1.0" -navigation = "2.7.1" -room = "2.6.0-beta01" +lifecycle = "2.7.0" +material = "1.11.0" +material3 = "1.2.0-beta02" +mockito-core = "5.9.0" +mockito-kotlin = "5.2.1" +navigation = "2.7.6" +room = "2.6.1" slice = "1.0.0-alpha08" slice-core = "1.1.0-alpha02" startup = "1.2.0-alpha02" -work = "2.9.0-alpha02" -ksp = "1.9.0-1.0.13" +work = "2.9.0" +ksp = "1.9.22-1.0.17" detekt = "1.23.1" -hilt = "2.46.1" -agp = "8.3.0-alpha01" -kotlin = "1.9.0" +hilt = "2.50" +agp = "8.2.2" +kotlin = "1.9.22" coroutines = "1.7.3" [libraries] +firebase-bom = { module = "com.google.firebase:firebase-bom", version.ref = "firebase-bom" } hilt-android = { module = "com.google.dagger:hilt-android", version.ref = "hilt-android" } hilt-android-testing = { module = "com.google.dagger:hilt-android-testing", version.ref = "hilt-android" } hilt-compiler = { module = "com.google.dagger:hilt-compiler", version.ref = "hilt-android" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index c1962a7..d64cd49 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 a16fbf5..ae57b13 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-rc-2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-rc-1-bin.zip networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index aeb74cb..1aa94a4 100755 --- a/gradlew +++ b/gradlew @@ -83,7 +83,8 @@ done # This is normally unused # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -130,10 +131,13 @@ 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. @@ -141,7 +145,7 @@ 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=SC3045 + # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac @@ -149,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then '' | soft) :;; #( *) # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -198,11 +202,11 @@ fi # 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, 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. +# 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" \