Skip to content

Bump to Kotlin 2.4.0 #19

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
tKe wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Bump to Kotlin 2.4.0 #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion build-logic/src/main/kotlin/conventions.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ repositories {

group = "io.exoquery"
// Everything inherits the version from here
version = "2.3.0-2.0.1.PL"
version = "2.4.0-2.0.1.PL"

object Versions {
val decomatVersion = "0.3.0"
Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
kotlin("multiplatform") version "2.3.0" apply false
kotlin("multiplatform") version "2.4.0" apply false
id("io.github.gradle-nexus.publish-plugin") version "1.1.0" apply false
}

Expand Down
2 changes: 1 addition & 1 deletion terpal-plugin-gradle/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
kotlin("jvm") version "2.3.0"
kotlin("jvm") version "2.4.0"

// No inclusion of `publish` here because this project is not published to maven directly
id("maven-publish")
Expand Down
5 changes: 2 additions & 3 deletions terpal-plugin-kotlin/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
kotlin("jvm") version "2.3.0"
kotlin("jvm") version "2.4.0"
id("maven-publish")
id("conventions")
id("publish-jvm")
kotlin("kapt") version "2.3.0"
kotlin("kapt") version "2.4.0"
}

kotlin {
Expand All @@ -14,7 +14,6 @@ kotlin {

tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile>().configureEach {
compilerOptions {
freeCompilerArgs.add("-Xcontext-parameters")
// Otherwise will have: Could not resolve io.exoquery:pprint-kotlin:2.0.1.
// Incompatible because this component declares a component, compatible with Java 11 and the consumer needed a component, compatible with Java 8
java {
Expand Down
3 changes: 2 additions & 1 deletion terpal-plugin-kotlin/src/main/kotlin/io/exoquery/terpal/plugin/logging/CompileLogger.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocationWithRange
import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity
import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSourceLocation
import org.jetbrains.kotlin.cli.common.messages.MessageCollector
import org.jetbrains.kotlin.config.CommonConfigurationKeys
import org.jetbrains.kotlin.config.CompilerConfiguration
import org.jetbrains.kotlin.ir.IrElement
import org.jetbrains.kotlin.ir.declarations.IrFile
Expand All @@ -24,7 +25,7 @@ data class CompileLogger(val messageCollector: MessageCollector, val currentFile

companion object {
operator fun invoke(config: CompilerConfiguration, currentFile: IrFile, macroCallSite: IrElement) =
config.get(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY, MessageCollector.NONE).let {
config.get(CommonConfigurationKeys.MESSAGE_COLLECTOR_KEY, MessageCollector.NONE).let {
CompileLogger(it, currentFile, macroCallSite)
}
}
Expand Down
2 changes: 1 addition & 1 deletion terpal-runtime/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import org.jetbrains.kotlin.konan.target.HostManager

plugins {
kotlin("multiplatform") version "2.3.0"
kotlin("multiplatform") version "2.4.0"

id("maven-publish")
id("conventions-multiplatform")
Expand Down
2 changes: 1 addition & 1 deletion testing/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
id("io.exoquery.terpal-plugin")
id("conventions-multiplatform")
kotlin("multiplatform") version "2.3.0"
kotlin("multiplatform") version "2.4.0"
}

kotlin {
Expand Down