Skip to content

Commit

Permalink
Update Gradle and JVM versions in klang project
Browse files Browse the repository at this point in the history
This commit updates the Gradle version to 8.5 from 8.4-rc-2 and adjusts JVM toolchain from version 17 to 21. Additionally, the versions of plugins kotlin("jvm") and kotlin("plugin.serialization") are updated, improving the compatibility and performance of the project.
  • Loading branch information
Alexandre Mommers committed Dec 7, 2023
1 parent d885c26 commit 53be6f1
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 16 deletions.
28 changes: 15 additions & 13 deletions klang/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
plugins {
kotlin("jvm") version "1.9.10"
kotlin("plugin.serialization") version "1.9.10"
id("org.jetbrains.kotlinx.kover") version "0.7.3"
kotlin("jvm") version "1.9.20"
kotlin("plugin.serialization") version "1.9.20"
id("org.jetbrains.kotlinx.kover") version "0.7.3"
id("com.gradle.plugin-publish") version "1.0.0"
}

val projectVersion = System.getenv("VERSION")
Expand All @@ -22,16 +23,18 @@ allprojects {
version = projectVersion

kotlin {
jvmToolchain(17)
jvmToolchain(21)

sourceSets.all {
languageSettings {
java {
sourceCompatibility = JavaVersion.VERSION_21
targetCompatibility = JavaVersion.VERSION_21
}
languageVersion = "2.0"
}
sourceSets.all {
languageSettings {
java {
sourceCompatibility = JavaVersion.VERSION_21
targetCompatibility = JavaVersion.VERSION_21
}
languageVersion = "2.0"
}
}
}

publishing {

Expand All @@ -57,4 +60,3 @@ allprojects {
}
}


4 changes: 2 additions & 2 deletions klang/gradle-plugin/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id("com.gradle.plugin-publish") version "1.0.0"
kotlin("jvm") version "1.9.0"
kotlin("jvm")
id("com.gradle.plugin-publish")
}

gradlePlugin {
Expand Down
2 changes: 1 addition & 1 deletion klang/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-rc-2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down

0 comments on commit 53be6f1

Please sign in to comment.