Skip to content

Commit 2c9af2d

Browse files
authored
Merge pull request #21 from touchlab/gv/bump-kotlin-2.2
Updating kotlin to 2.2.0
2 parents 94ba8cd + fe4ddb0 commit 2c9af2d

File tree

9 files changed

+7472
-2019
lines changed

9 files changed

+7472
-2019
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,4 @@ build/
1313
.DS_Store
1414
.vscode
1515

16+
.kotlin/

build.gradle.kts

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
2-
import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
3-
import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension
42

53
plugins {
64
alias(libs.plugins.kotlin.multiplatform)
@@ -47,7 +45,6 @@ kotlin {
4745
browser()
4846
nodejs()
4947
}
50-
@OptIn(ExperimentalWasmDsl::class)
5148
wasmJs {
5249
browser()
5350
nodejs()
@@ -58,7 +55,7 @@ kotlin {
5855
common {
5956
group("jsAndWasmJs") {
6057
withJs()
61-
withWasm()
58+
withWasmJs()
6259
}
6360
}
6461
}
@@ -67,9 +64,3 @@ kotlin {
6764
implementation(kotlin("test"))
6865
}
6966
}
70-
71-
// https://github.com/Kotlin/kotlin-wasm-examples/commit/701a051d6ee869abcabebff702b3ccd98d51c38d
72-
rootProject.the<NodeJsRootExtension>().apply {
73-
nodeVersion = "21.0.0-v8-canary202309143a48826a08"
74-
nodeDownloadBaseUrl = "https://nodejs.org/download/v8-canary"
75-
}

gradle.properties

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ SONATYPE_HOST=DEFAULT
1818
RELEASE_SIGNING_ENABLED=true
1919

2020
GROUP=co.touchlab
21-
VERSION_NAME=0.6.12
21+
VERSION_NAME=0.6.13
2222

2323
POM_ARTIFACT_ID=testhelp
2424

@@ -36,4 +36,6 @@ POM_LICENCE_DIST=repo
3636
POM_DEVELOPER_ID=kpgalligan
3737
POM_DEVELOPER_NAME=Kevin Galligan
3838
POM_DEVELOPER_ORG=Touchlab
39-
POM_DEVELOPER_URL=https://touchlab.co/
39+
POM_DEVELOPER_URL=https://touchlab.co/
40+
41+
kotlin.js.yarn=false

gradle/libs.versions.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[versions]
22

3-
mavenPublish = "0.27.0"
4-
kotlin = "1.9.23"
3+
mavenPublish = "0.33.0"
4+
kotlin = "2.2.0"
55

66
[libraries]
77

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)