Skip to content

Update Kotlin JVM and Native to 2.1.10, update Gradle to 8.12.1 #463

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.

Sign up for GitHub

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Update Kotlin JVM and Native to 2.1.10, update Gradle to 8.12.1 #463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
18d61bc
Update Kotlin JVM and Native to 2.1.10, update Gradle to 8.12.1
KitsuneAlex Feb 19, 2025
9f1d3bf
Upgrade CI upload action to latest version
KitsuneAlex Feb 20, 2025
e369a6a
Merge branch 'main' into kotlin-update
hanabi1224 Mar 20, 2025
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
4 changes: 2 additions & 2 deletions bench/include/kotlin-jvm/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler
import org.jetbrains.kotlin.config.KotlinCompilerVersion

plugins {
val kotlinVersion = "2.0.21"
val kotlinVersion = "2.1.10"
kotlin("jvm").version(kotlinVersion)
kotlin("plugin.serialization").version(kotlinVersion)
// kotlin("plugin.spring").version(kotlinVersion)
Expand All @@ -23,7 +23,7 @@ repositories {

application {
// Define the main class for the application.
mainClassName = "MainKt"
mainClass = "MainKt"
}

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion bench/include/kotlin-jvm/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 0 additions & 2 deletions bench/include/kotlin-jvm/settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
rootProject.name = "app"
// https://docs.gradle.org/7.0/release-notes.html
enableFeaturePreview("VERSION_CATALOGS")
6 changes: 3 additions & 3 deletions bench/include/kotlin-native/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import org.jetbrains.kotlin.config.KotlinCompilerVersion
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget

plugins {
val kotlinVersion = "1.8.21"
val kotlinVersion = "2.1.10"
kotlin("multiplatform").version(kotlinVersion)
kotlin("plugin.serialization").version(kotlinVersion)
id("com.github.ben-manes.versions").version("0.46.0")
Expand All @@ -24,8 +24,8 @@ kotlin {
implementation(libs.bignum)
implementation(libs.kbignum)
// implementation("com.ionspin.kotlin:bignum:0.3.1")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.0")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1")
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0")
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion bench/include/kotlin-native/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
3 changes: 1 addition & 2 deletions bench/include/kotlin-native/settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
// https://docs.gradle.org/7.0/release-notes.html
enableFeaturePreview("VERSION_CATALOGS")
rootProject.name = "app"
Loading