Change :common and :cirno-serializable modules to work as Kotlin Multiplatform instead only JVM

Author: WinG4merBR

build.gradle.kts

@@ -1,6 +1,9 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
 plugins {
+    java
     kotlin("jvm") version Versions.KOTLIN
-    kotlin("plugin.serialization") version Versions.KOTLIN_SERIALIZATION
+    kotlin("plugin.serialization") version Versions.KOTLIN
     id("com.github.johnrengelman.shadow") version Versions.SHADOW_JAR
     base
 }
@@ -17,28 +20,7 @@ allprojects {
 }
 
 subprojects {
-    apply(plugin = "org.jetbrains.kotlin.jvm")
-}
-
-tasks.test {
-    useJUnitPlatform()
-}
-
-tasks {
-    shadowJar {
-        archiveBaseName.set("Foxy")
-        archiveVersion.set(version.toString())
-        archiveClassifier.set("")
-
-        configurations = listOf(project.configurations.runtimeClasspath.get())
+    tasks.withType<KotlinCompile> {
+        kotlinOptions.javaParameters = true
     }
-
-    test {
-        useJUnitPlatform()
-    }
-}
-
-
-kotlin {
-    jvmToolchain(Versions.JVM_TARGET)
 }

cirno-serializable/build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
-    kotlin("jvm")
-    kotlin("plugin.serialization") version Versions.KOTLIN_SERIALIZATION
+    kotlin("multiplatform")
+    kotlin("plugin.serialization") version Versions.KOTLIN
 }
 
 group = "net.cakeyfox"
@@ -10,24 +10,40 @@ repositories {
     mavenCentral()
 }
 
-dependencies {
-    testImplementation(kotlin("test"))
+kotlin {
+    jvm {
+        compilations.all {
+            kotlinOptions.jvmTarget = Versions.JVM_TARGET.toString()
+        }
 
-    // DateTime
-    implementation("org.jetbrains.kotlinx:kotlinx-datetime:${Versions.KOTLINX_DATE_TIME}")
+        withJava()
+    }
 
-    // MongoDB ObjectId
-    implementation("org.mongodb:bson:4.11.0")
+    js(IR) {
+        browser()
+        nodejs()
+    }
 
-    // Serialization
-    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:${Versions.KOTLIN_SERIALIZATION}")
-    implementation("org.jetbrains.kotlinx:kotlinx-serialization-hocon:${Versions.KOTLIN_SERIALIZATION}")
-    implementation("com.fasterxml.jackson.module:jackson-module-kotlin:${Versions.JACKSON}")
-}
+    sourceSets {
+        val commonMain by getting {
+            dependencies {
+                implementation(kotlin("stdlib-common"))
+                implementation("org.jetbrains.kotlinx:kotlinx-serialization-core:1.6.0")
+                implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.0")
+                implementation("org.jetbrains.kotlinx:kotlinx-datetime:${Versions.KOTLINX_DATE_TIME}")
+            }
+        }
 
-tasks.test {
-    useJUnitPlatform()
-}
-kotlin {
-    jvmToolchain(Versions.JVM_TARGET)
+        val jvmMain by getting {
+            dependencies {
+                implementation(kotlin("stdlib-jdk8"))
+            }
+        }
+
+        val jsMain by getting {
+            dependencies {
+                implementation(kotlin("stdlib-js"))
+            }
+        }
+    }
 }

cirno-serializable/src/main/kotlin/net/cakeyfox/serializable/data/ActionResponse.kt cirno-serializable/src/commonMain/kotlin/net/cakeyfox/serializable/data/ActionResponse.kt

@@ -7,7 +7,6 @@ data class FoxyConfig(
     val environment: String,
     val discord: DiscordSettings,
     val database: DatabaseSettings,
-    val loritta: LorittaAPI,
     val others: OtherSettings
 ) {
     @Serializable
@@ -39,12 +38,6 @@ data class FoxyConfig(
         val requestTimeout: Int
     )
 
-    @Serializable
-    data class LorittaAPI(
-        val url: String,
-        val key: String
-    )
-
     @Serializable
     data class OtherSettings(
         val foxyApi: FoxyAPISettings,

cirno-serializable/src/main/kotlin/net/cakeyfox/serializable/data/ActivityUpdateRequest.kt cirno-serializable/src/commonMain/kotlin/net/cakeyfox/serializable/data/ActivityUpdateRequest.kt

@@ -1,7 +1,6 @@
 plugins {
-    id("java")
+    kotlin("multiplatform")
     id("com.github.johnrengelman.shadow")
-    `java-library`
 }
 
 group = "net.cakeyfox"
@@ -11,22 +10,16 @@ repositories {
     mavenCentral()
 }
 
-dependencies {
-    implementation("org.jetbrains.kotlinx:kotlinx-serialization-hocon:${Versions.KOTLIN_SERIALIZATION}")
-}
-
-tasks.test {
-    useJUnitPlatform()
-}
-
-tasks {
-    shadowJar {
-        archiveBaseName.set("common")
-        archiveVersion.set("1.0.0")
-        archiveClassifier.set("")
+kotlin {
+    jvm {
+        compilations.all {
+            kotlinOptions.jvmTarget = Versions.JVM_TARGET.toString()
+        }
     }
-}
 
-kotlin {
-    jvmToolchain(Versions.JVM_TARGET)
+    jvm().compilations["main"].defaultSourceSet {
+        dependencies {
+            implementation("org.jetbrains.kotlinx:kotlinx-serialization-hocon:${Versions.KOTLIN_SERIALIZATION}")
+        }
+    }
 }

cirno-serializable/src/main/kotlin/net/cakeyfox/serializable/data/CustomGuildInfo.kt cirno-serializable/src/commonMain/kotlin/net/cakeyfox/serializable/data/CustomGuildInfo.kt

@@ -12,7 +12,6 @@ object Constants {
     const val PREMIUM = "https://foxybot.win/br/premium"
     const val DAILY = "https://foxybot.win/br/daily"
     const val DAILY_EMOJI = "https://cdn.discordapp.com/emojis/915736630495686696.png?size=2048"
-    const val LORITTA_INVITE = "https://discord.com/oauth2/authorize?client_id=297153970613387264&scope=bot+identify+guilds+email+applications.commands&permissions=2080374975"
     @OptIn(ExperimentalSerializationApi::class)
     val HOCON = Hocon { useArrayPolymorphism = true }
     const val SUPPORT_SERVER_ID = "768267522670723094"

cirno-serializable/src/main/kotlin/net/cakeyfox/serializable/data/ImagePosition.kt cirno-serializable/src/commonMain/kotlin/net/cakeyfox/serializable/data/ImagePosition.kt

@@ -10,7 +10,6 @@ import net.cakeyfox.foxy.FoxyInstance
 import net.cakeyfox.serializable.database.data.FoxyUser
 import net.cakeyfox.serializable.database.data.Guild
 import java.util.concurrent.TimeUnit
-import kotlin.reflect.jvm.jvmName
 
 class MongoDBClient(
     foxy: FoxyInstance