Convert to a multiplatform module

Etch support is only in JVM, but the helper utils are in common
BimmerGestalt · Mar 23, 2024 · 7706011 · 7706011
1 parent 36dd262
commit 7706011
Show file tree

Hide file tree

Showing 27 changed files with 19 additions and 24 deletions.
diff --git a/core/build.gradle b/core/build.gradle
@@ -3,43 +3,40 @@ plugins {
 }
 apply from: '../buildtools/ColoredOutput.gradle'
 apply from: '../buildtools/jacoco.gradle'
-apply plugin: 'java-library'
-apply plugin: 'kotlin'
+apply plugin: 'kotlin-multiplatform'
 apply plugin: 'maven-publish'
 
+kotlin {
+    jvm {
 
-dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"
+    }
+    sourceSets {
+        commonMain {
 
-    implementation project(path: ':etch')
-}
+        }
+        commonTest {
+            dependencies {
+                implementation 'junit:junit:4.12'
+            }
+        }
+        jvmMain {
+            dependencies {
+                implementation project(path: ':etch')
+            }
 
+        }
+    }
+}
 sourceCompatibility = "1.8"
 targetCompatibility = "1.8"
 
-// https://youtrack.jetbrains.com/issue/IDEA-119280
-tasks.register('copyTestResources', Copy) {
-    from "${projectDir}/src/test/resources"
-    into "${buildDir}/classes/test"
-}
-tasks.register('copyTestResourcesOut', Copy) {
-    from "${projectDir}/src/test/resources"
-    into "${buildDir}/../out/test/classes"
-}
-// doesn't seem to actually work, you should run this step manually
-processTestResources.dependsOn copyTestResources
-processTestResources.dependsOn copyTestResourcesOut
-
 publishing {
     publications {
         maven(MavenPublication) {
             // publish to Jitpack
             groupId 'io.bimmergestalt'
             artifactId 'IDriveConnectKit'
             version '0.6'
-
-            from components.java
         }
     }
 }
diff --git a/...ergestalt/idriveconnectkit/CDSProperty.kt → ...ergestalt/idriveconnectkit/CDSProperty.kt b/...ergestalt/idriveconnectkit/CDSProperty.kt → ...ergestalt/idriveconnectkit/CDSProperty.kt
diff --git a/...estalt/idriveconnectkit/RHMIDimensions.kt → ...estalt/idriveconnectkit/RHMIDimensions.kt b/...estalt/idriveconnectkit/RHMIDimensions.kt → ...estalt/idriveconnectkit/RHMIDimensions.kt
diff --git a/...o/bimmergestalt/idriveconnectkit/Utils.kt → ...o/bimmergestalt/idriveconnectkit/Utils.kt b/...o/bimmergestalt/idriveconnectkit/Utils.kt → ...o/bimmergestalt/idriveconnectkit/Utils.kt
diff --git a/...stalt/idriveconnectkit/rhmi/RHMIAction.kt → ...stalt/idriveconnectkit/rhmi/RHMIAction.kt b/...stalt/idriveconnectkit/rhmi/RHMIAction.kt → ...stalt/idriveconnectkit/rhmi/RHMIAction.kt
diff --git a/...iveconnectkit/rhmi/RHMIActionCallbacks.kt → ...iveconnectkit/rhmi/RHMIActionCallbacks.kt b/...iveconnectkit/rhmi/RHMIActionCallbacks.kt → ...iveconnectkit/rhmi/RHMIActionCallbacks.kt
diff --git a/.../idriveconnectkit/rhmi/RHMIApplication.kt → .../idriveconnectkit/rhmi/RHMIApplication.kt b/.../idriveconnectkit/rhmi/RHMIApplication.kt → .../idriveconnectkit/rhmi/RHMIApplication.kt
diff --git a/...onnectkit/rhmi/RHMIApplicationWrappers.kt → ...onnectkit/rhmi/RHMIApplicationWrappers.kt b/...onnectkit/rhmi/RHMIApplicationWrappers.kt → ...onnectkit/rhmi/RHMIApplicationWrappers.kt
diff --git a/...lt/idriveconnectkit/rhmi/RHMIComponent.kt → ...lt/idriveconnectkit/rhmi/RHMIComponent.kt b/...lt/idriveconnectkit/rhmi/RHMIComponent.kt → ...lt/idriveconnectkit/rhmi/RHMIComponent.kt
diff --git a/...estalt/idriveconnectkit/rhmi/RHMIEvent.kt → ...estalt/idriveconnectkit/rhmi/RHMIEvent.kt b/...estalt/idriveconnectkit/rhmi/RHMIEvent.kt → ...estalt/idriveconnectkit/rhmi/RHMIEvent.kt
diff --git a/...riveconnectkit/rhmi/RHMIEventCallbacks.kt → ...riveconnectkit/rhmi/RHMIEventCallbacks.kt b/...riveconnectkit/rhmi/RHMIEventCallbacks.kt → ...riveconnectkit/rhmi/RHMIEventCallbacks.kt
diff --git a/...estalt/idriveconnectkit/rhmi/RHMIModel.kt → ...estalt/idriveconnectkit/rhmi/RHMIModel.kt b/...estalt/idriveconnectkit/rhmi/RHMIModel.kt → ...estalt/idriveconnectkit/rhmi/RHMIModel.kt
diff --git a/...alt/idriveconnectkit/rhmi/RHMIProperty.kt → ...alt/idriveconnectkit/rhmi/RHMIProperty.kt b/...alt/idriveconnectkit/rhmi/RHMIProperty.kt → ...alt/idriveconnectkit/rhmi/RHMIProperty.kt
diff --git a/...estalt/idriveconnectkit/rhmi/RHMIState.kt → ...estalt/idriveconnectkit/rhmi/RHMIState.kt b/...estalt/idriveconnectkit/rhmi/RHMIState.kt → ...estalt/idriveconnectkit/rhmi/RHMIState.kt
diff --git a/...onnectkit/rhmi/mocking/MockApplication.kt → ...onnectkit/rhmi/mocking/MockApplication.kt b/...onnectkit/rhmi/mocking/MockApplication.kt → ...onnectkit/rhmi/mocking/MockApplication.kt
diff --git a/...alt/idriveconnectkit/xmlutils/XMLUtils.kt → ...alt/idriveconnectkit/xmlutils/XMLUtils.kt b/...alt/idriveconnectkit/xmlutils/XMLUtils.kt → ...alt/idriveconnectkit/xmlutils/XMLUtils.kt
diff --git a/...stalt/idriveconnectkit/TestCDSProperty.kt → ...stalt/idriveconnectkit/TestCDSProperty.kt b/...stalt/idriveconnectkit/TestCDSProperty.kt → ...stalt/idriveconnectkit/TestCDSProperty.kt
diff --git a/...t/idriveconnectkit/TestComponentEvents.kt → ...t/idriveconnectkit/TestComponentEvents.kt b/...t/idriveconnectkit/TestComponentEvents.kt → ...t/idriveconnectkit/TestComponentEvents.kt
diff --git a/...t/idriveconnectkit/TestRHMIApplication.kt → ...t/idriveconnectkit/TestRHMIApplication.kt b/...t/idriveconnectkit/TestRHMIApplication.kt → ...t/idriveconnectkit/TestRHMIApplication.kt
diff --git a/...nnectkit/TestRHMIApplicationIdempotent.kt → ...nnectkit/TestRHMIApplicationIdempotent.kt b/...nnectkit/TestRHMIApplicationIdempotent.kt → ...nnectkit/TestRHMIApplicationIdempotent.kt
diff --git a/...ectkit/TestRHMIApplicationSynchronized.kt → ...ectkit/TestRHMIApplicationSynchronized.kt b/...ectkit/TestRHMIApplicationSynchronized.kt → ...ectkit/TestRHMIApplicationSynchronized.kt
diff --git a/...lt/idriveconnectkit/TestRHMIDimensions.kt → ...lt/idriveconnectkit/TestRHMIDimensions.kt b/...lt/idriveconnectkit/TestRHMIDimensions.kt → ...lt/idriveconnectkit/TestRHMIDimensions.kt
diff --git a/...mmergestalt/idriveconnectkit/TestUtils.kt → ...mmergestalt/idriveconnectkit/TestUtils.kt b/...mmergestalt/idriveconnectkit/TestUtils.kt → ...mmergestalt/idriveconnectkit/TestUtils.kt
diff --git a/...estalt/idriveconnectkit/TestXMLParsing.kt → ...estalt/idriveconnectkit/TestXMLParsing.kt b/...estalt/idriveconnectkit/TestXMLParsing.kt → ...estalt/idriveconnectkit/TestXMLParsing.kt
@@ -9,8 +9,6 @@ import org.junit.Assert.*
 import org.junit.Test
 import org.w3c.dom.Node
 import java.lang.IndexOutOfBoundsException
-import kotlin.test.BeforeTest
-import kotlin.test.expect
 
 class TestXMLParsing {
 	val xml = this.javaClass.classLoader.getResourceAsStream("ui_layout.xml")!!.bufferedReader().use {

diff --git a/core/src/test/resources/ui_layout.xml → core/src/commonTest/resources/ui_layout.xml b/core/src/test/resources/ui_layout.xml → core/src/commonTest/resources/ui_layout.xml
diff --git a/...talt/idriveconnectkit/IDriveConnection.kt → ...talt/idriveconnectkit/IDriveConnection.kt b/...talt/idriveconnectkit/IDriveConnection.kt → ...talt/idriveconnectkit/IDriveConnection.kt
diff --git a/.../idriveconnectkit/TestIDriveConnection.kt → .../idriveconnectkit/TestIDriveConnection.kt b/.../idriveconnectkit/TestIDriveConnection.kt → .../idriveconnectkit/TestIDriveConnection.kt