diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml index 420f84a..cd3b823 100644 --- a/.github/workflows/verify.yml +++ b/.github/workflows/verify.yml @@ -22,7 +22,7 @@ jobs: cache: 'gradle' - name: Setup Gradle - uses: gradle/actions/setup-gradle@v5 + uses: gradle/actions/setup-gradle@v6 - name: Make gradlew executable run: chmod +x ./gradlew diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 3629ac8..a431cce 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -17,7 +17,7 @@ plugins { alias(libs.plugins.androidApplication) alias(libs.plugins.ksp) alias(libs.plugins.roborazzi) - id("org.jetbrains.kotlin.plugin.compose") version "2.3.20" + id("org.jetbrains.kotlin.plugin.compose") version "2.3.21" id("kotlin-parcelize") kotlin("plugin.serialization") id("com.google.dagger.hilt.android") diff --git a/build.gradle.kts b/build.gradle.kts index 9fe3c5f..f258d1c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,6 +8,6 @@ plugins { alias(libs.plugins.androidApplication) apply false alias(libs.plugins.androidLibrary) apply false alias(libs.plugins.ksp) apply false - kotlin("plugin.serialization") version "2.3.20" + kotlin("plugin.serialization") version "2.3.21" id("com.google.dagger.hilt.android") version "2.59.2" apply false } \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c87c770..e28ac19 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,30 +1,30 @@ [versions] -agp = "9.1.0" +agp = "9.2.1" appcompatV7 = "1.7.1" coilCompose = "3.4.0" -foundation = "1.10.5" +foundation = "1.11.1" hiltAndroid = "2.59.2" hiltNavigationCompose = "1.3.0" ink = "1.1.0-alpha02" -kotlin = "2.3.20" +kotlin = "2.3.21" coreKtx = "1.18.0" junit = "4.13.2" junitVersion = "1.3.0" espressoCore = "3.7.0" -kotlinxSerializationJson = "1.10.0" +kotlinxSerializationJson = "1.11.0" lifecycleRuntimeKtx = "2.10.0" activityCompose = "1.13.0" -composeBom = "2026.03.00" +composeBom = "2026.05.00" lifecycleViewmodelCompose = "2.10.0" lifecycleRuntimeCompose = "2.10.0" adaptiveNavigationAndroid = "1.2.0" -navigationRuntimeKtx = "2.9.7" -navigationCompose = "2.9.7" -protobufJavalite = "4.34.0" +navigationRuntimeKtx = "2.9.8" +navigationCompose = "2.9.8" +protobufJavalite = "4.34.1" roomKtx = "2.8.4" roomRuntime = "2.8.4" windowCore = "1.5.1" -ksp = "2.3.6" +ksp = "2.3.7" roomCompiler = "2.8.4" material3AdaptiveNavigationSuiteAndroidVersion = "1.4.0" inputMotionprediction = "1.0.0" @@ -37,7 +37,7 @@ kotlinxCoroutinesTest = "1.10.2" turbine = "1.2.1" material3WindowSizeClass = "1.4.0" robolectric = "4.16.1" -roborazzi = "1.59.0" +roborazzi = "1.60.0" [libraries] androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index d997cfc..b1b8ef5 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 c61a118..b52fb7e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,9 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip networkTimeout=10000 +retries=0 +retryBackOffMs=500 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 739907d..b9bb139 100755 --- a/gradlew +++ b/gradlew @@ -57,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/2d6327017519d23b96af35865dc997fcb544fb40/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/. diff --git a/gradlew.bat b/gradlew.bat index e509b2d..aa5f10b 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -23,8 +23,8 @@ @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,7 +65,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 :execute @rem Setup the command line @@ -73,21 +73,10 @@ goto fail @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* +@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% diff --git a/ink-proto/build.gradle.kts b/ink-proto/build.gradle.kts index b59d90e..b05abf0 100644 --- a/ink-proto/build.gradle.kts +++ b/ink-proto/build.gradle.kts @@ -1,6 +1,6 @@ plugins { id("java-library") - id("com.google.protobuf") version "0.9.6" + id("com.google.protobuf") version "0.10.0" } java { @@ -15,7 +15,7 @@ dependencies { protobuf { protoc { - artifact = "com.google.protobuf:protoc:4.34.0" + artifact = "com.google.protobuf:protoc:4.34.1" } generateProtoTasks {