Merge pull request #162 from joreilly/dependency_updates

dependency updates
joreilly · May 20, 2024 · a7e2dcf · a7e2dcf
2 parents af1e4e7 + 54c07c4
commit a7e2dcf
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 15 deletions.
diff --git a/compose-web/build.gradle.kts b/compose-web/build.gradle.kts
@@ -16,6 +16,14 @@ kotlin {
         browser {
             commonWebpackConfig {
                 outputFileName = "StarWars.js"
+
+                devServer = (devServer ?: KotlinWebpackConfig.DevServer()).apply {
+                    static = (static ?: mutableListOf()).apply {
+                        // Serve sources to debug inside browser
+                        add(project.projectDir.path)
+                        add(project.rootDir.path)
+                    }
+                }
             }
         }
 

diff --git a/gradle.properties b/gradle.properties
@@ -12,7 +12,9 @@
 # org.gradle.parallel=true
 #Thu Dec 29 19:55:36 GMT 2022
 kotlin.code.style=official
-xcodeproj=./StarWarsiOS
+
+xcodeproj=./iosApp
+
 kotlin.mpp.stability.nowarn=true
 org.gradle.jvmargs=-Xmx2048M -Dkotlin.daemon.jvm.options\="-Xmx2048M"
 kotlin.mpp.androidSourceSetLayoutVersion=2

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,17 +1,18 @@
 [versions]
-kotlin = "2.0.0-RC2"
-ksp = "2.0.0-RC2-1.0.20"
-coroutines = "1.8.0"
+kotlin = "2.0.0-RC3"
+ksp = "2.0.0-RC3-1.0.20"
+coroutines = "1.8.1"
 androidGradlePlugin = "8.4.0"
-koin = "3.6.0-alpha3"
-koinCompose = "1.2.0-alpha3"
+koin = "3.6.0-Beta4"
+koinCompose = "3.6.0-Beta4"
+koinComposeMultiplatform = "1.2.0-Beta4"
 apollo = "4.0.0-beta.6"
-kmpNativeCoroutines = "1.0.0-ALPHA-28-kotlin-2.0.0-RC2"
+kmpNativeCoroutines = "1.0.0-ALPHA-30-kotlin-2.0.0-RC3"
 
 androidxActivity = "1.9.0"
 androidxComposeBom = "2024.05.00"
 androidx-navigation = "2.8.0-alpha02"
-androidx-lifecycle = "2.8.0-rc01"
+androidx-lifecycle = "2.8.0"
 accompanist = "0.30.1"
 horologist = "0.6.10"
 wearCompose = "1.3.1"
@@ -59,7 +60,7 @@ horologist-compose-layout = { module = "com.google.android.horologist:horologist
 compose-window-size = { module = "dev.chrisbanes.material3:material3-window-size-class-multiplatform", version.ref = "composeWindowSize" }
 
 koin-android = { module = "io.insert-koin:koin-android", version.ref = "koin" }
-koin-compose = { module = "io.insert-koin:koin-compose", version.ref = "koinCompose" }
+koin-compose = { module = "io.insert-koin:koin-compose", version.ref = "koinComposeMultiplatform" }
 koin-core = { module = "io.insert-koin:koin-core", version.ref = "koin" }
 koin-test = { module = "io.insert-koin:koin-test", version.ref = "koin" }
 

diff --git a/iosApp/iosApp.xcodeproj/project.pbxproj b/iosApp/iosApp.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 52;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -566,7 +566,7 @@
 			repositoryURL = "https://github.com/rickclephas/KMP-NativeCoroutines.git";
 			requirement = {
 				kind = exactVersion;
-				version = "1.0.0-ALPHA-10";
+				version = "1.0.0-ALPHA-30";
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */

diff --git a/iosApp/iosApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/iosApp/iosApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,12 +1,13 @@
 {
+  "originHash" : "609133b310e9c4579a1d75e9696445b51bd516493282d44ac82bc290103e37c2",
   "pins" : [
     {
       "identity" : "kmp-nativecoroutines",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/rickclephas/KMP-NativeCoroutines.git",
       "state" : {
-        "revision" : "605d9584033e036c40fd82126a06566bbe1514b0",
-        "version" : "1.0.0-ALPHA-10"
+        "revision" : "caf590ab2d260be1a9810c64cbcd9ed896330167",
+        "version" : "1.0.0-ALPHA-30"
       }
     },
     {
@@ -19,5 +20,5 @@
       }
     }
   ],
-  "version" : 2
+  "version" : 3
 }
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -2,8 +2,8 @@ pluginManagement {
     listOf(repositories, dependencyResolutionManagement.repositories).forEach {
         it.apply {
             google()
-            gradlePluginPortal()
             mavenCentral()
+            gradlePluginPortal()
             maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
             maven("https://androidx.dev/storage/compose-compiler/repository")
         }
@@ -16,6 +16,8 @@ pluginManagement {
         }
     }
 }
+
+
 rootProject.name = "StarWarsKMM"
 
 include(":androidApp", ":shared")