Merge pull request #139 from MohamedRejeb/1.x

Apply default hierarchy template
MohamedRejeb · Nov 17, 2023 · 3c0d616 · 3c0d616
2 parents 08392aa + 78e38d8
commit 3c0d616
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 47 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -11,8 +11,8 @@ nexus-publish = "2.0.0-rc-1"
 
 # For sample
 compose-compiler = "1.5.2"
-activity-compose = "1.7.2"
-voyager = "1.0.0-rc06"
+activity-compose = "1.8.1"
+voyager = "1.0.0-rc10"
 richeditor = "1.0.0-beta03"
 android-minSdk = "21"
 android-compileSdk = "34"

diff --git a/richeditor-compose/build.gradle.kts b/richeditor-compose/build.gradle.kts
@@ -6,6 +6,7 @@ plugins {
 }
 
 kotlin {
+    applyDefaultHierarchyTemplate()
     androidTarget {
         publishLibraryVariants("release")
         compilations.all {
@@ -40,35 +41,11 @@ kotlin {
             }
         }
 
-        val androidMain by getting {
-            dependencies {}
-        }
-
-        val androidUnitTest by getting {
+        val commonTest by getting {
             dependencies {
                 implementation(kotlin("test"))
             }
         }
-
-        val desktopMain by getting {
-            dependencies {}
-        }
-
-        val jsMain by getting {
-            dependsOn(commonMain)
-            dependencies {}
-        }
-
-        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 {}
-        }
     }
 }
 

diff --git a/sample/common/build.gradle.kts b/sample/common/build.gradle.kts
@@ -5,6 +5,7 @@ plugins {
 }
 
 kotlin {
+    applyDefaultHierarchyTemplate()
     androidTarget {
         compilations.all {
             kotlinOptions {
@@ -31,12 +32,6 @@ kotlin {
     }
 
     sourceSets {
-        all {
-            languageSettings {
-                optIn("org.jetbrains.compose.resources.ExperimentalResourceApi")
-            }
-        }
-
         val commonMain by getting {
             dependencies {
                 api(compose.runtime)
@@ -61,20 +56,6 @@ kotlin {
                 api("androidx.appcompat:appcompat:1.6.1")
             }
         }
-
-        val desktopMain by getting {}
-
-        val jsMain by getting {}
-
-        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)
-        }
     }
 }