root: transform everything into kotlin multiplatform

Com6235 · Jul 8, 2024 · b966acf · b966acf
1 parent 7a1c8a8
commit b966acf
Show file tree

Hide file tree

Showing 19 changed files with 33 additions and 26 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -2,7 +2,7 @@ import org.jlleitschuh.gradle.ktlint.reporter.ReporterType
 import java.net.URI
 
 plugins {
-    kotlin("jvm") version "2.0.0"
+    kotlin("multiplatform") version "2.0.0"
     id("org.jetbrains.dokka") version "1.9.20"
     idea
     `maven-publish`
@@ -21,7 +21,7 @@ idea {
 }
 
 allprojects {
-    apply(plugin = "org.jetbrains.kotlin.jvm")
+    apply(plugin = "org.jetbrains.kotlin.multiplatform")
     apply(plugin = "org.jetbrains.dokka")
     apply(plugin = "idea")
     apply(plugin = "maven-publish")
@@ -32,16 +32,18 @@ allprojects {
         mavenCentral()
     }
 
-    dependencies {
-        testImplementation(kotlin("test"))
-    }
-
     tasks.withType<Test>().configureEach {
         useJUnitPlatform()
     }
 
     kotlin {
+        jvm()
         jvmToolchain(17)
+        sourceSets {
+            commonTest.dependencies {
+                implementation(kotlin("test"))
+            }
+        }
     }
 
     ktlint {
@@ -65,12 +67,6 @@ allprojects {
         archiveClassifier.set("javadoc")
     }
 
-    tasks.register<Jar>("sourcesJar") {
-        group = "jar"
-        from(sourceSets.main.get().allSource)
-        archiveClassifier.set("sources")
-    }
-
     configurations {
         create("javadoc")
         create("sources")
@@ -102,6 +98,8 @@ allprojects {
 }
 
 subprojects {
+    if (project.name in listOf("jvm", "kotlinMultiplatform")) return@subprojects
+
     val jdFile = layout.buildDirectory.file("libs/$name-$version-javadoc.jar")
     val jdArtifact = artifacts.add("javadoc", jdFile.get().asFile) {
         type = "jar"
@@ -158,7 +156,7 @@ subprojects {
     }
 }
 
-tasks.jar {
+tasks.named("jvmJar") {
     enabled = false
 }
 

diff --git a/configurator/build.gradle.kts b/configurator/build.gradle.kts
@@ -7,11 +7,16 @@ plugins {
 
 val serializationVersion = "1.6.3"
 
-dependencies {
-    api("org.jetbrains.kotlinx:kotlinx-serialization-json:$serializationVersion")
-    api("org.jetbrains.kotlinx:kotlinx-serialization-hocon:$serializationVersion")
-    api("org.jetbrains.kotlinx:kotlinx-serialization-properties:$serializationVersion")
-    api("com.charleskorn.kaml:kaml:0.59.0")
-    api("net.peanuuutz.tomlkt:tomlkt:0.3.7")
-    api("net.benwoodworth.knbt:knbt:0.11.5")
+kotlin {
+    jvm()
+    sourceSets {
+        commonMain.dependencies {
+            api("org.jetbrains.kotlinx:kotlinx-serialization-json:$serializationVersion")
+            api("org.jetbrains.kotlinx:kotlinx-serialization-hocon:$serializationVersion")
+            api("org.jetbrains.kotlinx:kotlinx-serialization-properties:$serializationVersion")
+            api("com.charleskorn.kaml:kaml:0.59.0")
+            api("net.peanuuutz.tomlkt:tomlkt:0.3.7")
+            api("net.benwoodworth.knbt:knbt:0.11.5")
+        }
+    }
 }
diff --git a/configurator/src/main/kotlin/ConfigLoader.kt → ...tor/src/commonMain/kotlin/ConfigLoader.kt b/configurator/src/main/kotlin/ConfigLoader.kt → ...tor/src/commonMain/kotlin/ConfigLoader.kt
diff --git a/configurator/src/main/kotlin/Loaders.kt → ...igurator/src/commonMain/kotlin/Loaders.kt b/configurator/src/main/kotlin/Loaders.kt → ...igurator/src/commonMain/kotlin/Loaders.kt
diff --git a/configurator/src/main/kotlin/Others.kt → configurator/src/commonMain/kotlin/Others.kt b/configurator/src/main/kotlin/Others.kt → configurator/src/commonMain/kotlin/Others.kt
diff --git a/configurator/src/test/kotlin/ConfigTest.kt → ...rator/src/commonTest/kotlin/ConfigTest.kt b/configurator/src/test/kotlin/ConfigTest.kt → ...rator/src/commonTest/kotlin/ConfigTest.kt
diff --git a/configurator/src/test/resources/hocon.conf → ...rator/src/commonTest/resources/hocon.conf b/configurator/src/test/resources/hocon.conf → ...rator/src/commonTest/resources/hocon.conf
diff --git a/configurator/src/test/resources/json.json → ...urator/src/commonTest/resources/json.json b/configurator/src/test/resources/json.json → ...urator/src/commonTest/resources/json.json
diff --git a/...rator/src/test/resources/props.properties → ...src/commonTest/resources/props.properties b/...rator/src/test/resources/props.properties → ...src/commonTest/resources/props.properties
diff --git a/configurator/src/test/resources/toml.toml → ...urator/src/commonTest/resources/toml.toml b/configurator/src/test/resources/toml.toml → ...urator/src/commonTest/resources/toml.toml
diff --git a/configurator/src/test/resources/yaml.yaml → ...urator/src/commonTest/resources/yaml.yaml b/configurator/src/test/resources/yaml.yaml → ...urator/src/commonTest/resources/yaml.yaml
diff --git a/eventlib/src/main/kotlin/Event.kt → eventlib/src/commonMain/kotlin/Event.kt b/eventlib/src/main/kotlin/Event.kt → eventlib/src/commonMain/kotlin/Event.kt
diff --git a/eventlib/src/test/kotlin/EventTest.kt → eventlib/src/commonTest/kotlin/EventTest.kt b/eventlib/src/test/kotlin/EventTest.kt → eventlib/src/commonTest/kotlin/EventTest.kt
diff --git a/tgbotter/build.gradle.kts b/tgbotter/build.gradle.kts
@@ -3,11 +3,15 @@ version = "1.0.4"
 
 val telegramVersion = "7.2.1"
 
-dependencies {
-    implementation("org.telegram:telegrambots-longpolling:$telegramVersion")
-    implementation("org.telegram:telegrambots-webhook:$telegramVersion")
-    implementation("org.telegram:telegrambots-client:$telegramVersion")
-    api("org.telegram:telegrambots-meta:$telegramVersion")
+kotlin {
+    sourceSets {
+        commonMain.dependencies {
+            implementation("org.telegram:telegrambots-longpolling:$telegramVersion")
+            implementation("org.telegram:telegrambots-webhook:$telegramVersion")
+            implementation("org.telegram:telegrambots-client:$telegramVersion")
+            api("org.telegram:telegrambots-meta:$telegramVersion")
 
-    implementation("org.slf4j:slf4j-api:2.0.13")
+            implementation("org.slf4j:slf4j-api:2.0.13")
+        }
+    }
 }
diff --git a/tgbotter/src/main/kotlin/CommandManager.kt → ...r/src/commonMain/kotlin/CommandManager.kt b/tgbotter/src/main/kotlin/CommandManager.kt → ...r/src/commonMain/kotlin/CommandManager.kt
diff --git a/tgbotter/src/main/kotlin/LongPollingBot.kt → ...r/src/commonMain/kotlin/LongPollingBot.kt b/tgbotter/src/main/kotlin/LongPollingBot.kt → ...r/src/commonMain/kotlin/LongPollingBot.kt
diff --git a/tgbotter/src/main/kotlin/common/Bot.kt → tgbotter/src/commonMain/kotlin/common/Bot.kt b/tgbotter/src/main/kotlin/common/Bot.kt → tgbotter/src/commonMain/kotlin/common/Bot.kt
diff --git a/...ter/src/main/kotlin/common/DataClasses.kt → ...c/commonMain/kotlin/common/DataClasses.kt b/...ter/src/main/kotlin/common/DataClasses.kt → ...c/commonMain/kotlin/common/DataClasses.kt
diff --git a/tgbotter/src/main/kotlin/common/Listener.kt → .../src/commonMain/kotlin/common/Listener.kt b/tgbotter/src/main/kotlin/common/Listener.kt → .../src/commonMain/kotlin/common/Listener.kt