Merge branch 'release/compose-1.1.0-rc01' into develop

tunjid · Jan 27, 2024 · cee05e1 · cee05e1
2 parents 8b5af0a + a189fde
commit cee05e1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 43 deletions.
diff --git a/library/compose/build.gradle.kts b/library/compose/build.gradle.kts
@@ -37,7 +37,7 @@ kotlin {
     }
 
     sourceSets {
-        val commonMain by getting {
+        commonMain {
             dependencies {
                 implementation(project(":library:tiler"))
                 implementation(libs.kotlinx.coroutines.core)
@@ -47,7 +47,7 @@ kotlin {
                 implementation(libs.jetbrains.compose.foundation.layout)
             }
         }
-        val commonTest by getting {
+        commonTest {
             dependencies {
                 implementation(kotlin("test"))
                 implementation(libs.kotlinx.coroutines.test)

diff --git a/library/tiler/build.gradle.kts b/library/tiler/build.gradle.kts
@@ -34,24 +34,22 @@ kotlin {
             useJUnit()
         }
     }
-    ios()
+    applyDefaultHierarchyTemplate()
     iosSimulatorArm64()
     linuxX64()
     macosX64()
     macosArm64()
     mingwX64()
-    tvos()
     tvosSimulatorArm64()
-    watchos()
     watchosSimulatorArm64()
 
     sourceSets {
-        val commonMain by getting {
+        commonMain {
             dependencies {
                 implementation(libs.kotlinx.coroutines.core)
             }
         }
-        val commonTest by getting {
+        commonTest {
             dependencies {
                 implementation(kotlin("test"))
                 implementation(libs.kotlinx.coroutines.test)
@@ -64,41 +62,6 @@ kotlin {
         val jsMain by getting
         val jsTest by getting
 
-        // Native targets
-        val nativeMain by creating {
-            dependsOn(commonMain)
-        }
-        val iosMain by getting {
-            dependsOn(nativeMain)
-        }
-        val iosSimulatorArm64Main by getting {
-            dependsOn(nativeMain)
-        }
-        val tvosMain by getting {
-            dependsOn(nativeMain)
-        }
-        val tvosSimulatorArm64Main by getting {
-            dependsOn(nativeMain)
-        }
-        val watchosMain by getting {
-            dependsOn(nativeMain)
-        }
-        val watchosSimulatorArm64Main by getting {
-            dependsOn(nativeMain)
-        }
-        val linuxX64Main by getting {
-            dependsOn(nativeMain)
-        }
-        val mingwX64Main by getting {
-            dependsOn(nativeMain)
-        }
-        val macosX64Main by getting {
-            dependsOn(nativeMain)
-        }
-        val macosArm64Main by getting {
-            dependsOn(nativeMain)
-        }
-
         all {
             languageSettings.apply {
                 optIn("kotlinx.coroutines.ExperimentalCoroutinesApi")

diff --git a/libraryVersion.properties b/libraryVersion.properties
@@ -16,4 +16,4 @@
 
 groupId=com.tunjid.tiler
 tiler_version=1.1.0-rc01
-compose_version=1.1.0-beta02
+compose_version=1.1.0-rc01