feat: complete multiplatform support

Author: lisonge

README.md

@@ -5,7 +5,7 @@
 
 kotlin multiplatform json5 for [kotlinx.serialization](https://github.com/Kotlin/kotlinx.serialization)
 
-supports: jvm, Android, linux, Windows, macOS, iOS, watchOS, tvOS
+complete multiplatform support: jvm/js/native
 
 ## Usage
 

gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-kotlin = "2.2.20"
+kotlin = "2.2.21"
 
 [libraries]
 kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }

json5/build.gradle.kts

@@ -1,54 +1,68 @@
+@file:OptIn(ExperimentalWasmDsl::class)
+
+import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
+import org.jetbrains.kotlin.gradle.dsl.KotlinCommonCompilerOptions
+import org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompilerOptions
 
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
     alias(libs.plugins.kotlin.serialization)
     alias(libs.plugins.maven.publish)
 }
 
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
-    compilerOptions {
+val versionConfigure: KotlinCommonCompilerOptions.() -> Unit = {
+    languageVersion = KotlinVersion.KOTLIN_2_0
+    apiVersion = KotlinVersion.KOTLIN_2_0
+    if (this is KotlinJvmCompilerOptions) {
         jvmTarget = JvmTarget.JVM_11
-        languageVersion = KotlinVersion.KOTLIN_2_0
-        apiVersion = KotlinVersion.KOTLIN_2_0
     }
 }
 
-kotlin {
-    jvm {
-        compilerOptions {
-            jvmTarget = JvmTarget.JVM_11
-            languageVersion = KotlinVersion.KOTLIN_2_0
-            apiVersion = KotlinVersion.KOTLIN_2_0
-        }
-    }
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
+    compilerOptions(versionConfigure)
+}
 
-    // Kotlin/Native - Linux
-    linuxX64()
-    linuxArm64()
+kotlin {
+    explicitApi()
+    applyDefaultHierarchyTemplate()
+    compilerOptions(versionConfigure)
 
-    // Kotlin/Native - Windows
-    mingwX64()
+    androidNativeArm64()
+    androidNativeX64()
 
-    // Kotlin/Native - Apple
     iosArm64()
     iosSimulatorArm64()
     iosX64()
+
+    js().nodejs()
+
+    jvm { compilerOptions(versionConfigure) }
+
+    linuxArm64()
+    linuxX64()
+
     macosArm64()
     macosX64()
+
+    mingwX64()
+
     tvosArm64()
     tvosSimulatorArm64()
     tvosX64()
+
+    wasmJs().nodejs()
+    wasmWasi().nodejs()
+
     watchosArm64()
+    watchosDeviceArm64()
+    watchosSimulatorArm64()
     watchosX64()
 
     sourceSets {
         commonMain {
-            compilerOptions {
-                languageVersion = KotlinVersion.KOTLIN_2_0
-                apiVersion = KotlinVersion.KOTLIN_2_0
-            }
+            compilerOptions(versionConfigure)
             dependencies {
                 api(libs.kotlinx.serialization.json)
             }
@@ -62,10 +76,11 @@ kotlin {
     }
 }
 
-// tip: it will take about 1 hour after GitHub Actions finished
 mavenPublishing {
-    publishToMavenCentral()
-    signAllPublications()
+    if (properties.contains("signing.keyId")) {
+        publishToMavenCentral()
+        signAllPublications()
+    }
     coordinates("li.songe", "json5", "0.4.1")
 
     val repoUrl = "https://github.com/lisonge/kotlin-json5"

json5/src/commonMain/kotlin/li/songe/json5/Json5.kt

@@ -2,23 +2,25 @@ package li.songe.json5
 
 import kotlinx.serialization.json.JsonElement
 
-object Json5 {
-    fun parseToJson5Element(input: CharSequence): JsonElement {
+public object Json5 {
+    public fun parseToJson5Element(input: CharSequence): JsonElement {
         return Json5Decoder(input).read()
     }
 
-    fun encodeToString(
+    public fun encodeToString(
         element: JsonElement,
-        config: Json5EncoderConfig = Json5EncoderConfig(),
+        config: Json5EncoderConfig = encoderConfig,
     ): String {
         return innerEncodeToString(element, config)
     }
 
-    fun parseToJson5ElementAndRanges(input: CharSequence): Pair<JsonElement, List<Json5Range>> {
+    public fun parseToJson5ElementAndRanges(input: CharSequence): Pair<JsonElement, List<Json5Range>> {
         return Json5Decoder(input).readElementAndRange()
     }
 
-    fun parseToJson5LooseRanges(input: CharSequence): List<Json5LooseRange> {
+    public fun parseToJson5LooseRanges(input: CharSequence): List<Json5LooseRange> {
         return Json5LooseDecoder(input).read()
     }
+
+    public val encoderConfig: Json5EncoderConfig = Json5EncoderConfig()
 }

json5/src/commonMain/kotlin/li/songe/json5/Json5EncoderConfig.kt

@@ -1,6 +1,6 @@
 package li.songe.json5
 
-data class Json5EncoderConfig(
+public data class Json5EncoderConfig(
     val indent: String = "",
     val quoteStrategy: Json5QuoteStrategy = Json5QuoteStrategy.Single,
     val unquotedKey: Boolean = true,

json5/src/commonMain/kotlin/li/songe/json5/Json5LooseRange.kt

@@ -1,6 +1,6 @@
 package li.songe.json5
 
-data class Json5LooseRange(
+public data class Json5LooseRange(
     val start: Int,
     val end: Int,
     val token: Json5Token?,

json5/src/commonMain/kotlin/li/songe/json5/Json5Number.kt

@@ -1,8 +1,8 @@
 package li.songe.json5
 
 // just for keep raw number format
-class Json5Number(
-    val value: String,
+public class Json5Number(
+    public val value: String,
 ) : Number() {
     override fun toString(): String {
         return value

json5/src/commonMain/kotlin/li/songe/json5/Json5Range.kt

@@ -1,6 +1,6 @@
 package li.songe.json5
 
-data class Json5Range(
+public data class Json5Range(
     val start: Int,
     val end: Int,
     val token: Json5Token,

json5/src/commonMain/kotlin/li/songe/json5/Json5Token.kt

@@ -1,24 +1,24 @@
 package li.songe.json5
 
-sealed class Json5Token {
-    data object Comment : Json5Token()
-    data object Whitespace : Json5Token()
+public sealed class Json5Token {
+    public data object Comment : Json5Token()
+    public data object Whitespace : Json5Token()
 
-    sealed class FixedChar : Json5Token()
-    sealed class Bracket : FixedChar()
-    data object LeftBracket : Bracket()
-    data object RightBracket : Bracket()
-    sealed class Brace : FixedChar()
-    data object LeftBrace : Brace()
-    data object RightBrace : Brace()
-    data object Comma : FixedChar()
-    data object Colon : FixedChar()
+    public sealed class FixedChar : Json5Token()
+    public sealed class Bracket : FixedChar()
+    public data object LeftBracket : Bracket()
+    public data object RightBracket : Bracket()
+    public sealed class Brace : FixedChar()
+    public data object LeftBrace : Brace()
+    public data object RightBrace : Brace()
+    public data object Comma : FixedChar()
+    public data object Colon : FixedChar()
 
-    sealed class Literal : Json5Token()
-    data object NullLiteral : Literal()
-    data object BooleanLiteral : Literal()
-    data object NumberLiteral : Literal()
-    data object StringLiteral : Literal()
+    public sealed class Literal : Json5Token()
+    public data object NullLiteral : Literal()
+    public data object BooleanLiteral : Literal()
+    public data object NumberLiteral : Literal()
+    public data object StringLiteral : Literal()
 
-    data object Property : Json5Token()
+    public data object Property : Json5Token()
 }

json5/src/commonMain/kotlin/li/songe/json5/JsonExt.kt

@@ -6,16 +6,16 @@ import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.decodeFromJsonElement
 import kotlinx.serialization.serializer
 
-inline fun <reified T> Json.encodeToJson5String(
+public inline fun <reified T> Json.encodeToJson5String(
     value: T,
-    config: Json5EncoderConfig = Json5EncoderConfig(),
+    config: Json5EncoderConfig = Json5.encoderConfig,
 ): String {
     return Json5.encodeToString(
         encodeToJsonElement(serializersModule.serializer(), value),
         config
     )
 }
 
-inline fun <reified T> Json.decodeFromJson5String(value: CharSequence): T {
+public inline fun <reified T> Json.decodeFromJson5String(value: CharSequence): T {
     return decodeFromJsonElement<T>(Json5.parseToJson5Element(value))
 }