diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b1847fa8..a7fd2abb 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,26 +1,26 @@ [versions] -plugin-android = "8.1.1" -plugin-ktlint = "11.5.1" +plugin-android = "8.2.2" +plugin-ktlint = "12.1.0" plugin-maven = "0.25.3" -plugin-multiplatform-compose = "1.6.0-rc02" +plugin-multiplatform-compose = "1.6.0" plugin-binaryCompatibilityValidator = "0.13.2" plugin-atomicfu = "0.23.1" -coroutines = "1.8.0-RC2" -kotlin = "1.9.21" +coroutines = "1.8.0" +kotlin = "1.9.22" kodein = "7.21.2" -koin = "3.4.3" -koin-compose = "1.0.4" +koin = "3.6.0-wasm-alpha2" +koin-compose = "1.2.0-alpha3" hilt = "2.49" leakCanary = "2.9.1" appCompat = "1.6.1" -lifecycle = "2.6.1" -composeCompiler = "1.5.7" -composeActivity = "1.7.2" -composeAnimation = "1.5.0" -composeMaterial = "1.5.0" -composeRuntime = "1.5.0" -composeUI = "1.5.0" +lifecycle = "2.7.0" +composeCompiler = "1.5.10" +composeActivity = "1.8.2" +composeAnimation = "1.6.3" +composeMaterial = "1.6.3" +composeRuntime = "1.6.3" +composeUI = "1.6.3" rxjava = "3.1.5" junit = "5.10.0" diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7454180f..033e24c4 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 15de9024..a80b22ce 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 1b6c7873..fcb6fca1 100755 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,13 +80,10 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -133,22 +130,29 @@ location of your Java installation." fi else JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -193,6 +197,10 @@ if "$cygwin" || "$msys" ; then done fi + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + # Collect all arguments for the java command; # * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of # shell script including quotes and variable substitutions, so put them in @@ -205,6 +213,12 @@ set -- \ org.gradle.wrapper.GradleWrapperMain \ "$@" +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + # Use "xargs" to parse quoted args. # # With -n1 it outputs one arg per line, with the quotes and backslashes removed. diff --git a/gradlew.bat b/gradlew.bat index 107acd32..93e3f59f 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +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! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +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 diff --git a/samples/android/build.gradle.kts b/samples/android/build.gradle.kts index 3dcaa778..db582ce8 100644 --- a/samples/android/build.gradle.kts +++ b/samples/android/build.gradle.kts @@ -15,6 +15,10 @@ android { defaultConfig { applicationId = "cafe.adriel.voyager.sample" } + lint { + // related to https://github.com/bumptech/glide/issues/4940 + lintConfig = file("${project.projectDir}/../android_leakcanary_lint.xml") + } } kapt { diff --git a/samples/android/src/main/java/cafe/adriel/voyager/sample/tabNavigation/TabNavigationActivity.kt b/samples/android/src/main/java/cafe/adriel/voyager/sample/tabNavigation/TabNavigationActivity.kt index 26e73ad6..97a5bd8b 100644 --- a/samples/android/src/main/java/cafe/adriel/voyager/sample/tabNavigation/TabNavigationActivity.kt +++ b/samples/android/src/main/java/cafe/adriel/voyager/sample/tabNavigation/TabNavigationActivity.kt @@ -3,7 +3,9 @@ package cafe.adriel.voyager.sample.tabNavigation import android.os.Bundle import androidx.activity.ComponentActivity import androidx.activity.compose.setContent +import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.RowScope +import androidx.compose.foundation.layout.padding import androidx.compose.material.BottomNavigation import androidx.compose.material.BottomNavigationItem import androidx.compose.material.Icon @@ -11,6 +13,7 @@ import androidx.compose.material.Scaffold import androidx.compose.material.Text import androidx.compose.material.TopAppBar import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier import cafe.adriel.voyager.navigator.tab.CurrentTab import cafe.adriel.voyager.navigator.tab.LocalTabNavigator import cafe.adriel.voyager.navigator.tab.Tab @@ -47,8 +50,10 @@ class TabNavigationActivity : ComponentActivity() { title = { Text(text = tabNavigator.current.options.title) } ) }, - content = { - CurrentTab() + content = { padding -> + Box(modifier = Modifier.padding(padding)) { + CurrentTab() + } }, bottomBar = { BottomNavigation { diff --git a/samples/android_leakcanary_lint.xml b/samples/android_leakcanary_lint.xml new file mode 100644 index 00000000..60f1d1e4 --- /dev/null +++ b/samples/android_leakcanary_lint.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/samples/multi-module/app/build.gradle.kts b/samples/multi-module/app/build.gradle.kts index 024a52d6..24f312a8 100644 --- a/samples/multi-module/app/build.gradle.kts +++ b/samples/multi-module/app/build.gradle.kts @@ -12,6 +12,10 @@ android { defaultConfig { applicationId = "cafe.adriel.voyager.sample.multimodule" } + lint { + // related to https://github.com/bumptech/glide/issues/4940 + lintConfig = file("${project.projectDir}/../../android_leakcanary_lint.xml") + } } dependencies { diff --git a/samples/multiplatform/src/jsMain/kotlin/main.js.kt b/samples/multiplatform/src/jsMain/kotlin/main.js.kt index e6937dee..bd681dff 100644 --- a/samples/multiplatform/src/jsMain/kotlin/main.js.kt +++ b/samples/multiplatform/src/jsMain/kotlin/main.js.kt @@ -1,10 +1,12 @@ -import androidx.compose.ui.window.Window +import androidx.compose.ui.ExperimentalComposeUiApi +import androidx.compose.ui.window.CanvasBasedWindow import cafe.adriel.voyager.sample.multiplatform.SampleApplication import org.jetbrains.skiko.wasm.onWasmReady +@OptIn(ExperimentalComposeUiApi::class) fun main() { onWasmReady { - Window("Voyager Sample") { + CanvasBasedWindow("Voyager Sample") { SampleApplication() } }