diff --git a/build-logic/convention/src/main/kotlin/io/github/elcolto/geokjson/convention/Multiplatform.kt b/build-logic/convention/src/main/kotlin/io/github/elcolto/geokjson/convention/Multiplatform.kt index 97ad1d23..7d8cb7dc 100644 --- a/build-logic/convention/src/main/kotlin/io/github/elcolto/geokjson/convention/Multiplatform.kt +++ b/build-logic/convention/src/main/kotlin/io/github/elcolto/geokjson/convention/Multiplatform.kt @@ -1,9 +1,9 @@ package io.github.elcolto.geokjson.convention import org.gradle.api.Project -import org.gradle.kotlin.dsl.creating import org.gradle.kotlin.dsl.get import org.gradle.kotlin.dsl.getValue +import org.gradle.kotlin.dsl.getting import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi import org.jetbrains.kotlin.gradle.dsl.JvmTarget import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension @@ -30,6 +30,11 @@ internal fun Project.configureKotlinMultiplatform( } } + js(IR) { + browser() + nodejs() + } + val iosArm64 = iosArm64() val iosX64 = iosX64() val iosSimulatorArm64 = iosSimulatorArm64() @@ -37,8 +42,11 @@ internal fun Project.configureKotlinMultiplatform( val watchosArm64 = watchosArm64() val watchosSimulatorArm64 = watchosSimulatorArm64() val appleTargets = listOf( - iosArm64, iosX64, iosSimulatorArm64, - watchosArm32, watchosArm64, + iosArm64, + iosX64, + iosSimulatorArm64, + watchosArm32, + watchosArm64, watchosSimulatorArm64, ) @@ -54,19 +62,14 @@ internal fun Project.configureKotlinMultiplatform( applyDefaultHierarchyTemplate() - //common dependencies + // common dependencies sourceSets.apply { - commonTest.dependencies { implementation(kotlin("test")) implementation(kotlin("test-annotations-common")) } - val ioMain by creating { - dependsOn(commonMain.get()) - sourceSets["iosArm64Main"].dependsOn(this) - sourceSets["iosX64Main"].dependsOn(this) - sourceSets["iosSimulatorArm64Main"].dependsOn(this) + val iosMain by getting { sourceSets["watchosArm32Main"].dependsOn(this) sourceSets["watchosArm64Main"].dependsOn(this) sourceSets["watchosSimulatorArm64Main"].dependsOn(this) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c2bc7d41..c3b1daae 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] kotlin = "2.0.0" -resources = "0.4.1" +resources = "0.9.0" benchmark = "0.4.11" agp = "8.4.1" ktlint = "12.1.1" diff --git a/turf/src/commonTest/kotlin/io/github/elcolto/geokjson/turf/TransformationTest.kt b/turf/src/commonTest/kotlin/io/github/elcolto/geokjson/turf/TransformationTest.kt index 49f0b0ac..c21f0ca2 100644 --- a/turf/src/commonTest/kotlin/io/github/elcolto/geokjson/turf/TransformationTest.kt +++ b/turf/src/commonTest/kotlin/io/github/elcolto/geokjson/turf/TransformationTest.kt @@ -32,8 +32,8 @@ class TransformationTest { */ @Test fun testBezierSplineAcrossPacific() { - val feature = Feature.fromJson(readResource("transformation/bezierspline/in/issue-#1063.json")) - val expectedOut = Feature.fromJson(readResource("transformation/bezierspline/out/issue-#1063.json")) + val feature = Feature.fromJson(readResource("transformation/bezierspline/in/issue1063.json")) + val expectedOut = Feature.fromJson(readResource("transformation/bezierspline/out/issue1063.json")) assertEquals(expectedOut.geometry, bezierSpline(feature.geometry as LineString)) } diff --git a/turf/src/commonTest/resources/transformation/bezierspline/in/issue-#1063.json b/turf/src/commonTest/resources/transformation/bezierspline/in/issue1063.json similarity index 100% rename from turf/src/commonTest/resources/transformation/bezierspline/in/issue-#1063.json rename to turf/src/commonTest/resources/transformation/bezierspline/in/issue1063.json diff --git a/turf/src/commonTest/resources/transformation/bezierspline/out/issue-#1063.json b/turf/src/commonTest/resources/transformation/bezierspline/out/issue1063.json similarity index 100% rename from turf/src/commonTest/resources/transformation/bezierspline/out/issue-#1063.json rename to turf/src/commonTest/resources/transformation/bezierspline/out/issue1063.json