diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml index 05f5e5b2..c9db0fa5 100644 --- a/.github/workflows/Build.yml +++ b/.github/workflows/Build.yml @@ -11,7 +11,7 @@ jobs: with: java-version: 1.8 - run: chmod +x gradlew - - run: ./gradlew build --info --scan + - run: ./gradlew build build-on-macos: runs-on: macos-latest steps: @@ -20,4 +20,4 @@ jobs: with: java-version: 1.8 - run: chmod +x gradlew - - run: ./gradlew build --info --scan + - run: ./gradlew build diff --git a/.gitignore b/.gitignore index 899b29b5..5cccfc10 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ .idea/ .gradle/ +.kotlin/ build/ .idea_modules/ hs_err_pid* diff --git a/benchmark/build.gradle.kts b/benchmark/build.gradle.kts index f026c654..77be5b8d 100644 --- a/benchmark/build.gradle.kts +++ b/benchmark/build.gradle.kts @@ -5,29 +5,29 @@ plugins { kotlin("jvm") kotlin("kapt") kotlin("plugin.serialization") - id("me.champeau.gradle.jmh") + id("me.champeau.jmh") } -apply(plugin = "me.champeau.gradle.jmh") +apply(plugin = "me.champeau.jmh") dependencies { api(kotlin("stdlib-jdk8")) - api("org.openjdk.jmh:jmh-core:1.23") - api("org.openjdk.jmh:jmh-generator-annprocess:1.21") + api("org.openjdk.jmh:jmh-core:1.37") + api("org.openjdk.jmh:jmh-generator-annprocess:1.37") api(project(":yamlkt")) api(kotlinx("serialization-core", Versions.serialization)) api(kotlinx("serialization-json", Versions.serialization)) - kapt("org.openjdk.jmh:jmh-generator-annprocess:1.21") + kapt("org.openjdk.jmh:jmh-generator-annprocess:1.37") api("com.charleskorn.kaml:kaml:0.17.0") api("org.yaml:snakeyaml:1.26") - api("com.google.code.gson:gson:2.8.6") - api("com.alibaba:fastjson:1.2.75") + api("com.google.code.gson:gson:2.11.0") + api("com.alibaba:fastjson:1.2.83") // Next major: 2.0.51 } group = "" jmh { - include = listOf("DeserializingTest") + includes.set(listOf("DeserializingTest")) } val compileKotlin: KotlinCompile by tasks diff --git a/build.gradle.kts b/build.gradle.kts index 69b27fd3..f92b63ec 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,7 +3,7 @@ plugins { kotlin("multiplatform") version Versions.kotlin apply false kotlin("plugin.serialization") version Versions.kotlin apply false - id("me.champeau.gradle.jmh") version "0.5.3" apply false + id("me.champeau.jmh") version "0.7.2" apply false } allprojects { diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index c45828ac..2ca5935a 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -1,8 +1,8 @@ object Versions { const val version = "0.13.0" - const val kotlin = "1.8.0" - const val serialization = "1.5.0" + const val kotlin = "2.0.0" + const val serialization = "1.7.0" const val mavenCentralPublish = "1.0.0-dev-3" } diff --git a/gradle.properties b/gradle.properties index 1c8094b4..0fc563c9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,10 +1,9 @@ # style guide kotlin.code.style=official kotlin.incremental.multiplatform=true -kotlin.js.compiler=both +kotlin.js.compiler=ir kotlin.native.ignoreDisabledTargets=true systemProp.org.gradle.internal.publish.checksums.insecure=true org.gradle.vfs.watch=true - -kotlin.mpp.enableCompatibilityMetadataVariant=true +org.gradle.jvmargs=-Xmx2g "-XX:MaxMetaspaceSize=2g" kotlin.mpp.enableCInteropCommonization=true diff --git a/settings.gradle.kts b/settings.gradle.kts index 4df8c7f5..d9f87a11 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,7 +1,7 @@ pluginManagement { repositories { gradlePluginPortal() - mavenLocal() + mavenCentral() } } diff --git a/yamlkt/build.gradle.kts b/yamlkt/build.gradle.kts index 13b6ad57..6199cc27 100644 --- a/yamlkt/build.gradle.kts +++ b/yamlkt/build.gradle.kts @@ -1,8 +1,3 @@ -@file:Suppress("UNUSED_VARIABLE") - -import org.apache.tools.ant.taskdefs.condition.Os -import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet - plugins { id("me.him188.maven-central-publish") kotlin("multiplatform") @@ -13,129 +8,44 @@ plugins { kotlin { explicitApi() - targets { - jvm { - compilations.all { - kotlinOptions.jvmTarget = "1.8" - } - } - js(BOTH) { - compilations.all { - kotlinOptions { - moduleKind = "umd" - sourceMap = true - metaInfo = true - } - } - browser() - nodejs() - } - - - val ideaActive = System.getProperty("idea.active") == "true" && System.getProperty("publication.test") != "true" - - val nativeMainSets = mutableListOf() - val nativeTestSets = mutableListOf() - - if (ideaActive) { - when { - Os.isFamily(Os.FAMILY_MAC) -> if (Os.isArch("aarch64")) macosArm64("native") else macosX64("native") - Os.isFamily(Os.FAMILY_WINDOWS) -> mingwX64("native") - else -> linuxX64("native") - } - } else { - // https://kotlinlang.org/docs/native-target-support.html - // Updated for Kotlin 1.8.0, serialization 1.5.0 - //kotlinx-serialization-core-iosarm32/ - - - //kotlinx-serialization-core-iosarm64/ - - - //kotlinx-serialization-core-iossimulatorarm64/ - - - //kotlinx-serialization-core-iosx64/ - - - //kotlinx-serialization-core-js/ - - - //kotlinx-serialization-core-jvm/ - - - //kotlinx-serialization-core-linuxarm32hfp/ - - - //kotlinx-serialization-core-linuxarm64/ - - - //kotlinx-serialization-core-linuxx64/ - - - //kotlinx-serialization-core-macosarm64/ - - - //kotlinx-serialization-core-macosx64/ - - - //kotlinx-serialization-core-metadata/ - - - //kotlinx-serialization-core-mingwx64/ - - - //kotlinx-serialization-core-mingwx86/ - - - //kotlinx-serialization-core-tvosarm64/ - - - //kotlinx-serialization-core-tvossimulatorarm64/ - - - //kotlinx-serialization-core-tvosx64/ - - - //kotlinx-serialization-core-watchosarm32/ - - - //kotlinx-serialization-core-watchosarm64/ - - - //kotlinx-serialization-core-watchossimulatora.../ - - - //kotlinx-serialization-core-watchosx64/ - - - //kotlinx-serialization-core-watchosx86/ - // Commented ones are not supported by kotlinx-coroutines-core - val nativeTargets: List = arrayOf( - // Tier 1: - "linuxX64", - "macosX64", - "macosArm64", - "iosSimulatorArm64", - "iosX64", - - // Tier 2: - "linuxArm64", -// "watchosSimulatorArm64", - "watchosX64w", - "wwatchosArm32", - "watchosArm64", - "tvosSimulatorArm64", - "tvosX64", - "tvosArm64", - "iosArm64", - - // Tier 3: -// "androidNativeArm32", -// "androidNativeArm64", -// "androidNativeX86", -// "androidNativeX64", - "mingwX64", -// "watchosDeviceArm64", - - // Deprecated: - "iosArm32", - "watchosX86", -// "wasm32", - "mingwX86", - "linuxArm32Hfp", -// "linuxMips32", -// "linuxMipsel32", - ).flatMap { it.split(", ") } - presets.filter { it.name in nativeTargets } - .forEach { preset -> - val target = targetFromPreset(preset, preset.name) - nativeMainSets.add(target.compilations[org.jetbrains.kotlin.gradle.plugin.KotlinCompilation.MAIN_COMPILATION_NAME].kotlinSourceSets.first()) - nativeTestSets.add(target.compilations[org.jetbrains.kotlin.gradle.plugin.KotlinCompilation.TEST_COMPILATION_NAME].kotlinSourceSets.first()) - } - - sourceSets { - if (!ideaActive) { - configure(nativeMainSets) { - dependsOn(sourceSets.maybeCreate("nativeMain")) - } - - configure(nativeTestSets) { - dependsOn(sourceSets.maybeCreate("nativeTest")) - } - } - } - } - - /* - val hostOs = System.getProperty("os.name") - val isMingwX64 = hostOs.startsWith("Windows") - val nativeTarget = when { - hostOs == "Mac OS X" -> macosX64("native") - hostOs == "Linux" -> linuxX64("native") - isMingwX64 -> mingwX64("native") - else -> throw GradleException("Host OS is not supported in Kotlin/Native.") - }*/ + jvmToolchain(8) + jvm() + js { + browser() + nodejs() } + // https://kotlinlang.org/docs/native-target-support.html + // Updated for Kotlin 2.0.0, serialization 1.7.0 + // Commented ones are not supported by kotlinx-coroutines-core + + // Tier 1: + macosX64() + macosArm64() + iosSimulatorArm64() + iosX64() + + // Tier 2: + linuxX64() + linuxArm64() + watchosSimulatorArm64() + watchosX64() + watchosArm32() + watchosArm64() + tvosSimulatorArm64() + tvosX64() + tvosArm64() + iosArm64() + + // Tier 3: + //androidNativeArm32() + //androidNativeArm64() + //androidNativeX86() + //androidNativeX64() + mingwX64() + watchosDeviceArm64() + + applyDefaultHierarchyTemplate() sourceSets { val serializationVersion: String = Versions.serialization @@ -166,8 +76,6 @@ kotlin { api(kotlin("reflect")) } } - - val jvmMain by getting val jvmTest by getting { dependencies { api(kotlin("test-junit")) @@ -175,17 +83,6 @@ kotlin { api("org.yaml:snakeyaml:1.26") } } - - val jsMain by getting - val jsTest by getting - - val nativeMain by getting { - dependsOn(commonMain) - } - - val nativeTest by getting { - dependsOn(commonTest) - } } } diff --git a/yamlkt/src/commonMain/kotlin/net.mamoe.yamlkt/Yaml.kt b/yamlkt/src/commonMain/kotlin/net/mamoe/yamlkt/Yaml.kt similarity index 100% rename from yamlkt/src/commonMain/kotlin/net.mamoe.yamlkt/Yaml.kt rename to yamlkt/src/commonMain/kotlin/net/mamoe/yamlkt/Yaml.kt diff --git a/yamlkt/src/commonMain/kotlin/net.mamoe.yamlkt/YamlComment.kt b/yamlkt/src/commonMain/kotlin/net/mamoe/yamlkt/YamlComment.kt similarity index 100% rename from yamlkt/src/commonMain/kotlin/net.mamoe.yamlkt/YamlComment.kt rename to yamlkt/src/commonMain/kotlin/net/mamoe/yamlkt/YamlComment.kt diff --git a/yamlkt/src/commonMain/kotlin/net.mamoe.yamlkt/YamlConfigurationInternal.kt b/yamlkt/src/commonMain/kotlin/net/mamoe/yamlkt/YamlConfigurationInternal.kt similarity index 100% rename from yamlkt/src/commonMain/kotlin/net.mamoe.yamlkt/YamlConfigurationInternal.kt rename to yamlkt/src/commonMain/kotlin/net/mamoe/yamlkt/YamlConfigurationInternal.kt diff --git a/yamlkt/src/commonMain/kotlin/net.mamoe.yamlkt/YamlDecodingException.kt b/yamlkt/src/commonMain/kotlin/net/mamoe/yamlkt/YamlDecodingException.kt similarity index 100% rename from yamlkt/src/commonMain/kotlin/net.mamoe.yamlkt/YamlDecodingException.kt rename to yamlkt/src/commonMain/kotlin/net/mamoe/yamlkt/YamlDecodingException.kt diff --git a/yamlkt/src/commonMain/kotlin/net.mamoe.yamlkt/YamlDynamicSerializer.kt b/yamlkt/src/commonMain/kotlin/net/mamoe/yamlkt/YamlDynamicSerializer.kt similarity index 100% rename from yamlkt/src/commonMain/kotlin/net.mamoe.yamlkt/YamlDynamicSerializer.kt rename to yamlkt/src/commonMain/kotlin/net/mamoe/yamlkt/YamlDynamicSerializer.kt diff --git a/yamlkt/src/commonMain/kotlin/net.mamoe.yamlkt/YamlElement.kt b/yamlkt/src/commonMain/kotlin/net/mamoe/yamlkt/YamlElement.kt similarity index 100% rename from yamlkt/src/commonMain/kotlin/net.mamoe.yamlkt/YamlElement.kt rename to yamlkt/src/commonMain/kotlin/net/mamoe/yamlkt/YamlElement.kt diff --git a/yamlkt/src/commonMain/kotlin/net.mamoe.yamlkt/YamlNullableDynamicSerializer.kt b/yamlkt/src/commonMain/kotlin/net/mamoe/yamlkt/YamlNullableDynamicSerializer.kt similarity index 100% rename from yamlkt/src/commonMain/kotlin/net.mamoe.yamlkt/YamlNullableDynamicSerializer.kt rename to yamlkt/src/commonMain/kotlin/net/mamoe/yamlkt/YamlNullableDynamicSerializer.kt diff --git a/yamlkt/src/commonMain/kotlin/net.mamoe.yamlkt/internal/ContextualException.kt b/yamlkt/src/commonMain/kotlin/net/mamoe/yamlkt/internal/ContextualException.kt similarity index 100% rename from yamlkt/src/commonMain/kotlin/net.mamoe.yamlkt/internal/ContextualException.kt rename to yamlkt/src/commonMain/kotlin/net/mamoe/yamlkt/internal/ContextualException.kt diff --git a/yamlkt/src/commonMain/kotlin/net.mamoe.yamlkt/internal/Converters.kt b/yamlkt/src/commonMain/kotlin/net/mamoe/yamlkt/internal/Converters.kt similarity index 100% rename from yamlkt/src/commonMain/kotlin/net.mamoe.yamlkt/internal/Converters.kt rename to yamlkt/src/commonMain/kotlin/net/mamoe/yamlkt/internal/Converters.kt diff --git a/yamlkt/src/commonMain/kotlin/net.mamoe.yamlkt/internal/Debugging.kt b/yamlkt/src/commonMain/kotlin/net/mamoe/yamlkt/internal/Debugging.kt similarity index 100% rename from yamlkt/src/commonMain/kotlin/net.mamoe.yamlkt/internal/Debugging.kt rename to yamlkt/src/commonMain/kotlin/net/mamoe/yamlkt/internal/Debugging.kt diff --git a/yamlkt/src/commonMain/kotlin/net.mamoe.yamlkt/internal/DynamicSerializersUtils.kt b/yamlkt/src/commonMain/kotlin/net/mamoe/yamlkt/internal/DynamicSerializersUtils.kt similarity index 100% rename from yamlkt/src/commonMain/kotlin/net.mamoe.yamlkt/internal/DynamicSerializersUtils.kt rename to yamlkt/src/commonMain/kotlin/net/mamoe/yamlkt/internal/DynamicSerializersUtils.kt diff --git a/yamlkt/src/commonMain/kotlin/net.mamoe.yamlkt/internal/Escape.kt b/yamlkt/src/commonMain/kotlin/net/mamoe/yamlkt/internal/Escape.kt similarity index 100% rename from yamlkt/src/commonMain/kotlin/net.mamoe.yamlkt/internal/Escape.kt rename to yamlkt/src/commonMain/kotlin/net/mamoe/yamlkt/internal/Escape.kt diff --git a/yamlkt/src/commonMain/kotlin/net.mamoe.yamlkt/internal/Inline.kt b/yamlkt/src/commonMain/kotlin/net/mamoe/yamlkt/internal/Inline.kt similarity index 100% rename from yamlkt/src/commonMain/kotlin/net.mamoe.yamlkt/internal/Inline.kt rename to yamlkt/src/commonMain/kotlin/net/mamoe/yamlkt/internal/Inline.kt diff --git a/yamlkt/src/commonMain/kotlin/net.mamoe.yamlkt/internal/Language.common.kt b/yamlkt/src/commonMain/kotlin/net/mamoe/yamlkt/internal/Language.common.kt similarity index 100% rename from yamlkt/src/commonMain/kotlin/net.mamoe.yamlkt/internal/Language.common.kt rename to yamlkt/src/commonMain/kotlin/net/mamoe/yamlkt/internal/Language.common.kt diff --git a/yamlkt/src/commonMain/kotlin/net.mamoe.yamlkt/internal/TokenStream.kt b/yamlkt/src/commonMain/kotlin/net/mamoe/yamlkt/internal/TokenStream.kt similarity index 100% rename from yamlkt/src/commonMain/kotlin/net.mamoe.yamlkt/internal/TokenStream.kt rename to yamlkt/src/commonMain/kotlin/net/mamoe/yamlkt/internal/TokenStream.kt diff --git a/yamlkt/src/commonMain/kotlin/net.mamoe.yamlkt/internal/YamlDecoder.kt b/yamlkt/src/commonMain/kotlin/net/mamoe/yamlkt/internal/YamlDecoder.kt similarity index 100% rename from yamlkt/src/commonMain/kotlin/net.mamoe.yamlkt/internal/YamlDecoder.kt rename to yamlkt/src/commonMain/kotlin/net/mamoe/yamlkt/internal/YamlDecoder.kt diff --git a/yamlkt/src/commonMain/kotlin/net.mamoe.yamlkt/internal/YamlElementSerializer.kt b/yamlkt/src/commonMain/kotlin/net/mamoe/yamlkt/internal/YamlElementSerializer.kt similarity index 100% rename from yamlkt/src/commonMain/kotlin/net.mamoe.yamlkt/internal/YamlElementSerializer.kt rename to yamlkt/src/commonMain/kotlin/net/mamoe/yamlkt/internal/YamlElementSerializer.kt diff --git a/yamlkt/src/commonMain/kotlin/net.mamoe.yamlkt/internal/YamlEncoder.kt b/yamlkt/src/commonMain/kotlin/net/mamoe/yamlkt/internal/YamlEncoder.kt similarity index 100% rename from yamlkt/src/commonMain/kotlin/net.mamoe.yamlkt/internal/YamlEncoder.kt rename to yamlkt/src/commonMain/kotlin/net/mamoe/yamlkt/internal/YamlEncoder.kt diff --git a/yamlkt/src/commonMain/kotlin/net.mamoe.yamlkt/internal/YamlWriter.kt b/yamlkt/src/commonMain/kotlin/net/mamoe/yamlkt/internal/YamlWriter.kt similarity index 100% rename from yamlkt/src/commonMain/kotlin/net.mamoe.yamlkt/internal/YamlWriter.kt rename to yamlkt/src/commonMain/kotlin/net/mamoe/yamlkt/internal/YamlWriter.kt diff --git a/yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/AdjustDynamicStringTest.kt b/yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/AdjustDynamicStringTest.kt similarity index 100% rename from yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/AdjustDynamicStringTest.kt rename to yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/AdjustDynamicStringTest.kt diff --git a/yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/DecoderFailTest.kt b/yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/DecoderFailTest.kt similarity index 100% rename from yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/DecoderFailTest.kt rename to yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/DecoderFailTest.kt diff --git a/yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/DecoderTest.kt b/yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/DecoderTest.kt similarity index 100% rename from yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/DecoderTest.kt rename to yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/DecoderTest.kt diff --git a/yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/HexConverterTest.kt b/yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/HexConverterTest.kt similarity index 100% rename from yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/HexConverterTest.kt rename to yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/HexConverterTest.kt diff --git a/yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/InlineTest.kt b/yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/InlineTest.kt similarity index 100% rename from yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/InlineTest.kt rename to yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/InlineTest.kt diff --git a/yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/MultilineStringTest.kt b/yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/MultilineStringTest.kt similarity index 100% rename from yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/MultilineStringTest.kt rename to yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/MultilineStringTest.kt diff --git a/yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/Platform.common.kt b/yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/Platform.common.kt similarity index 100% rename from yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/Platform.common.kt rename to yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/Platform.common.kt diff --git a/yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/YamlDynamicSerializerTest.kt b/yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/YamlDynamicSerializerTest.kt similarity index 100% rename from yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/YamlDynamicSerializerTest.kt rename to yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/YamlDynamicSerializerTest.kt diff --git a/yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/YamlElementDeserializingTest.kt b/yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/YamlElementDeserializingTest.kt similarity index 100% rename from yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/YamlElementDeserializingTest.kt rename to yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/YamlElementDeserializingTest.kt diff --git a/yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/YamlElementTests.kt b/yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/YamlElementTests.kt similarity index 100% rename from yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/YamlElementTests.kt rename to yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/YamlElementTests.kt diff --git a/yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/decoder/BlockMapTest.kt b/yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/decoder/BlockMapTest.kt similarity index 100% rename from yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/decoder/BlockMapTest.kt rename to yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/decoder/BlockMapTest.kt diff --git a/yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/decoder/BlockSequenceFailTest.kt b/yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/decoder/BlockSequenceFailTest.kt similarity index 100% rename from yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/decoder/BlockSequenceFailTest.kt rename to yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/decoder/BlockSequenceFailTest.kt diff --git a/yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/decoder/BlockSequenceTest.kt b/yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/decoder/BlockSequenceTest.kt similarity index 100% rename from yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/decoder/BlockSequenceTest.kt rename to yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/decoder/BlockSequenceTest.kt diff --git a/yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/decoder/ContextualTest.kt b/yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/decoder/ContextualTest.kt similarity index 100% rename from yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/decoder/ContextualTest.kt rename to yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/decoder/ContextualTest.kt diff --git a/yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/decoder/DecoderEscapeTest.kt b/yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/decoder/DecoderEscapeTest.kt similarity index 100% rename from yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/decoder/DecoderEscapeTest.kt rename to yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/decoder/DecoderEscapeTest.kt diff --git a/yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/decoder/FlowListTest.kt b/yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/decoder/FlowListTest.kt similarity index 100% rename from yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/decoder/FlowListTest.kt rename to yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/decoder/FlowListTest.kt diff --git a/yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/decoder/FlowMapTest.kt b/yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/decoder/FlowMapTest.kt similarity index 100% rename from yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/decoder/FlowMapTest.kt rename to yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/decoder/FlowMapTest.kt diff --git a/yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/decoder/FullYamlTest.kt b/yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/decoder/FullYamlTest.kt similarity index 100% rename from yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/decoder/FullYamlTest.kt rename to yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/decoder/FullYamlTest.kt diff --git a/yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/decoder/MalformedSerializersTest.kt b/yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/decoder/MalformedSerializersTest.kt similarity index 100% rename from yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/decoder/MalformedSerializersTest.kt rename to yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/decoder/MalformedSerializersTest.kt diff --git a/yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/decoder/NullabilityTest.kt b/yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/decoder/NullabilityTest.kt similarity index 100% rename from yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/decoder/NullabilityTest.kt rename to yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/decoder/NullabilityTest.kt diff --git a/yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/decoder/PolymorphismTest.kt b/yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/decoder/PolymorphismTest.kt similarity index 100% rename from yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/decoder/PolymorphismTest.kt rename to yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/decoder/PolymorphismTest.kt diff --git a/yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/decoder/TestMissingField.kt b/yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/decoder/TestMissingField.kt similarity index 100% rename from yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/decoder/TestMissingField.kt rename to yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/decoder/TestMissingField.kt diff --git a/yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/decoder/TestMissingStructure.kt b/yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/decoder/TestMissingStructure.kt similarity index 100% rename from yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/decoder/TestMissingStructure.kt rename to yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/decoder/TestMissingStructure.kt diff --git a/yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/decoder/TestNewStream.kt b/yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/decoder/TestNewStream.kt similarity index 100% rename from yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/decoder/TestNewStream.kt rename to yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/decoder/TestNewStream.kt diff --git a/yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/decoder/TestSkippingUnknownElements.kt b/yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/decoder/TestSkippingUnknownElements.kt similarity index 100% rename from yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/decoder/TestSkippingUnknownElements.kt rename to yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/decoder/TestSkippingUnknownElements.kt diff --git a/yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/encoder/BasicEncoderTest.kt b/yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/encoder/BasicEncoderTest.kt similarity index 100% rename from yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/encoder/BasicEncoderTest.kt rename to yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/encoder/BasicEncoderTest.kt diff --git a/yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/encoder/BlockMapTest.kt b/yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/encoder/BlockMapTest.kt similarity index 100% rename from yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/encoder/BlockMapTest.kt rename to yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/encoder/BlockMapTest.kt diff --git a/yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/encoder/BlockSequenceTest.kt b/yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/encoder/BlockSequenceTest.kt similarity index 100% rename from yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/encoder/BlockSequenceTest.kt rename to yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/encoder/BlockSequenceTest.kt diff --git a/yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/encoder/CommentEncodeTest.kt b/yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/encoder/CommentEncodeTest.kt similarity index 100% rename from yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/encoder/CommentEncodeTest.kt rename to yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/encoder/CommentEncodeTest.kt diff --git a/yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/encoder/ComplexEncoderTests.kt b/yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/encoder/ComplexEncoderTests.kt similarity index 100% rename from yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/encoder/ComplexEncoderTests.kt rename to yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/encoder/ComplexEncoderTests.kt diff --git a/yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/encoder/FlowMapTest.kt b/yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/encoder/FlowMapTest.kt similarity index 100% rename from yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/encoder/FlowMapTest.kt rename to yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/encoder/FlowMapTest.kt diff --git a/yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/encoder/FlowSequenceTest.kt b/yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/encoder/FlowSequenceTest.kt similarity index 100% rename from yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/encoder/FlowSequenceTest.kt rename to yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/encoder/FlowSequenceTest.kt diff --git a/yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/encoder/MalformedSerializersTest.kt b/yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/encoder/MalformedSerializersTest.kt similarity index 100% rename from yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/encoder/MalformedSerializersTest.kt rename to yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/encoder/MalformedSerializersTest.kt diff --git a/yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/encoder/TestEncoderEscape.kt b/yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/encoder/TestEncoderEscape.kt similarity index 100% rename from yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/encoder/TestEncoderEscape.kt rename to yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/encoder/TestEncoderEscape.kt diff --git a/yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/encoder/encoderUtils.kt b/yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/encoder/encoderUtils.kt similarity index 100% rename from yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/encoder/encoderUtils.kt rename to yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/encoder/encoderUtils.kt diff --git a/yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/escaping/DoubleQuotationMultilineTest.kt b/yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/escaping/DoubleQuotationMultilineTest.kt similarity index 100% rename from yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/escaping/DoubleQuotationMultilineTest.kt rename to yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/escaping/DoubleQuotationMultilineTest.kt diff --git a/yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/escaping/SingleQuotationMultilineTest.kt b/yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/escaping/SingleQuotationMultilineTest.kt similarity index 100% rename from yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/escaping/SingleQuotationMultilineTest.kt rename to yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/escaping/SingleQuotationMultilineTest.kt diff --git a/yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/escaping/UnquotedMultilineTest.kt b/yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/escaping/UnquotedMultilineTest.kt similarity index 100% rename from yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/escaping/UnquotedMultilineTest.kt rename to yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/escaping/UnquotedMultilineTest.kt diff --git a/yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/testsFromIssues/17.kt b/yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/testsFromIssues/17.kt similarity index 100% rename from yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/testsFromIssues/17.kt rename to yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/testsFromIssues/17.kt diff --git a/yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/testsFromIssues/33.kt b/yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/testsFromIssues/33.kt similarity index 100% rename from yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/testsFromIssues/33.kt rename to yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/testsFromIssues/33.kt diff --git a/yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/testsFromIssues/5.kt b/yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/testsFromIssues/5.kt similarity index 100% rename from yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/testsFromIssues/5.kt rename to yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/testsFromIssues/5.kt diff --git a/yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/testsFromIssues/6.kt b/yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/testsFromIssues/6.kt similarity index 100% rename from yamlkt/src/commonTest/kotlin/net.mamoe.yamlkt/testsFromIssues/6.kt rename to yamlkt/src/commonTest/kotlin/net/mamoe/yamlkt/testsFromIssues/6.kt diff --git a/yamlkt/src/jsMain/kotlin/net.mamoe.yamlkt/internal/serializeImpl.js.kt b/yamlkt/src/jsMain/kotlin/net/mamoe/yamlkt/internal/serializeImpl.js.kt similarity index 100% rename from yamlkt/src/jsMain/kotlin/net.mamoe.yamlkt/internal/serializeImpl.js.kt rename to yamlkt/src/jsMain/kotlin/net/mamoe/yamlkt/internal/serializeImpl.js.kt