fix build

Tlaster · Nov 2, 2023 · 4caeba3 · 4caeba3
1 parent a650b69
commit 4caeba3
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 45 deletions.
diff --git a/precompose-koin/build.gradle.kts b/precompose-koin/build.gradle.kts
@@ -12,7 +12,8 @@ group = "moe.tlaster"
 version = rootProject.extra.get("precomposeVersion") as String
 
 kotlin {
-    targetHierarchy.default {
+
+    applyDefaultHierarchyTemplate {
         common {
             group("jvmAndroid") {
                 withAndroidTarget()

diff --git a/precompose-molecule/build.gradle.kts b/precompose-molecule/build.gradle.kts
@@ -12,6 +12,7 @@ group = "moe.tlaster"
 version = rootProject.extra.get("precomposeVersion") as String
 
 kotlin {
+    applyDefaultHierarchyTemplate()
     androidTarget {
         publishLibraryVariants("release", "debug")
     }
@@ -82,33 +83,18 @@ kotlin {
                 implementation(kotlin("test-js"))
             }
         }
-        val macosMain by creating {
+        val macosMain by getting {
             dependsOn(commonMain)
             dependencies {
                 implementation(compose.foundation)
             }
         }
-        val macosX64Main by getting {
-            dependsOn(macosMain)
-        }
-        val macosArm64Main by getting {
-            dependsOn(macosMain)
-        }
-        val iosMain by creating {
+        val iosMain by getting {
             dependsOn(commonMain)
             dependencies {
                 implementation(compose.foundation)
             }
         }
-        val iosX64Main by getting {
-            dependsOn(iosMain)
-        }
-        val iosArm64Main by getting {
-            dependsOn(iosMain)
-        }
-        val iosSimulatorArm64Main by getting {
-            dependsOn(iosMain)
-        }
     }
 }
 

diff --git a/precompose-viewmodel/build.gradle.kts b/precompose-viewmodel/build.gradle.kts
@@ -12,7 +12,7 @@ group = "moe.tlaster"
 version = rootProject.extra.get("precomposeVersion") as String
 
 kotlin {
-    targetHierarchy.default {
+    applyDefaultHierarchyTemplate {
         common {
             group("jvmAndroid") {
                 withAndroidTarget()

diff --git a/precompose/build.gradle.kts b/precompose/build.gradle.kts
@@ -12,7 +12,7 @@ group = "moe.tlaster"
 version = rootProject.extra.get("precomposeVersion") as String
 
 kotlin {
-    targetHierarchy.default()
+    applyDefaultHierarchyTemplate()
     macosArm64()
     macosX64()
     iosX64()

diff --git a/sample/molecule/build.gradle.kts b/sample/molecule/build.gradle.kts
@@ -136,19 +136,19 @@ compose {
             }
         }
     }
-    experimental {
-        uikit {
-            application {
-                bundleIdPrefix = "moe.tlaster.precompose.sample.molecule"
-                projectName = "PreComposeMoleculeSample"
-                deployConfigurations {
-                    simulator("Simulator") {
-                        device = org.jetbrains.compose.experimental.dsl.IOSDevices.IPHONE_13_MINI
-                    }
-                }
-            }
-        }
-    }
+    // experimental {
+    //     uikit {
+    //         application {
+    //             bundleIdPrefix = "moe.tlaster.precompose.sample.molecule"
+    //             projectName = "PreComposeMoleculeSample"
+    //             deployConfigurations {
+    //                 simulator("Simulator") {
+    //                     device = org.jetbrains.compose.experimental.dsl.IOSDevices.IPHONE_13_MINI
+    //                 }
+    //             }
+    //         }
+    //     }
+    // }
 }
 
 android {

diff --git a/sample/todo/ios/build.gradle.kts b/sample/todo/ios/build.gradle.kts
@@ -1,4 +1,4 @@
-import org.jetbrains.compose.compose
+
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
@@ -38,17 +38,17 @@ kotlin {
     }
 }
 
-compose.experimental {
-    uikit.application {
-        bundleIdPrefix = "moe.tlaster"
-        projectName = "PreComposeSample"
-        deployConfigurations {
-            simulator("Simulator") {
-                device = org.jetbrains.compose.experimental.dsl.IOSDevices.IPHONE_13_MINI
-            }
-        }
-    }
-}
+// compose.experimental {
+//     uikit.application {
+//         bundleIdPrefix = "moe.tlaster"
+//         projectName = "PreComposeSample"
+//         deployConfigurations {
+//             simulator("Simulator") {
+//                 device = org.jetbrains.compose.experimental.dsl.IOSDevices.IPHONE_13_MINI
+//             }
+//         }
+//     }
+// }
 
 tasks.withType<KotlinCompile> {
     kotlinOptions.jvmTarget = rootProject.extra.get("jvmTarget") as String