update dependencies

DatL4g · Nov 8, 2023 · a46fefb · a46fefb
1 parent c9119b5
commit a46fefb
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 52 deletions.
diff --git a/app/shared/build.gradle.kts b/app/shared/build.gradle.kts
@@ -32,6 +32,8 @@ kotlin {
         }
     }
 
+    applyDefaultHierarchyTemplate()
+
     sourceSets {
         val commonMain by getting {
             dependencies {
@@ -71,7 +73,6 @@ kotlin {
             }
         }
         val androidMain by getting {
-            dependsOn(commonMain)
             apply(plugin = "kotlin-parcelize")
 
             dependencies {
@@ -87,8 +88,6 @@ kotlin {
             }
         }
         val desktopMain by getting {
-            dependsOn(commonMain)
-
             dependencies {
                 api(compose.desktop.currentOs)
                 api(libs.coroutines.swing)
@@ -97,19 +96,6 @@ kotlin {
                 api(libs.ktor.jvm)
             }
         }
-        val iosX64Main by getting
-        val iosArm64Main by getting
-        val iosSimulatorArm64Main by getting
-        val iosMain by creating {
-            dependsOn(commonMain)
-            iosX64Main.dependsOn(this)
-            iosArm64Main.dependsOn(this)
-            iosSimulatorArm64Main.dependsOn(this)
-
-            dependencies {
-                api(libs.ktor.apple)
-            }
-        }
     }
 }
 

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,9 +1,9 @@
 [versions]
 app = "5.0.0"
-aboutlibraries = "10.9.1"
+aboutlibraries = "10.9.2"
 accompanist = "0.32.0"
 activity = "1.8.0"
-android = "8.1.2"
+android = "8.1.3"
 android-core = "1.12.0"
 appcompat = "1.6.1"
 compose = "1.5.10"
@@ -14,12 +14,12 @@ decompose = "2.1.3-compose-experimental"
 flowredux = "1.2.0"
 grpc = "1.59.0"
 instesx = "0.1.0-alpha10"
-kamel = "0.8.2"
+kamel = "0.8.3"
 kodein = "7.20.2"
 kotlin = "1.9.20"
-ksp = "1.9.20-1.0.13"
-ktor = "2.3.5"
-ktorfit = "1.9.1"
+ksp = "1.9.20-1.0.14"
+ktor = "2.3.6"
+ktorfit = "1.10.0"
 ktsoup = "0.3.0"
 material = "1.10.0"
 moko-resources = "0.23.0"

diff --git a/model/build.gradle.kts b/model/build.gradle.kts
@@ -15,6 +15,8 @@ kotlin {
     iosArm64()
     iosSimulatorArm64()
 
+    applyDefaultHierarchyTemplate()
+
     sourceSets {
         val commonMain by getting {
             dependencies {
@@ -24,24 +26,10 @@ kotlin {
             }
         }
 
-        val jvmMain by getting {
-            dependsOn(commonMain)
-        }
-
         val androidMain by getting {
-            dependsOn(jvmMain)
+            dependsOn(jvmMain.get())
             apply(plugin = "kotlin-parcelize")
         }
-
-        val iosX64Main by getting
-        val iosArm64Main by getting
-        val iosSimulatorArm64Main by getting
-        val iosMain by creating {
-            dependsOn(commonMain)
-            iosX64Main.dependsOn(this)
-            iosArm64Main.dependsOn(this)
-            iosSimulatorArm64Main.dependsOn(this)
-        }
     }
 }
 

diff --git a/network/build.gradle.kts b/network/build.gradle.kts
@@ -17,6 +17,8 @@ kotlin {
     iosArm64()
     iosSimulatorArm64()
 
+    applyDefaultHierarchyTemplate()
+
     sourceSets {
         val commonMain by getting {
             dependencies {
@@ -32,22 +34,8 @@ kotlin {
             }
         }
 
-        val jvmMain by getting {
-            dependsOn(commonMain)
-        }
-
         val androidMain by getting {
-            dependsOn(jvmMain)
-        }
-
-        val iosX64Main by getting
-        val iosArm64Main by getting
-        val iosSimulatorArm64Main by getting
-        val iosMain by creating {
-            dependsOn(commonMain)
-            iosX64Main.dependsOn(this)
-            iosArm64Main.dependsOn(this)
-            iosSimulatorArm64Main.dependsOn(this)
+            dependsOn(jvmMain.get())
         }
     }
 }