Replace resources library with okio and re-add web targets

Author: JanTie

build-logic/convention/src/main/kotlin/io/github/elcolto/geokjson/convention/Multiplatform.kt

@@ -7,6 +7,7 @@ import org.gradle.kotlin.dsl.getValue
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
+import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 
 @OptIn(ExperimentalKotlinGradlePluginApi::class)
 internal fun Project.configureKotlinMultiplatform(
@@ -28,6 +29,18 @@ internal fun Project.configureKotlinMultiplatform(
         }
     }
 
+    js(IR) {
+        browser()
+        nodejs()
+    }
+
+    @OptIn(ExperimentalWasmDsl::class)
+    wasmJs {
+        browser()
+        nodejs()
+    }
+
+
 
     val iosArm64 = iosArm64()
     val iosX64 = iosX64()

gradle/libs.versions.toml

@@ -1,15 +1,14 @@
 [versions]
 kotlin = "2.0.0"
-resources = "0.4.1"
 benchmark = "0.4.11"
 agp = "8.4.1"
 ktlint = "12.1.1"
 detekt = "1.23.6"
 binary-validator = "0.15.0-Beta.2"
 kover = "0.8.0"
+okio = "3.9.0"
 
 [libraries]
-resources = { module = "com.goncalossilva:resources", version.ref = "resources" }
 kotlinx-serialization = "org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.0"
 kotlinx-benchmark = { module = "org.jetbrains.kotlinx:kotlinx-benchmark-runtime", version.ref = "benchmark" }
 android-gradle-plugin = { module = "com.android.tools.build:gradle", version.ref = "agp" }
@@ -18,14 +17,15 @@ ktlint-gradle-plugin = { module = "org.jlleitschuh.gradle.ktlint:org.jlleitschuh
 detekt-gradle-plugin = { module = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin", version.ref = "detekt" }
 binary-validator-plugin = { module = "org.jetbrains.kotlinx.binary-compatibility-validator:org.jetbrains.kotlinx.binary-compatibility-validator.gradle.plugin", version.ref = "binary-validator" }
 kover-gradle-plugin = { module = "org.jetbrains.kotlinx:kover-gradle-plugin", version.ref = "kover" }
+okio = { module = "com.squareup.okio:okio", version.ref = "okio" }
+okio-nodefilesystem = { module = "com.squareup.okio:okio-nodefilesystem", version.ref = "okio" }
 
 [plugins]
 kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
 kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
 kotlinx-benchmark = { id = "org.jetbrains.kotlinx.benchmark", version.ref = "benchmark" }
 publish = { id = "com.vanniktech.maven.publish", version = "0.28.0" }
 dokka = { id = "org.jetbrains.dokka", version = "1.9.20" }
-resources = { id = "com.goncalossilva.resources", version.ref = "resources" }
 android-library = { id = "com.android.library", version.ref = "agp" }
 ktlint = { id = "org.jlleitschuh.gradle.ktlint", version.ref = "ktlint" }
 detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }

turf/build.gradle.kts

@@ -2,7 +2,6 @@ import kotlinx.kover.gradle.plugin.dsl.CoverageUnit
 
 plugins {
     id("io.github.elcolto.geokjson.library")
-    alias(libs.plugins.resources)
 }
 
 kotlin {
@@ -16,10 +15,14 @@ kotlin {
 
         val commonTest by getting {
             dependencies {
-                implementation(libs.resources)
+                implementation(libs.okio)
+            }
+        }
+        val jsTest by getting {
+            dependencies {
+                implementation(libs.okio.nodefilesystem)
             }
         }
-
     }
 }
 

turf/src/androidUnitTest/kotlin/io/github/elcolto/geokjson/turf/utils/FileSystem.android.kt

@@ -0,0 +1,5 @@
+package io.github.elcolto.geokjson.turf.utils
+
+import okio.FileSystem
+
+actual val FILE_SYSTEM: FileSystem = FileSystem.SYSTEM

turf/src/commonTest/kotlin/io/github/elcolto/geokjson/turf/utils/FileSystem.kt

@@ -0,0 +1,5 @@
+package io.github.elcolto.geokjson.turf.utils
+
+import okio.FileSystem
+
+expect val FILE_SYSTEM: FileSystem

turf/src/commonTest/kotlin/io/github/elcolto/geokjson/turf/utils/Resource.kt

@@ -1,7 +1,7 @@
 package io.github.elcolto.geokjson.turf.utils
 
-import com.goncalossilva.resources.Resource
+import okio.Path.Companion.toPath
 
 const val RESOURCE_PATH = "./src/commonTest/resources"
 
-fun readResource(name: String) = Resource("$RESOURCE_PATH/$name").readText()
+fun readResource(name: String) = FILE_SYSTEM.read("$RESOURCE_PATH/$name".toPath()) { readUtf8() }

turf/src/jsTest/kotlin/io/github/elcolto/geokjson/turf/utils/FileSystem.js.kt

@@ -0,0 +1,6 @@
+package io.github.elcolto.geokjson.turf.utils
+
+import okio.FileSystem
+import okio.NodeJsFileSystem
+
+actual val FILE_SYSTEM: FileSystem = NodeJsFileSystem

turf/src/jvmTest/kotlin/io/github/elcolto/geokjson/turf/utils/FileSystem.jvm.kt

@@ -0,0 +1,5 @@
+package io.github.elcolto.geokjson.turf.utils
+
+import okio.FileSystem
+
+actual val FILE_SYSTEM: FileSystem = FileSystem.SYSTEM

turf/src/nativeTest/kotlin/io/github/elcolto/geokjson/turf/utils/FileSystem.native.kt

@@ -0,0 +1,5 @@
+package io.github.elcolto.geokjson.turf.utils
+
+import okio.FileSystem
+
+actual val FILE_SYSTEM: FileSystem = FileSystem.SYSTEM

turf/src/wasmJsTest/kotlin/io/github/elcolto/geokjson/turf/utils/FileSystem.wasmJs.kt

@@ -0,0 +1,5 @@
+package io.github.elcolto.geokjson.turf.utils
+
+import okio.FileSystem
+
+actual val FILE_SYSTEM: FileSystem = TODO("Not yet stable on Okio")