diff --git a/demos/kotlin/kmp_sdk/gradle/libs.versions.toml b/demos/kotlin/kmp_sdk/gradle/libs.versions.toml index e6752bfa..257d8b3f 100644 --- a/demos/kotlin/kmp_sdk/gradle/libs.versions.toml +++ b/demos/kotlin/kmp_sdk/gradle/libs.versions.toml @@ -11,27 +11,27 @@ androidx-lifecycle = "2.9.1" androidx-material = "1.12.0" # https://plugins.gradle.org/plugin/org.jetbrains.compose compose-plugin = "1.7.3" -uiToolingPreview = "1.9.0-alpha02" +uiToolingPreview = "1.11.0-alpha01" junit = "4.13.2" # https://central.sonatype.com/artifact/io.insert-koin/koin-test-junit4/versions koinTestJunit4 = "4.1.0" -kotlin = "2.1.20" +kotlin = "2.3.0" # https://touchlab.co/understanding-and-configuring-your-kmm-test-suite androidx-core-ktx = "1.15.0" espresso = "3.6.1" junitKtx = "1.2.1" # https://github.com/Kotlin/kotlinx.serialization/releases -kotlinx-serialization = "1.8.0" +kotlinx-serialization = "1.10.0" # https://github.com/touchlab/Kermit/releases kermit = "2.0.4" # https://github.com/Kotlin/kotlinx-datetime/releases -kotlinx-datetime = "0.6.0" +kotlinx-datetime = "0.7.1-0.6.x-compat" # https://github.com/Kotlin/kotlinx.coroutines/releases kotlinCoroutines = "1.10.1" # https://github.com/benasher44/uuid/releases/tag/0.8.4 uuid = "0.8.4" # https://ktor.io/changelog/ -ktor = "3.2.0" +ktor = "3.4.0" # https://www.jetbrains.com/help/kotlin-multiplatform-dev/compose-navigation-routing.html navigationCompose = "2.9.0-beta03" lifecycleViewModel = "2.8.7" @@ -40,7 +40,7 @@ koin = "4.1.0-Beta5" koinComposeMultiplatform = "4.1.0-Beta5" # https://github.com/JuulLabs/kable/releases kableCore = "0.34.0" -khronicle = "0.5.1" +khronicle = "0.6.0" # https://mvnrepository.com/artifact/androidx.datastore/datastore-core dataStore = "1.1.4" datastorePreferencesCoreJvm = "1.1.1" @@ -53,7 +53,7 @@ coil3 = "3.0.0-alpha06" # https://developer.android.com/jetpack/androidx/releases/media3 exoplayer = "1.6.0" # https://kotlinlang.org/docs/ksp-quickstart.html -ksp = "2.1.20-1.0.32" +ksp = "2.3.4" # https://developer.android.com/jetpack/androidx/releases/sqlite sqlite = "2.5.0-rc03" # https://developer.android.com/jetpack/androidx/releases/room @@ -62,17 +62,17 @@ coreKtx = "1.6.1" # This was breaking room gradle task on newer versions. # https://mvnrepository.com/artifact/org.videolan.android/libvlc-all vlc = "3.6.1" # https://github.com/Kotlin/dokka/releases/tag/v1.9.20 -dokka = "2.0.0" +dokka = "2.1.0" # https://central.sonatype.com/artifact/org.mockito/mockito-core -mockito = "5.18.0" +mockito = "5.21.0" # https://github.com/jaredsburrows/gradle-license-plugin/releases/tag/0.9.8 license = '0.9.8' # https://github.com/streem/pbandk/releases/tag/v0.16.0 pbandk = "0.16.0" # https://github.com/vanniktech/gradle-maven-publish-plugin/releases/tag/0.30.0 -publish = "0.33.0" +publish = "0.36.0" # https://github.com/cortinico/ktfmt-gradle/releases/ -format = "0.23.0" +format = "0.25.0" # Our SDK version ogpSdk = "0.1.0" diff --git a/demos/kotlin/kmp_sdk/gradle/wrapper/gradle-wrapper.jar b/demos/kotlin/kmp_sdk/gradle/wrapper/gradle-wrapper.jar index 7f93135c..61285a65 100644 Binary files a/demos/kotlin/kmp_sdk/gradle/wrapper/gradle-wrapper.jar and b/demos/kotlin/kmp_sdk/gradle/wrapper/gradle-wrapper.jar differ diff --git a/demos/kotlin/kmp_sdk/gradle/wrapper/gradle-wrapper.properties b/demos/kotlin/kmp_sdk/gradle/wrapper/gradle-wrapper.properties index 5dc9a2f1..54008a18 100644 --- a/demos/kotlin/kmp_sdk/gradle/wrapper/gradle-wrapper.properties +++ b/demos/kotlin/kmp_sdk/gradle/wrapper/gradle-wrapper.properties @@ -1,8 +1,7 @@ -#Thu Nov 21 15:27:47 PST 2024 -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip -networkTimeout=10000 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip +networkTimeout=10000 validateDistributionUrl=true -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/demos/kotlin/kmp_sdk/gradlew b/demos/kotlin/kmp_sdk/gradlew index 1aa94a42..adff685a 100755 --- a/demos/kotlin/kmp_sdk/gradlew +++ b/demos/kotlin/kmp_sdk/gradlew @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright © 2015-2021 the original authors. +# Copyright © 2015 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -55,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/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/. @@ -84,7 +86,7 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # 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 +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -112,7 +114,6 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar # Determine the Java command to use to start the JVM. @@ -170,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" ) @@ -203,15 +203,14 @@ fi DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Collect all arguments for the java command: -# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# * DEFAULT_JVM_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" \ - -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ "$@" # Stop when "xargs" is not available. diff --git a/demos/kotlin/kmp_sdk/gradlew.bat b/demos/kotlin/kmp_sdk/gradlew.bat old mode 100644 new mode 100755 index 6689b85b..e509b2dd --- a/demos/kotlin/kmp_sdk/gradlew.bat +++ b/demos/kotlin/kmp_sdk/gradlew.bat @@ -13,6 +13,8 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem @if "%DEBUG%"=="" @echo off @rem ########################################################################## @@ -43,11 +45,11 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +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 goto fail @@ -57,22 +59,21 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +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 goto fail :execute @rem Setup the command line -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* :end @rem End local scope for the variables with windows NT shell