Skip to content

Commit 8da8623

Browse files
committed
chore: upgrade kotlin → 2.3.0-RC
Signed-off-by: Sam Gammon <[email protected]>
1 parent 779f244 commit 8da8623

File tree

10 files changed

+22
-16
lines changed

10 files changed

+22
-16
lines changed

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ versions.java.language = 21
7979
versions.java.toolchain = 25
8080
versions.java.minimum = 21
8181
versions.java.target = 21
82-
versions.kotlin.sdk = 2.2.21
82+
versions.kotlin.sdk = 2.3.0-RC
8383
versions.kotlin.language = 2.1
8484
versions.android.sdk.target = 33
8585

gradle/elide.versions.toml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -137,9 +137,9 @@ kotest-plugin = "0.8.18"
137137
kotlin-compile-testing = "1.6.0"
138138
kotlin-dataframe = "0.11.0"
139139
kotlin-language = "2.1"
140-
kotlin-sdk = "2.2.21"
140+
kotlin-sdk = "2.3.0-RC"
141141
kotlinpoet = "2.2.0"
142-
kotlinx-abiValidator = "0.17.0"
142+
kotlinx-abiValidator = "0.18.1"
143143
kotlinx-benchmark = "0.4.13"
144144
kotlinx-browser = "0.1"
145145
kotlinx-collections = "0.4.0"
@@ -188,7 +188,7 @@ kotlinx-wrappers-web = "1.0.0-pre.754"
188188
kotlinxWrappers = "pre.754"
189189
kover = "0.9.1"
190190
kover-plugin = "0.9.1"
191-
ksp = "2.2.21-2.0.4"
191+
ksp = "2.3.2"
192192
ktor = "3.3.1"
193193
ktlint = "1.1.1"
194194
ktoml = "0.7.1"
@@ -261,7 +261,7 @@ qodanaGradle = "2023.3.1"
261261
r8 = "1.4.45"
262262
react = "19.0.0"
263263
reactivestreams = "1.0.4"
264-
redacted-plugin = "1.15.0"
264+
redacted-plugin = "1.16.0-rc1"
265265
sarif4k = "0.6.0"
266266
semver = "6.0.0"
267267
shadow-plugin = "8.1.1"
@@ -344,7 +344,6 @@ pkl = { id = "org.pkl-lang", version.ref = "pkl" }
344344
pluginPublish = { id = "com.gradle.plugin-publish", version.ref = "pluginPublish" }
345345
protobuf = { id = "com.google.protobuf", version.ref = "pluginProtobuf" }
346346
qodana = { id = "org.jetbrains.qodana", version.ref = "qodanaGradle" }
347-
redacted = { id = "dev.zacsweers.redacted", version.ref = "redacted-plugin" }
348347
reflekt = { id = "org.jetbrains.reflekt", version.ref = "kotlin-sdk" }
349348
shadow = { id = "com.github.johnrengelman.shadow", version.ref = "shadow-plugin" }
350349
sigstore = { id = "dev.sigstore.sign", version.ref = "sigstore" }
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
kotlin("jvm") version "2.2.21"
2+
kotlin("jvm") version "2.3.0-RC"
33
}
44

55
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile>().configureEach {
@@ -8,6 +8,6 @@ tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile>().configureEa
88

99
dependencies {
1010
implementation("com.google.guava:guava:33.4.8-jre")
11-
testImplementation("org.jetbrains.kotlin:kotlin-test:2.2.21")
11+
testImplementation("org.jetbrains.kotlin:kotlin-test:2.3.0-RC")
1212
}
1313

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
kotlin("jvm") version "2.2.21"
2+
kotlin("jvm") version "2.3.0-RC"
33
}
44

55
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile>().configureEach {
@@ -8,6 +8,6 @@ tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile>().configureEa
88

99
dependencies {
1010
implementation("com.google.guava:guava:33.4.8-jre")
11-
testImplementation("org.jetbrains.kotlin:kotlin-test:2.2.21")
11+
testImplementation("org.jetbrains.kotlin:kotlin-test:2.3.0-RC")
1212
}
1313

packages/graalvm-kt/api/graalvm-kt.api

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public final class elide/runtime/gvm/kotlin/KotlinCompilerConfig$Companion {
2626
public static synthetic fun getDefaultPlugins$default (Lelide/runtime/gvm/kotlin/KotlinCompilerConfig$Companion;ZILjava/lang/Object;)Ljava/util/List;
2727
}
2828

29-
public final class elide/runtime/gvm/kotlin/KotlinCompilerConfig$KotlinBuiltinPlugin : java/lang/Enum, elide/runtime/gvm/kotlin/KotlinCompilerConfig$KotlinPluginConfig {
29+
public abstract class elide/runtime/gvm/kotlin/KotlinCompilerConfig$KotlinBuiltinPlugin : java/lang/Enum, elide/runtime/gvm/kotlin/KotlinCompilerConfig$KotlinPluginConfig {
3030
public static final field KAPT Lelide/runtime/gvm/kotlin/KotlinCompilerConfig$KotlinBuiltinPlugin;
3131
public static final field POWER_ASSERT Lelide/runtime/gvm/kotlin/KotlinCompilerConfig$KotlinBuiltinPlugin;
3232
public static final field REDACTED Lelide/runtime/gvm/kotlin/KotlinCompilerConfig$KotlinBuiltinPlugin;

packages/graalvm-kt/src/main/kotlin/elide/runtime/gvm/kotlin/KotlinLanguage.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import elide.runtime.gvm.kotlin.feature.KotlinResource
2727
private const val KOTLIN_ID = "kotlin"
2828
private const val KOTLIN_NAME = "Kotlin"
2929
private const val KOTLIN_IMPL = "Kotlin/JVM (Espresso)"
30-
private const val KOTLIN_IMPL_VERSION = "2.2.21"
30+
private const val KOTLIN_IMPL_VERSION = "2.3.0-RC"
3131
private const val KOTLIN_MIME_TYPE = "application/x-kotlin"
3232

3333
/**

packages/tooling/src/main/kotlin/elide/tooling/jvm/JvmLibraries.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import elide.tooling.project.ElideConfiguredProject
2424
public object JvmLibraries {
2525
// @TODO: don't hard-code any of this
2626
public const val ELIDE_VERSION: String = "1.0.0-beta10"
27-
public const val EMBEDDED_KOTLIN: String = "2.2.21"
27+
public const val EMBEDDED_KOTLIN: String = "2.3.0-RC"
2828

2929
public const val EMBEDDED_JUNIT_VERSION: String = "5.13.1"
3030
public const val EMBEDDED_JUNIT_PLATFORM_VERSION: String = "1.13.1"
@@ -35,7 +35,7 @@ public object JvmLibraries {
3535
public const val EMBEDDED_KOTLINX_IO_VERSION: String = "0.8.0"
3636
public const val EMBEDDED_COROUTINES_VERSION: String = "1.10.2"
3737
public const val EMBEDDED_SERIALIZATION_VERSION: String = "1.9.0"
38-
public const val EMBEDDED_REDACTED_VERSION: String = "1.15.0"
38+
public const val EMBEDDED_REDACTED_VERSION: String = "1.16.0-rc1"
3939
public const val APIGUARDIAN_API: String = "org.apiguardian:apiguardian-api"
4040
public const val JUNIT_JUPITER_API: String = "org.junit.jupiter:junit-jupiter-api"
4141
public const val JUNIT_JUPITER_ENGINE: String = "org.junit.jupiter:junit-jupiter-engine"

settings.gradle.kts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,13 @@ pluginManagement {
3939
includeGroup("com.google.devtools.ksp.gradle.plugin")
4040
}
4141
}
42+
maven {
43+
name = "elide-plugins"
44+
url = uri("https://maven.elide.dev")
45+
content {
46+
includeGroup("dev.zacsweers.redacted")
47+
}
48+
}
4249
gradlePluginPortal()
4350
mavenCentral()
4451
google()

tools/elide-build/src/main/kotlin/elide/internal/conventions/Constants.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public object Constants {
8484
const val KOTLIN = "versions.kotlin.language"
8585

8686
/** Constant: default Kotlin SDK version if no other version is defined. */
87-
const val KOTLIN_SDK_PIN = "2.2.21"
87+
const val KOTLIN_SDK_PIN = "2.3.0-RC"
8888

8989
/** Constant: pinned version of Kotlin Coroutines. */
9090
const val COROUTINES = "1.10.2"

tools/images/codespace/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ARG IBAZEL_VERSION=v0.15.10
66
ARG NODE_VERSION="23"
77
ARG YARN_VERSION="berry"
88
ARG GRADLE_VERSION=8.12
9-
ARG KOTLIN_VERSION=2.2.21
9+
ARG KOTLIN_VERSION=2.3.0-RC
1010
ARG LLVM_VERSION=18
1111
ARG GRADLE_DIST=bin
1212
ARG INSTALL_ZSH="true"

0 commit comments

Comments
 (0)