From 0802e4ff0980d14e07437edf5b57de99e7f90bc8 Mon Sep 17 00:00:00 2001 From: Edoardo Luppi Date: Tue, 14 May 2024 11:11:36 +0200 Subject: [PATCH 1/5] build: bump Kotlin to 1.9.24 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 16b9c3e..6ec1fba 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -kotlin = "1.9.23" +kotlin = "1.9.24" detekt = "1.23.5" dokka = "1.9.10" nexus = "1.3.0" From 5de45d25b1635c4b59801bf3ae5c3712ba721a4f Mon Sep 17 00:00:00 2001 From: Edoardo Luppi Date: Tue, 14 May 2024 11:12:14 +0200 Subject: [PATCH 2/5] build: bump Dokka to 1.9.20 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 6ec1fba..5700d6d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] kotlin = "1.9.24" detekt = "1.23.5" -dokka = "1.9.10" +dokka = "1.9.20" nexus = "1.3.0" [plugins] From 23c5271f03badd3454515ec0dd95ddcf0febcfb6 Mon Sep 17 00:00:00 2001 From: Edoardo Luppi Date: Tue, 14 May 2024 11:22:56 +0200 Subject: [PATCH 3/5] build: support wasmJs and wasmWasi --- README.md | 1 + build.gradle.kts | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/README.md b/README.md index 811fd82..635631b 100644 --- a/README.md +++ b/README.md @@ -21,6 +21,7 @@ Please refer to the original guides for more information. Currently, artifacts for the following platforms are supported: * JVM * JS (both browser and Node.js) +* WebAssembly (JS and WASI) * LinuxX64 * MingwX64 * MacosX64 diff --git a/build.gradle.kts b/build.gradle.kts index 54f4375..2cf2a7a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -6,6 +6,7 @@ import io.gitlab.arturbosch.detekt.Detekt import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi import org.jetbrains.kotlin.gradle.dsl.JvmTarget import org.jetbrains.kotlin.gradle.dsl.KotlinVersion +import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl plugins { kotlin("multiplatform") @@ -51,6 +52,21 @@ kotlin { nodejs() } + @OptIn(ExperimentalWasmDsl::class) + wasmJs { + browser() + nodejs() + applyBinaryen() + } + + @OptIn(ExperimentalWasmDsl::class) + wasmWasi { + nodejs() + + // Available since 2.0 + // applyBinaryen() + } + linuxX64() mingwX64() macosX64() From 377922dace601bb2e8bf342f3678ed1e9c58fa64 Mon Sep 17 00:00:00 2001 From: Edoardo Luppi Date: Tue, 14 May 2024 11:28:24 +0200 Subject: [PATCH 4/5] docs: refine readme --- README.md | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 635631b..0bc8e99 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ # kotlin-multiplatform-diff + ![Build and test](https://github.com/petertrr/kotlin-multiplatform-diff/workflows/Build%20and%20test/badge.svg) [![License](https://img.shields.io/github/license/petertrr/kotlin-multiplatform-diff)](https://github.com/petertrr/kotlin-multiplatform-diff/blob/main/LICENSE) [![codecov](https://codecov.io/gh/petertrr/kotlin-multiplatform-diff/branch/main/graph/badge.svg)](https://codecov.io/gh/petertrr/kotlin-multiplatform-diff) @@ -7,21 +8,29 @@ [![Maven Central](https://img.shields.io/maven-central/v/io.github.petertrr/kotlin-multiplatform-diff)](https://mvnrepository.com/artifact/io.github.petertrr) [![Awesome Kotlin Badge](https://kotlin.link/awesome-kotlin.svg)](https://github.com/KotlinBy/awesome-kotlin) -This is a port of [java-diff-utils](https://github.com/java-diff-utils/java-diff-utils) to kotlin -with multiplatform support. All credit for the implementation goes to original authors. +This is a port of [java-diff-utils](https://github.com/java-diff-utils/java-diff-utils) to Kotlin with multiplatform support. +All credit for the implementation goes to original authors. ## Features -All features from version 4.10 of the original library are present, except for: -* Unified diff, which heavily uses file read/write and therefore needs a more complicated rewrite for kotlin-multiplatform -* diff-utils-jgit, which uses JVM-only jgit library + +All features from version `4.10` of the original library are present, except for: + +- unified diff, which heavily uses file read/write and therefore needs a more complicated rewrite +- diff-utils-jgit, which uses JVM-only jgit library Please refer to the original guides for more information. -## Supported platforms +## Supported Platforms + Currently, artifacts for the following platforms are supported: -* JVM -* JS (both browser and Node.js) -* WebAssembly (JS and WASI) -* LinuxX64 -* MingwX64 -* MacosX64 + +- JVM +- JS (both browser and Node.js) +- WebAssembly (JS and WASI) +- Native + +The supported Native targets are: + +| Tier 1 | Tier 2 | Tier 3 | +|:---------|:---------|:---------| +| macosX64 | linuxX64 | mingwX64 | From 3aae232d5a8b755a2c1c56fd0dee1a71edd88351 Mon Sep 17 00:00:00 2001 From: Peter Trifanov Date: Sat, 18 May 2024 15:29:28 +0200 Subject: [PATCH 5/5] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0bc8e99..ffb68f6 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ Currently, artifacts for the following platforms are supported: - WebAssembly (JS and WASI) - Native -The supported Native targets are: +The supported Native targets are (following the Kotlin/Native [target support guidelines](https://kotlinlang.org/docs/native-target-support.html)): | Tier 1 | Tier 2 | Tier 3 | |:---------|:---------|:---------|