Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -30,15 +30,23 @@ internal fun Project.configureKotlinMultiplatform(
}
}

js(IR) {
browser()
nodejs()
}

val iosArm64 = iosArm64()
val iosX64 = iosX64()
val iosSimulatorArm64 = iosSimulatorArm64()
val watchosArm32 = watchosArm32()
val watchosArm64 = watchosArm64()
val watchosSimulatorArm64 = watchosSimulatorArm64()
val appleTargets = listOf(
iosArm64, iosX64, iosSimulatorArm64,
watchosArm32, watchosArm64,
iosArm64,
iosX64,
iosSimulatorArm64,
watchosArm32,
watchosArm64,
watchosSimulatorArm64,
)

Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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))
}
Expand Down
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Had to rename these files. Cause -#in file name led to the error in the screenshot 😂

Screenshot 2024-07-16 at 13 47 00

File renamed without changes.