use multiplatform plugin instead of jvm

vivid-money · Feb 10, 2024 · ac22f60 · ac22f60
1 parent fec3f6f
commit ac22f60
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 14 deletions.
diff --git a/build-logic/src/main/kotlin/elmslie.kotlin-multiplatform-lib.gradle.kts b/build-logic/src/main/kotlin/elmslie.kotlin-multiplatform-lib.gradle.kts
@@ -1,22 +1,21 @@
-@file:Suppress("UnstableApiUsage")
-
 plugins {
     kotlin("multiplatform")
-    id("com.android.library")
     id("elmslie.detekt")
 }
 
+java {
+    targetCompatibility = JvmTarget
+    sourceCompatibility = JvmTarget
+}
+
 kotlin {
     applyDefaultHierarchyTemplate()
 
-    androidTarget {
+    jvm {
         compilations.all {
             kotlinOptions {
                 jvmTarget = JvmTarget.toString()
             }
         }
     }
-
-    iosX64()
-    iosArm64()
-}
+}
diff --git a/elmslie-core/build.gradle.kts b/elmslie-core/build.gradle.kts
@@ -1,9 +1,19 @@
 plugins {
-    id("elmslie.kotlin-jvm-lib")
-    id("elmslie.tests-convention")
+    id("elmslie.kotlin-multiplatform-lib")
 }
 
-dependencies {
-    implementation(libs.kotlinx.coroutinesCore)
-    testImplementation(libs.kotlinx.coroutinesTest)
-}
+kotlin {
+    sourceSets {
+        val commonMain by getting {
+            dependencies {
+                implementation(libs.kotlinx.coroutinesCore)
+            }
+        }
+        val commonTest by getting {
+            dependencies {
+                implementation(libs.kotlinx.coroutinesTest)
+                implementation(libs.kotlin.test)
+            }
+        }
+    }
+}