diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index a7343d9..f3fc0bf 100644 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -93,5 +93,5 @@ dependencies { implementation(libs.androidx.material.icons.extended) testImplementation(libs.junit) - testImplementation("org.json:json:20240303") + testImplementation("org.json:json:20260814") } diff --git a/android/gradle/libs.versions.toml b/android/gradle/libs.versions.toml index f0cac42..ad66bac 100644 --- a/android/gradle/libs.versions.toml +++ b/android/gradle/libs.versions.toml @@ -1,12 +1,12 @@ [versions] -agp = "8.7.0" -kotlin = "2.0.20" -coreKtx = "1.13.1" +agp = "9.4.0" +kotlin = "2.4.20" +coreKtx = "1.19.0" lifecycleRuntimeKtx = "2.8.6" -coreSplashScreen = "1.0.1" +coreSplashScreen = "1.2.0" activityCompose = "1.9.2" -composeBom = "2024.09.02" -coroutines = "1.9.0" +composeBom = "2026.09.00" +coroutines = "1.11.0" junit = "4.13.2" [libraries] diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 4a03230..a9d7cbd 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,8 +1,8 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip networkTimeout=10000 -distributionSha256Sum=31c55713e40233a8303827ceb42ca48a47267a0ad4bab9177123121e71524c26 +distributionSha256Sum=acd53f1edaf02f1a8ff99879f8a34b302661a057d9b063ae9e35b552f804d20a validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/android/gradlew b/android/gradlew index bee9e94..249efbb 100755 --- a/android/gradlew +++ b/android/gradlew @@ -116,16 +116,6 @@ esac -if [ -z "${JAVA_HOME:-}" ] && [ "$darwin" = true ]; then - if [ -d "/opt/homebrew/opt/openjdk@17/libexec/openjdk.jdk/Contents/Home" ]; then - JAVA_HOME="/opt/homebrew/opt/openjdk@17/libexec/openjdk.jdk/Contents/Home" - elif [ -d "/opt/homebrew/Cellar/openjdk@17" ]; then - JAVA_HOME="$(find /opt/homebrew/Cellar/openjdk@17 -maxdepth 4 -name Home -type d 2>/dev/null | head -n 1)" - elif [ -x /usr/libexec/java_home ]; then - JAVA_HOME="$(/usr/libexec/java_home -v 17 2>/dev/null || true)" - fi - export JAVA_HOME -fi # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then