Skip to content

Commit 1fb6ba2

Browse files
lppeddlppedd
committed
build: bump Kotlin to 2.3.0
1 parent 79b80e1 commit 1fb6ba2

File tree

5 files changed

+61
-20
lines changed

5 files changed

+61
-20
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
[![License](https://img.shields.io/github/license/petertrr/kotlin-multiplatform-diff)](https://github.com/petertrr/kotlin-multiplatform-diff/blob/main/LICENSE)
66
[![Maven Central](https://img.shields.io/maven-central/v/io.github.petertrr/kotlin-multiplatform-diff)](https://mvnrepository.com/artifact/io.github.petertrr)
77
[![Awesome Kotlin Badge](https://kotlin.link/awesome-kotlin.svg)](https://github.com/KotlinBy/awesome-kotlin)
8-
[![Kotlin](https://img.shields.io/badge/kotlin-2.2.21-blue.svg?logo=kotlin)](http://kotlinlang.org)
8+
[![Kotlin](https://img.shields.io/badge/kotlin-2.3.0-blue.svg?logo=kotlin)](http://kotlinlang.org)
99

1010
This is a port of [java-diff-utils](https://github.com/java-diff-utils/java-diff-utils) to Kotlin with multiplatform support.
1111
All credit for the implementation goes to the original authors.

‎build.gradle.kts‎

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
2+
import org.jetbrains.kotlin.gradle.dsl.JvmDefaultMode
23
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
34
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
45
import org.jetbrains.kotlin.gradle.targets.js.testing.KotlinJsTest
6+
import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnPlugin
7+
import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnRootEnvSpec
8+
import org.jetbrains.kotlin.gradle.targets.wasm.yarn.WasmYarnPlugin
9+
import org.jetbrains.kotlin.gradle.targets.wasm.yarn.WasmYarnRootEnvSpec
10+
import org.jetbrains.kotlin.gradle.targets.web.yarn.BaseYarnRootEnvSpec
511

612
plugins {
713
alias(libs.plugins.kotlinMultiplatform)
@@ -21,20 +27,17 @@ dependencies {
2127
kotlin {
2228
explicitApi()
2329
compilerOptions {
24-
apiVersion = KotlinVersion.KOTLIN_2_2
25-
languageVersion = KotlinVersion.KOTLIN_2_2
30+
apiVersion = KotlinVersion.KOTLIN_2_3
31+
languageVersion = KotlinVersion.KOTLIN_2_3
2632
}
2733

2834
jvm {
2935
compilations.configureEach {
3036
compileTaskProvider.configure {
3137
compilerOptions {
32-
// Minimum bytecode level is 52
33-
jvmTarget = JvmTarget.JVM_1_8
34-
35-
// Output interfaces with default methods
38+
jvmTarget = JvmTarget.JVM_1_8 // Minimum bytecode level is 52
39+
jvmDefault = JvmDefaultMode.NO_COMPATIBILITY // Output interfaces with default methods
3640
freeCompilerArgs.addAll(
37-
"-Xjvm-default=all", // Output interfaces with default methods
3841
"-Xno-param-assertions", // Remove Intrinsics.checkNotNullParameter
3942
)
4043
}
@@ -204,3 +207,16 @@ tasks {
204207
finalizedBy(jacocoReport)
205208
}
206209
}
210+
211+
val yarnConfig: BaseYarnRootEnvSpec.() -> Unit = {
212+
// Use the latest version of Yarn Classic
213+
version = "1.22.22"
214+
215+
// Disable a nagging console error.
216+
// See https://youtrack.jetbrains.com/issue/KT-52578
217+
ignoreScripts = false
218+
}
219+
220+
// Configure Yarn for all K/JS and K/WASM modules
221+
plugins.withType<YarnPlugin> { the<YarnRootEnvSpec>().apply(yarnConfig) }
222+
plugins.withType<WasmYarnPlugin> { the<WasmYarnRootEnvSpec>().apply(yarnConfig) }

‎gradle/libs.versions.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[versions]
2-
kotlin = "2.2.21"
2+
kotlin = "2.3.0"
33
detekt = "1.23.8"
44
dokka = "2.1.0"
55
vanniktech = "0.34.0"

‎kotlin-js-store/wasm/.gitkeep‎

Whitespace-only changes.

‎kotlin-js-store/yarn.lock‎

Lines changed: 36 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -249,10 +249,10 @@ js-yaml@^4.1.0:
249249
dependencies:
250250
argparse "^2.0.1"
251251

252-
kotlin-web-helpers@2.1.0:
253-
version "2.1.0"
254-
resolved "https://registry.yarnpkg.com/kotlin-web-helpers/-/kotlin-web-helpers-2.1.0.tgz#6cd4b0f0dc3baea163929c8638155b8d19c55a74"
255-
integrity sha512-NAJhiNB84tnvJ5EQx7iER3GWw7rsTZkX9HVHZpe7E3dDBD/dhTzqgSwNU3MfQjniy2rB04bP24WM9Z32ntUWRg==
252+
kotlin-web-helpers@3.0.0:
253+
version "3.0.0"
254+
resolved "https://registry.yarnpkg.com/kotlin-web-helpers/-/kotlin-web-helpers-3.0.0.tgz#3ed6b48f694f74bb60a737a9d7e2c0e3b29abdb9"
255+
integrity sha512-kdQO4AJQkUPvpLh9aglkXDRyN+CfXO7pKq+GESEnxooBFkQpytLrqZis3ABvmFN1cGw/ZQ/K38u5sRGW+NfBnw==
256256
dependencies:
257257
format-util "^1.0.5"
258258

@@ -288,10 +288,10 @@ minimatch@^9.0.4, minimatch@^9.0.5:
288288
resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.1.2.tgz#93a9626ce5e5e66bd4db86849e7515e92340a707"
289289
integrity sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==
290290

291-
[email protected].1:
292-
version "11.7.1"
293-
resolved "https://registry.yarnpkg.com/mocha/-/mocha-11.7.1.tgz#91948fecd624fb4bd154ed260b7e1ad3910d7c7a"
294-
integrity sha512-5EK+Cty6KheMS/YLPPMJC64g5V61gIR25KsRItHw6x4hEKT6Njp1n9LOlH4gpevuwMVS66SXaBBpg+RWZkza4A==
291+
[email protected].2:
292+
version "11.7.2"
293+
resolved "https://registry.yarnpkg.com/mocha/-/mocha-11.7.2.tgz#3c0079fe5cc2f8ea86d99124debcc42bb1ab22b5"
294+
integrity sha512-lkqVJPmqqG/w5jmmFtiRvtA2jkDyNVUcefFJKb2uyX4dekk8Okgqop3cgbFiaIvj8uCRJVTP5x9dfxGyXm2jvQ==
295295
dependencies:
296296
browser-stdout "^1.3.1"
297297
chokidar "^4.0.1"
@@ -420,7 +420,16 @@ source-map@^0.6.0:
420420
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
421421
integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
422422

423-
"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
423+
"string-width-cjs@npm:string-width@^4.2.0":
424+
version "4.2.3"
425+
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
426+
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
427+
dependencies:
428+
emoji-regex "^8.0.0"
429+
is-fullwidth-code-point "^3.0.0"
430+
strip-ansi "^6.0.1"
431+
432+
string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
424433
version "4.2.3"
425434
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
426435
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -438,7 +447,14 @@ string-width@^5.0.1, string-width@^5.1.2:
438447
emoji-regex "^9.2.2"
439448
strip-ansi "^7.0.1"
440449

441-
"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
450+
"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
451+
version "6.0.1"
452+
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
453+
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
454+
dependencies:
455+
ansi-regex "^5.0.1"
456+
457+
strip-ansi@^6.0.0, strip-ansi@^6.0.1:
442458
version "6.0.1"
443459
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
444460
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -483,7 +499,16 @@ workerpool@^9.2.0:
483499
resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-9.3.3.tgz#e75281fe62e851afb21cdeef8fa85f6a62ec3583"
484500
integrity sha512-slxCaKbYjEdFT/o2rH9xS1hf4uRDch1w7Uo+apxhZ+sf/1d9e0ZVkn42kPNGP2dgjIx6YFvSevj0zHvbWe2jdw==
485501

486-
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
502+
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
503+
version "7.0.0"
504+
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
505+
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
506+
dependencies:
507+
ansi-styles "^4.0.0"
508+
string-width "^4.1.0"
509+
strip-ansi "^6.0.0"
510+
511+
wrap-ansi@^7.0.0:
487512
version "7.0.0"
488513
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
489514
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==

0 commit comments

Comments
 (0)