Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate to kotlin 1.9.20 #150

Merged
merged 5 commits into from
Nov 10, 2023
Merged
Show file tree
Hide file tree
Changes from 4 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
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/), and this
project adheres to [Semantic Versioning](https://semver.org/).

## [0.8.2]
### Changed
- Bump kotlin to 1.9.20
- Rename "wasm" target to "wasmJs" (required by kotlin 1.9.20)

## [0.8.1] - 2023-08-25
### Changed
- Set apiVersion and languageVersion on the JVM for better compatibility (#147)
Expand Down
17 changes: 6 additions & 11 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinNativeCompile
import org.jetbrains.kotlin.konan.target.HostManager

plugins {
kotlin("multiplatform") version "1.9.0"
kotlin("multiplatform") version "1.9.20"
id("org.jetbrains.dokka") version "1.8.20"
id("maven-publish")
id("signing")
Expand Down Expand Up @@ -38,12 +38,12 @@ kotlin {
compilations.all {
kotlinOptions {
jvmTarget = "1.8"
apiVersion = "1.7"
languageVersion = "1.7"
benasher44 marked this conversation as resolved.
Show resolved Hide resolved
apiVersion = "1.9"
languageVersion = "1.9"
}
}
}
wasm {
wasmJs {
d8()
}
if (HostManager.hostIsMac) {
Expand Down Expand Up @@ -75,7 +75,7 @@ kotlin {
sourceSets {
val commonMain by getting {
dependencies {
implementation("org.jetbrains.kotlin:kotlin-stdlib:1.7.21")
implementation("org.jetbrains.kotlin:kotlin-stdlib:1.9.20")
}
}
val commonTest by getting {
Expand All @@ -87,12 +87,7 @@ kotlin {
val nonJvmMain by creating { dependsOn(commonMain) }
val nonJvmTest by creating { dependsOn(commonTest) }
val jsMain by getting { dependsOn(nonJvmMain) }
val wasmMain by getting {
dependsOn(nonJvmMain)
dependencies {
implementation("org.jetbrains.kotlin:kotlin-stdlib-wasm")
}
}
val wasmJsMain by getting { dependsOn(nonJvmMain) }
val jsTest by getting { dependsOn(nonJvmTest) }
val nativeMain by creating { dependsOn(nonJvmMain) }
val nativeTest by creating { dependsOn(nonJvmTest) }
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ kotlin.code.style=official
kotlin.incremental=true

GROUP=com.benasher44
VERSION=0.8.1
VERSION=0.8.2

POM_URL=https://github.com/benasher44/uuid/
POM_SCM_URL=https://github.com/benasher44/uuid/
Expand Down
File renamed without changes.