From 18d61bca87e73505866566eb5387684c27327821 Mon Sep 17 00:00:00 2001 From: KitsuneAlex Date: Wed, 19 Feb 2025 23:22:31 +0100 Subject: [PATCH 1/2] Update Kotlin JVM and Native to 2.1.10, update Gradle to 8.12.1 --- bench/include/kotlin-jvm/build.gradle.kts | 4 ++-- .../kotlin-jvm/gradle/wrapper/gradle-wrapper.properties | 2 +- bench/include/kotlin-jvm/settings.gradle.kts | 2 -- bench/include/kotlin-native/build.gradle.kts | 6 +++--- .../kotlin-native/gradle/wrapper/gradle-wrapper.properties | 2 +- bench/include/kotlin-native/settings.gradle.kts | 3 +-- 6 files changed, 8 insertions(+), 11 deletions(-) diff --git a/bench/include/kotlin-jvm/build.gradle.kts b/bench/include/kotlin-jvm/build.gradle.kts index bcf4bfb88..deb530178 100644 --- a/bench/include/kotlin-jvm/build.gradle.kts +++ b/bench/include/kotlin-jvm/build.gradle.kts @@ -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) @@ -23,7 +23,7 @@ repositories { application { // Define the main class for the application. - mainClassName = "MainKt" + mainClass = "MainKt" } dependencies { diff --git a/bench/include/kotlin-jvm/gradle/wrapper/gradle-wrapper.properties b/bench/include/kotlin-jvm/gradle/wrapper/gradle-wrapper.properties index 070cb702f..e382118b0 100644 --- a/bench/include/kotlin-jvm/gradle/wrapper/gradle-wrapper.properties +++ b/bench/include/kotlin-jvm/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/bench/include/kotlin-jvm/settings.gradle.kts b/bench/include/kotlin-jvm/settings.gradle.kts index c5a81eafd..85cd6d259 100644 --- a/bench/include/kotlin-jvm/settings.gradle.kts +++ b/bench/include/kotlin-jvm/settings.gradle.kts @@ -1,3 +1 @@ rootProject.name = "app" -// https://docs.gradle.org/7.0/release-notes.html -enableFeaturePreview("VERSION_CATALOGS") diff --git a/bench/include/kotlin-native/build.gradle.kts b/bench/include/kotlin-native/build.gradle.kts index dbf74fe11..44ca9d97d 100644 --- a/bench/include/kotlin-native/build.gradle.kts +++ b/bench/include/kotlin-native/build.gradle.kts @@ -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") @@ -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") } } } diff --git a/bench/include/kotlin-native/gradle/wrapper/gradle-wrapper.properties b/bench/include/kotlin-native/gradle/wrapper/gradle-wrapper.properties index 070cb702f..e382118b0 100644 --- a/bench/include/kotlin-native/gradle/wrapper/gradle-wrapper.properties +++ b/bench/include/kotlin-native/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/bench/include/kotlin-native/settings.gradle.kts b/bench/include/kotlin-native/settings.gradle.kts index 57aa0f2c3..c203e2a29 100644 --- a/bench/include/kotlin-native/settings.gradle.kts +++ b/bench/include/kotlin-native/settings.gradle.kts @@ -1,2 +1 @@ -// https://docs.gradle.org/7.0/release-notes.html -enableFeaturePreview("VERSION_CATALOGS") +rootProject.name = "app" \ No newline at end of file From 9f1d3bf9e159359a340f26edefc99c0d5b248621 Mon Sep 17 00:00:00 2001 From: KitsuneAlex Date: Thu, 20 Feb 2025 11:13:05 +0100 Subject: [PATCH 2/2] Upgrade CI upload action to latest version --- .github/workflows/bench.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml index 163d2231c..204a3da1b 100644 --- a/.github/workflows/bench.yml +++ b/.github/workflows/bench.yml @@ -227,7 +227,7 @@ jobs: pushd bench dotnet run -c Release --project tool -- --task test --langs ${{ matrix.lang }} popd - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 if: github.ref == 'refs/heads/main' with: name: build @@ -313,7 +313,7 @@ jobs: dotnet run -c Release --project tool -- --task test --ignore-missing dotnet run -c Release --project tool -- --task bench --ignore-missing popd - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: log path: bench/build/_results/**/*