Bump dependencies, koin 4.0-rc1, enable Wasm for koin (#34)

* Bump dependencies, koin 4.0-rc1 * Enable wasm for koin sample and enable in for all targets * Remove gradle-dependency-check plugin
ComposeGears · Jul 29, 2024 · 7a876aa · 7a876aa
1 parent 91a766d
commit 7a876aa
Show file tree

Hide file tree

Showing 14 changed files with 57 additions and 63 deletions.
diff --git a/example/app/composeApp/build.gradle.kts b/example/app/composeApp/build.gradle.kts
@@ -54,12 +54,11 @@ kotlin {
     sourceSets {
         commonMain.dependencies {
             implementation(projects.tiamat)
+            implementation(projects.tiamatKoin)
+            implementation(projects.example.sampleKoin)
             implementation(projects.example.uiCore)
         }
         androidMain.dependencies {
-            implementation(projects.tiamatKoin)
-            implementation(projects.example.sampleKoin)
-
             implementation(libs.androidx.activity.compose)
             implementation(libs.androidx.camera.camera2)
             implementation(libs.androidx.camera.lifecycle)
@@ -68,19 +67,12 @@ kotlin {
             implementation(libs.koin.compose)
         }
         iosMain.dependencies {
-            implementation(projects.tiamatKoin)
             api(projects.example.sampleKoin)
 
             implementation(libs.koin.compose)
-        }
-        wasmJsMain.dependencies {
-
         }
         val desktopMain by getting {
             dependencies {
-                implementation(projects.tiamatKoin)
-                implementation(projects.example.sampleKoin)
-
                 implementation(compose.desktop.currentOs)
                 implementation(libs.koin.compose)
                 implementation(libs.kotlin.coroutines.swing)

diff --git a/...eApp/src/androidMain/kotlin/composegears/tiamat/example/PlatformExamplesScreen.android.kt b/...eApp/src/androidMain/kotlin/composegears/tiamat/example/PlatformExamplesScreen.android.kt
@@ -4,7 +4,6 @@ import composegears.tiamat.example.PlatformConfig.PlatformDestination
 import composegears.tiamat.example.platform.AndroidViewLifecycleScreen
 import composegears.tiamat.example.platform.DeeplinkScreen
 import composegears.tiamat.example.platform.SavedStateScreen
-import composegears.tiamat.sample.koin.KoinIntegrationScreen
 
 actual val platformExamplesConfig = PlatformConfig(
     platformName = "Android",
@@ -21,9 +20,5 @@ actual val platformExamplesConfig = PlatformConfig(
             name = "Deeplink",
             destination = DeeplinkScreen
         ),
-        PlatformDestination(
-            name = "Koin (ViewModel/SharedViewModel)",
-            destination = KoinIntegrationScreen
-        )
     )
 )
diff --git a/example/app/composeApp/src/commonMain/kotlin/composegears/tiamat/example/App.kt b/example/app/composeApp/src/commonMain/kotlin/composegears/tiamat/example/App.kt
@@ -11,6 +11,7 @@ import com.composegears.tiamat.StorageMode
 import com.composegears.tiamat.rememberNavController
 import composegears.tiamat.example.multimodule.MultiModuleRoot
 import composegears.tiamat.example.ui.core.AppTheme
+import composegears.tiamat.sample.koin.KoinIntegrationScreen
 
 @Composable
 @Suppress("SpreadOperator")
@@ -54,6 +55,7 @@ fun App(
                     BackStackAlterationRoot,
                     TwoPaneResizableRoot,
                     PlatformExamplesScreen,
+                    KoinIntegrationScreen,
                     *platformExamplesConfig.destinations()
                 )
             )

diff --git a/example/app/composeApp/src/commonMain/kotlin/composegears/tiamat/example/MainScreen.kt b/example/app/composeApp/src/commonMain/kotlin/composegears/tiamat/example/MainScreen.kt
@@ -15,6 +15,7 @@ import androidx.compose.ui.unit.dp
 import com.composegears.tiamat.navController
 import com.composegears.tiamat.navDestination
 import composegears.tiamat.example.multimodule.MultiModuleRoot
+import composegears.tiamat.sample.koin.KoinIntegrationScreen
 
 val MainScreen by navDestination<Unit> {
     val navController = navController()
@@ -28,6 +29,7 @@ val MainScreen by navDestination<Unit> {
             "Data passing: free args" to { navController.navigate(DataPassingFreeArgsRoot) },
             "Data passing: result" to { navController.navigate(DataPassingResultRoot) },
             "ViewModel/SharedViewModel" to { navController.navigate(ViewModelsRoot) },
+            "Koin (ViewModel/SharedViewModel)" to { navController.navigate(KoinIntegrationScreen) },
             "Custom transition" to { navController.navigate(CustomTransitionRoot) },
             "Multi-module" to { navController.navigate(MultiModuleRoot) },
             "Back stack alteration" to { navController.navigate(BackStackAlterationRoot) },

diff --git a/...eApp/src/desktopMain/kotlin/composegears/tiamat/example/PlatformExamplesScreen.desktop.kt b/...eApp/src/desktopMain/kotlin/composegears/tiamat/example/PlatformExamplesScreen.desktop.kt
@@ -1,14 +1,6 @@
 package composegears.tiamat.example
 
-import composegears.tiamat.example.PlatformConfig.PlatformDestination
-import composegears.tiamat.sample.koin.KoinIntegrationScreen
-
 actual val platformExamplesConfig = PlatformConfig(
     platformName = "Desktop",
-    availableScreens = listOf(
-        PlatformDestination(
-            name = "Koin (ViewModel/SharedViewModel)",
-            destination = KoinIntegrationScreen
-        )
-    )
+    availableScreens = emptyList()
 )
diff --git a/...p/composeApp/src/iosMain/kotlin/composegears/tiamat/example/PlatformExamplesScreen.ios.kt b/...p/composeApp/src/iosMain/kotlin/composegears/tiamat/example/PlatformExamplesScreen.ios.kt
@@ -1,13 +1,6 @@
 package composegears.tiamat.example
 
-import composegears.tiamat.sample.koin.KoinIntegrationScreen
-
 actual val platformExamplesConfig = PlatformConfig(
     platformName = "iOS",
-    availableScreens = listOf(
-        PlatformConfig.PlatformDestination(
-            name = "Koin (ViewModel/SharedViewModel)",
-            destination = KoinIntegrationScreen
-        )
-    )
+    availableScreens = emptyList()
 )
diff --git a/example/app/composeApp/src/wasmJsMain/kotlin/composegears/tiamat/example/main.kt b/example/app/composeApp/src/wasmJsMain/kotlin/composegears/tiamat/example/main.kt
@@ -14,11 +14,13 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.compose.ui.window.CanvasBasedWindow
+import composegears.tiamat.sample.koin.KoinLib
 
 external fun onLoadFinished()
 
 @OptIn(ExperimentalComposeUiApi::class)
 fun main() {
+    KoinLib.start()
     CanvasBasedWindow(canvasElementId = "TiamatTarget") {
         LaunchedEffect(Unit) {
             onLoadFinished()

diff --git a/example/sample-koin/build.gradle.kts b/example/sample-koin/build.gradle.kts
@@ -26,6 +26,12 @@ kotlin {
     iosArm64()
     iosSimulatorArm64()
 
+    @OptIn(ExperimentalWasmDsl::class)
+    wasmJs {
+        binaries.executable()
+        nodejs()
+    }
+
     sourceSets {
         commonMain.dependencies {
             implementation(projects.tiamat)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -5,24 +5,23 @@ android-minSdk = "21"
 android-targetSdk = "34"
 
 detekt = "1.23.6"
-jetbrains-compose = "1.6.10"
+jetbrains-compose = "1.6.11"
 kotlin = "2.0.0"
 
 [libraries]
-androidx-activity-compose = "androidx.activity:activity-compose:1.9.0"
-androidx-camera-camera2 = "androidx.camera:camera-camera2:1.3.3"
-androidx-camera-lifecycle = "androidx.camera:camera-lifecycle:1.3.3"
-androidx-camera-view = "androidx.camera:camera-view:1.3.3"
-androidx-concurrent-futures = "androidx.concurrent:concurrent-futures-ktx:1.1.0"
-androidx-lifecycle-runtime = "androidx.lifecycle:lifecycle-runtime-ktx:2.8.0"
+androidx-activity-compose = "androidx.activity:activity-compose:1.9.1"
+androidx-camera-camera2 = "androidx.camera:camera-camera2:1.3.4"
+androidx-camera-lifecycle = "androidx.camera:camera-lifecycle:1.3.4"
+androidx-camera-view = "androidx.camera:camera-view:1.3.4"
+androidx-concurrent-futures = "androidx.concurrent:concurrent-futures-ktx:1.2.0"
+androidx-lifecycle-runtime = "androidx.lifecycle:lifecycle-runtime-ktx:2.8.4"
 
 detekt-compose = "io.nlopez.compose.rules:detekt:0.4.3"
 detekt-formatting = { module = "io.gitlab.arturbosch.detekt:detekt-formatting", version.ref = "detekt" }
 
-koin-compose = "io.insert-koin:koin-compose:1.1.3"
-koin-core = "io.insert-koin:koin-core:3.5.6"
+koin-compose = "io.insert-koin:koin-compose:4.0.0-RC1"
 
-kotlin-coroutines-swing = "org.jetbrains.kotlinx:kotlinx-coroutines-swing:1.8.0"
+kotlin-coroutines-swing = "org.jetbrains.kotlinx:kotlinx-coroutines-swing:1.8.1"
 kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
 
 [plugins]

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/gradlew b/gradlew
@@ -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/.
@@ -83,7 +85,9 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -144,15 +148,15 @@ 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
+        # shellcheck disable=SC2039,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
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -201,11 +205,11 @@ 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
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_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" \

diff --git a/gradlew.bat b/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,11 +59,11 @@ 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
 

diff --git a/tiamat-koin/build.gradle.kts b/tiamat-koin/build.gradle.kts
@@ -25,11 +25,16 @@ kotlin {
     iosArm64()
     iosSimulatorArm64()
 
+    @OptIn(ExperimentalWasmDsl::class)
+    wasmJs {
+        binaries.executable()
+        nodejs()
+    }
+
     sourceSets {
         commonMain.dependencies {
             implementation(projects.tiamat)
 
-            implementation(libs.koin.core)
             implementation(libs.koin.compose)
 
             implementation(compose.foundation)