Make common project multiplatform

12 files changed, 47 insertions, 15 deletions

diff --git a/settings.gradle b/settings.gradle
index ca9aea78..11445e6c 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,12 +1,12 @@
-//pluginManagement {
-//    resolutionStrategy {
-//        eachPlugin {
-//            if (requested.id.id == "kotlin-multiplatform") {
-//                useModule("org.jetbrains.kotlin:kotlin-gradle-plugin:${requested.version}")
-//            }
-//        }
-//    }
-//}
+pluginManagement {
+    resolutionStrategy {
+        eachPlugin {
+            if (requested.id.id == "kotlin-multiplatform") {
+                useModule("org.jetbrains.kotlin:kotlin-gradle-plugin:${requested.version}")
+            }
+        }
+    }
+}
 
 rootProject.name = "seven-wonders"
 
diff --git a/sw-common-model/build.gradle.kts b/sw-common-model/build.gradle.kts
index 81c58543..c1c6e3fe 100644
--- a/sw-common-model/build.gradle.kts
+++ b/sw-common-model/build.gradle.kts
@@ -1,11 +1,43 @@
 plugins {
-    kotlin("jvm")
+    kotlin("multiplatform")
     id("org.jlleitschuh.gradle.ktlint")
 }
 
-dependencies {
-    implementation(kotlin("stdlib-jdk8"))
-
-    testImplementation(kotlin("test"))
-    testImplementation(kotlin("test-junit"))
+kotlin {
+    jvm()
+    js()
+    sourceSets {
+        val commonMain by getting  {
+            dependencies {
+                implementation(kotlin("stdlib-common"))
+            }
+        }
+        val commonTest by getting {
+            dependencies {
+                implementation(kotlin("test-common"))
+                implementation(kotlin("test-annotations-common"))
+            }
+        }
+        val jvmMain by getting {
+            dependencies {
+                implementation(kotlin("stdlib-jdk8"))
+            }
+        }
+        val jvmTest by getting {
+            dependencies {
+                implementation(kotlin("test"))
+                implementation(kotlin("test-junit"))
+            }
+        }
+        val jsMain by getting {
+            dependencies {
+                implementation(kotlin("stdlib-js"))
+            }
+        }
+        val jsTest by getting {
+            dependencies {
+                implementation(kotlin("test-js"))
+            }
+        }
+    }
 }
diff --git a/sw-common-model/src/main/kotlin/org/luxons/sevenwonders/game/api/CustomizableSettings.kt b/sw-common-model/src/commonMain/kotlin/org/luxons/sevenwonders/game/api/CustomizableSettings.kt
index ac2c2b14..ac2c2b14 100644
--- a/sw-common-model/src/main/kotlin/org/luxons/sevenwonders/game/api/CustomizableSettings.kt
+++ b/sw-common-model/src/commonMain/kotlin/org/luxons/sevenwonders/game/api/CustomizableSettings.kt
diff --git a/sw-common-model/src/main/kotlin/org/luxons/sevenwonders/game/api/Moves.kt b/sw-common-model/src/commonMain/kotlin/org/luxons/sevenwonders/game/api/Moves.kt
index 79a238b0..79a238b0 100644
--- a/sw-common-model/src/main/kotlin/org/luxons/sevenwonders/game/api/Moves.kt
+++ b/sw-common-model/src/commonMain/kotlin/org/luxons/sevenwonders/game/api/Moves.kt
diff --git a/sw-common-model/src/main/kotlin/org/luxons/sevenwonders/game/api/Table.kt b/sw-common-model/src/commonMain/kotlin/org/luxons/sevenwonders/game/api/Table.kt
index 62f66b21..62f66b21 100644
--- a/sw-common-model/src/main/kotlin/org/luxons/sevenwonders/game/api/Table.kt
+++ b/sw-common-model/src/commonMain/kotlin/org/luxons/sevenwonders/game/api/Table.kt
diff --git a/sw-common-model/src/main/kotlin/org/luxons/sevenwonders/game/api/boards/Boards.kt b/sw-common-model/src/commonMain/kotlin/org/luxons/sevenwonders/game/api/boards/Boards.kt
index 061bdcad..061bdcad 100644
--- a/sw-common-model/src/main/kotlin/org/luxons/sevenwonders/game/api/boards/Boards.kt
+++ b/sw-common-model/src/commonMain/kotlin/org/luxons/sevenwonders/game/api/boards/Boards.kt
diff --git a/sw-common-model/src/main/kotlin/org/luxons/sevenwonders/game/api/boards/RelativeBoardPosition.kt b/sw-common-model/src/commonMain/kotlin/org/luxons/sevenwonders/game/api/boards/RelativeBoardPosition.kt
index c7c3b5dc..c7c3b5dc 100644
--- a/sw-common-model/src/main/kotlin/org/luxons/sevenwonders/game/api/boards/RelativeBoardPosition.kt
+++ b/sw-common-model/src/commonMain/kotlin/org/luxons/sevenwonders/game/api/boards/RelativeBoardPosition.kt
diff --git a/sw-common-model/src/main/kotlin/org/luxons/sevenwonders/game/api/cards/Cards.kt b/sw-common-model/src/commonMain/kotlin/org/luxons/sevenwonders/game/api/cards/Cards.kt
index 4ccfe23b..4ccfe23b 100644
--- a/sw-common-model/src/main/kotlin/org/luxons/sevenwonders/game/api/cards/Cards.kt
+++ b/sw-common-model/src/commonMain/kotlin/org/luxons/sevenwonders/game/api/cards/Cards.kt
diff --git a/sw-common-model/src/main/kotlin/org/luxons/sevenwonders/game/api/cards/HandRotationDirection.kt b/sw-common-model/src/commonMain/kotlin/org/luxons/sevenwonders/game/api/cards/HandRotationDirection.kt
index b4669fbb..b4669fbb 100644
--- a/sw-common-model/src/main/kotlin/org/luxons/sevenwonders/game/api/cards/HandRotationDirection.kt
+++ b/sw-common-model/src/commonMain/kotlin/org/luxons/sevenwonders/game/api/cards/HandRotationDirection.kt
diff --git a/sw-common-model/src/main/kotlin/org/luxons/sevenwonders/game/api/resources/Resources.kt b/sw-common-model/src/commonMain/kotlin/org/luxons/sevenwonders/game/api/resources/Resources.kt
index fcfdd634..fcfdd634 100644
--- a/sw-common-model/src/main/kotlin/org/luxons/sevenwonders/game/api/resources/Resources.kt
+++ b/sw-common-model/src/commonMain/kotlin/org/luxons/sevenwonders/game/api/resources/Resources.kt
diff --git a/sw-common-model/src/main/kotlin/org/luxons/sevenwonders/game/api/wonders/Wonders.kt b/sw-common-model/src/commonMain/kotlin/org/luxons/sevenwonders/game/api/wonders/Wonders.kt
index 7148a924..7148a924 100644
--- a/sw-common-model/src/main/kotlin/org/luxons/sevenwonders/game/api/wonders/Wonders.kt
+++ b/sw-common-model/src/commonMain/kotlin/org/luxons/sevenwonders/game/api/wonders/Wonders.kt
diff --git a/sw-common-model/src/test/kotlin/org/luxons/sevenwonders/game/api/WonderSidePickMethodTest.kt b/sw-common-model/src/commonTest/kotlin/org/luxons/sevenwonders/game/api/WonderSidePickMethodTest.kt
index 9757ff86..9757ff86 100644
--- a/sw-common-model/src/test/kotlin/org/luxons/sevenwonders/game/api/WonderSidePickMethodTest.kt
+++ b/sw-common-model/src/commonTest/kotlin/org/luxons/sevenwonders/game/api/WonderSidePickMethodTest.kt