diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 211f5e1..bf06d0f 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -353,7 +353,7 @@ if (txPullOnBuild) { } dependencies { - implementation(platform("com.google.firebase:firebase-bom:34.17.0")) + implementation(platform("com.google.firebase:firebase-bom:34.19.0")) implementation("com.google.firebase:firebase-crashlytics") implementation("com.google.firebase:firebase-analytics") @@ -390,7 +390,7 @@ dependencies { testImplementation(libs.mockk) testImplementation(libs.kotlinx.coroutines.test) testImplementation(libs.androidx.test.core) - testImplementation("org.json:json:20260719") + testImplementation("org.json:json:20260814") androidTestImplementation(libs.androidx.junit) androidTestImplementation(libs.androidx.espresso.core) androidTestImplementation(platform(libs.androidx.compose.bom)) diff --git a/build.gradle.kts b/build.gradle.kts index 115664b..b42b125 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { val androidGradlePluginVersion = "9.3.1" - val patchedBouncyCastleVersion = "1.85" + val patchedBouncyCastleVersion = "1.86" val patchedNettyVersion = "4.2.16.Final" val bouncyCastleBuildscriptModules = setOf( "bcpkix-jdk18on", @@ -19,7 +19,7 @@ buildscript { classpath("org.bouncycastle:bcprov-jdk18on:$patchedBouncyCastleVersion") classpath("org.bouncycastle:bcutil-jdk18on:$patchedBouncyCastleVersion") classpath("com.google.gms:google-services:4.5.0") - classpath("com.google.firebase:firebase-crashlytics-gradle:3.0.7") + classpath("com.google.firebase:firebase-crashlytics-gradle:3.0.8") components { all { @@ -88,20 +88,20 @@ subprojects { plugins.withId("com.android.application") { dependencies { constraints { - add("implementation", "com.google.protobuf:protobuf-java:4.35.1") - add("implementation", "com.google.protobuf:protobuf-javalite:4.35.1") - add("implementation", "com.google.protobuf:protobuf-kotlin:4.35.1") - add("implementation", "com.google.protobuf:protobuf-kotlin-lite:4.35.1") + add("implementation", "com.google.protobuf:protobuf-java:4.36.2") + add("implementation", "com.google.protobuf:protobuf-javalite:4.36.2") + add("implementation", "com.google.protobuf:protobuf-kotlin:4.36.2") + add("implementation", "com.google.protobuf:protobuf-kotlin-lite:4.36.2") add("implementation", "io.netty:netty-handler:4.2.16.Final") add("implementation", "io.netty:netty-codec-http2:4.2.16.Final") add("implementation", "io.netty:netty-codec-http:4.2.16.Final") add("implementation", "io.netty:netty-codec:4.2.16.Final") add("implementation", "io.netty:netty-common:4.2.16.Final") add("implementation", "org.jdom:jdom2:2.0.6.1") - add("implementation", "org.bitbucket.b_c:jose4j:0.9.6") + add("implementation", "org.bitbucket.b_c:jose4j:0.9.7") add("implementation", "org.apache.commons:commons-lang3:3.20.0") add("implementation", "org.apache.httpcomponents:httpclient:4.5.14") - add("implementation", "com.google.guava:guava:33.6.0-android") + add("implementation", "com.google.guava:guava:33.7.1-android") } } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 19390b1..8c89b2f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -coreKtx = "1.19.0" +coreKtx = "1.19.1" junit = "4.13.2" junitVersion = "1.3.0" espressoCore = "3.7.0" @@ -9,21 +9,21 @@ testCore = "1.7.0" lifecycleRuntimeKtx = "2.11.0" activityCompose = "1.13.0" kotlin = "2.3.21" -composeBom = "2026.08.00" -room = "2.8.4" +composeBom = "2026.09.00" +room = "2.8.5" sqlite = "2.7.0" -sqlcipher = "4.17.0" +sqlcipher = "4.19.0" argon2kt = "1.6.0" tink = "1.23.0" -work = "2.11.2" -ksp = "2.3.11" +work = "2.12.0" +ksp = "2.3.12" biometric = "1.1.0" appcompat = "1.8.0" -playServicesAds = "25.4.0" +playServicesAds = "25.5.0" playServicesCodeScanner = "16.1.0" playIntegrity = "1.6.0" billing = "9.1.0" -bouncycastle = "1.85" +bouncycastle = "1.86" zxing = "3.5.4" securityCrypto = "1.1.0" diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index b1b8ef5..5097068 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 84c5a9c..1eca32e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=84fbba45c7f4c64abc77460e1c00f541e9f960e3c7ed2538f1ede19eacd873ae -distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-bin.zip +distributionSha256Sum=bafd5ce9cfaea0fbccfdc8439a1ac42fbd4cd9c89dc9a988228d8a2639a58e6c +distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.0-bin.zip networkTimeout=10000 retries=0 retryBackOffMs=500 diff --git a/gradlew.bat b/gradlew.bat index 8508ef6..03754c4 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -26,6 +26,33 @@ @rem Set local scope for the variables, and ensure extensions are enabled setlocal EnableExtensions +@rem Catch executions from older scripts and ensure they exit cleanly. +@rem This can be removed once we can be reasonably confident that few people +@rem will be migrating directly to this new wrapper. +goto afterSafetyNet +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +goto exitWithErrorLevel +:afterSafetyNet + set DIRNAME=%~dp0 if "%DIRNAME%"=="" set DIRNAME=. @rem This is normally unused @@ -45,13 +72,14 @@ 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 +1>&2 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. "%COMSPEC%" /c exit 1 +goto exitWithErrorLevel :findJavaFromJavaHome set JAVA_HOME=%JAVA_HOME:"=% @@ -59,13 +87,14 @@ 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 +1>&2 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. "%COMSPEC%" /c exit 1 +goto exitWithErrorLevel :execute @rem Setup the command line @@ -75,8 +104,9 @@ echo location of your Java installation. 1>&2 @rem Execute gradlew @rem endlocal doesn't take effect until after the line is parsed and variables are expanded @rem which allows us to clear the local environment before executing the java command -endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel +endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel & goto exitWithErrorLevel +@rem This label must not be changed. We rely on old scripts being able to jump to this point. :exitWithErrorLevel @rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts "%COMSPEC%" /c exit %ERRORLEVEL%