diff --git a/mecris-go-project/app/build.gradle.kts b/mecris-go-project/app/build.gradle.kts index 26e88004..35c6d89b 100644 --- a/mecris-go-project/app/build.gradle.kts +++ b/mecris-go-project/app/build.gradle.kts @@ -61,31 +61,31 @@ dependencies { debugImplementation(libs.androidx.compose.ui.tooling) debugImplementation(libs.androidx.compose.ui.test.manifest) - testImplementation("io.mockk:mockk:1.13.12") + testImplementation("io.mockk:mockk:1.14.11") // AppAuth for OIDC (Pocket ID) implementation("net.openid:appauth:0.11.1") // Health Connect - implementation("androidx.health.connect:connect-client:1.1.0-alpha12") + implementation("androidx.health.connect:connect-client:1.1.0") // Location - implementation("com.google.android.gms:play-services-location:21.3.0") + implementation("com.google.android.gms:play-services-location:21.4.0") // WorkManager - implementation("androidx.work:work-runtime-ktx:2.9.0") + implementation("androidx.work:work-runtime-ktx:2.11.2") // Credentials (for Passkeys) - implementation("androidx.credentials:credentials:1.2.0-rc01") - implementation("androidx.credentials:credentials-play-services-auth:1.2.0-rc01") + implementation("androidx.credentials:credentials:1.6.0") + implementation("androidx.credentials:credentials-play-services-auth:1.6.0") // Retrofit for Beeminder API - implementation("com.squareup.retrofit2:retrofit:2.9.0") - implementation("com.squareup.retrofit2:converter-gson:2.9.0") + implementation("com.squareup.retrofit2:retrofit:2.12.0") + implementation("com.squareup.retrofit2:converter-gson:2.12.0") // Coroutines - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.11.0") // Google AI Edge SDK for AICore (On-Device Gemini Nano) - implementation("com.google.ai.edge.aicore:aicore:0.0.1-exp01") + implementation("com.google.ai.edge.aicore:aicore:0.0.1-exp02") } \ No newline at end of file diff --git a/mecris-go-project/gradle/libs.versions.toml b/mecris-go-project/gradle/libs.versions.toml index 8ac65a5e..87f6a23f 100644 --- a/mecris-go-project/gradle/libs.versions.toml +++ b/mecris-go-project/gradle/libs.versions.toml @@ -1,13 +1,13 @@ [versions] -agp = "9.1.1" -coreKtx = "1.10.1" +agp = "9.3.1" +coreKtx = "1.19.0" junit = "4.13.2" -junitVersion = "1.1.5" -espressoCore = "3.5.1" -lifecycleRuntimeKtx = "2.6.1" -activityCompose = "1.8.0" -kotlin = "2.2.10" -composeBom = "2024.09.00" +junitVersion = "1.3.0" +espressoCore = "3.7.0" +lifecycleRuntimeKtx = "2.11.0" +activityCompose = "1.13.0" +kotlin = "2.4.10" +composeBom = "2024.12.01" [libraries] androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" } diff --git a/mecris-go-project/gradle/wrapper/gradle-wrapper.jar b/mecris-go-project/gradle/wrapper/gradle-wrapper.jar index 8bdaf60c..b1b8ef56 100644 Binary files a/mecris-go-project/gradle/wrapper/gradle-wrapper.jar and b/mecris-go-project/gradle/wrapper/gradle-wrapper.jar differ diff --git a/mecris-go-project/gradle/wrapper/gradle-wrapper.properties b/mecris-go-project/gradle/wrapper/gradle-wrapper.properties index 17c976c2..dbe66e1d 100644 --- a/mecris-go-project/gradle/wrapper/gradle-wrapper.properties +++ b/mecris-go-project/gradle/wrapper/gradle-wrapper.properties @@ -1,9 +1,10 @@ -#Sat Mar 14 18:04:07 EDT 2026 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=b266d5ff6b90eada6dc3b20cb090e3731302e553a27c5d3e4df1f0d76beaff06 -distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip +distributionSha256Sum=9c0f7faeeb306cb14e4279a3e084ca6b596894089a0638e68a07c945a32c9e14 +distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip networkTimeout=10000 +retries=0 +retryBackOffMs=500 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/mecris-go-project/gradlew b/mecris-go-project/gradlew index ef07e016..249efbb0 100755 --- a/mecris-go-project/gradlew +++ b/mecris-go-project/gradlew @@ -20,7 +20,7 @@ ############################################################################## # -# Gradle start up script for POSIX generated by Gradle. +# gradlew start up script for POSIX generated by Gradle. # # Important for running: # @@ -29,7 +29,7 @@ # bash, then to run this script, type that shell name before the whole # command line, like: # -# ksh Gradle +# ksh gradlew # # Busybox and similar reduced shells will NOT work, because this script # requires all of these POSIX shell features: @@ -57,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/3d91ce3b8caaf77ad09f381f43615b715b53f72c/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/. @@ -114,7 +114,6 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH="\\\"\\\"" # Determine the Java command to use to start the JVM. @@ -172,7 +171,6 @@ fi # For Cygwin or MSYS, switch paths to Windows format before running java if "$cygwin" || "$msys" ; then APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) JAVACMD=$( cygpath --unix "$JAVACMD" ) @@ -212,7 +210,6 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ "$@" diff --git a/mecris-go-project/gradlew.bat b/mecris-go-project/gradlew.bat index 5eed7ee8..8508ef68 100644 --- a/mecris-go-project/gradlew.bat +++ b/mecris-go-project/gradlew.bat @@ -19,12 +19,12 @@ @if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem -@rem Gradle startup script for Windows +@rem gradlew startup script for Windows @rem @rem ########################################################################## -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal +@rem Set local scope for the variables, and ensure extensions are enabled +setlocal EnableExtensions set DIRNAME=%~dp0 if "%DIRNAME%"=="" set DIRNAME=. @@ -51,7 +51,7 @@ 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 +"%COMSPEC%" /c exit 1 :findJavaFromJavaHome set JAVA_HOME=%JAVA_HOME:"=% @@ -65,30 +65,18 @@ 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 +"%COMSPEC%" /c exit 1 :execute @rem Setup the command line -set CLASSPATH= -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* +@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 -: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 +:exitWithErrorLevel +@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts +"%COMSPEC%" /c exit %ERRORLEVEL%