Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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 app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ dependencies {
application {
// Define the Fully Qualified Name for the application main class
// (Note that Kotlin compiles `App.kt` to a class with FQN `com.example.app.AppKt`.)
mainClass = "org.json5.app.AppKt"
mainClass.set("org.json5.app.AppKt")
}
17 changes: 13 additions & 4 deletions buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,20 @@ plugins {
`kotlin-dsl`
}

kotlin {
jvmToolchain(21) // Changed from 23 to 21
}
import org.gradle.jvm.toolchain.JavaLanguageVersion
import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension

//kotlin {
// // Correct way to set the JVM toolchain language version using the Kotlin extension
// // Ensure you have the necessary Kotlin plugin version that supports this
// (this as org.gradle.api.plugins.ExtensionAware).extensions.configure<KotlinJvmProjectExtension>("kotlin") {
// jvmToolchain {
// (this as org.gradle.jvm.toolchain.JavaToolchainSpec).languageVersion.set(JavaLanguageVersion.of(21))
// }
// }
//}
//
dependencies {
// Add a dependency on the Kotlin Gradle plugin, so that convention plugins can apply it.
implementation(libs.kotlinGradlePlugin)
implementation(libs.kotlinGradlePlugin) // libs might not be available if version catalog in buildSrc/settings.gradle.kts is also commented out
}
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/kotlin-jvm.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ plugins {

kotlin {
// Use a specific Java version to make it easier to work in different environments.
jvmToolchain(23)
jvmToolchain(21)
}

tasks.withType<Test>().configureEach {
Expand Down
4 changes: 1 addition & 3 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
networkTimeout=10000
validateDistributionUrl=true
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading
Loading