[CALCITE-6174] Remove property from gradle.properties

apache · May 23, 2024 · 9bcb7be · 9bcb7be
1 parent 1a6573f
commit 9bcb7be
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -212,6 +212,11 @@ tasks.withType<AutostyleTask>().configureEach {
     mustRunAfter(javaCCTest)
 }
 
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+}
 ide {
     fun generatedSource(javacc: TaskProvider<org.apache.calcite.buildtools.javacc.JavaCCTask>, sourceSet: String) =
         generatedJavaSources(javacc.get(), javacc.get().output.get().asFile, sourceSets.named(sourceSet))

diff --git a/gradle.properties b/gradle.properties
@@ -176,7 +176,3 @@ xercesImpl.version=2.9.1
 systemProp.sonar.organization=apache
 systemProp.sonar.projectKey=apache_calcite
 systemProp.sonar.host.url=https://sonarcloud.io
-
-# Default behavior before Gradle 8.x
-# according to https://kotlinlang.org/docs/gradle-configure-project.html#check-for-jvm-target-compatibility-of-related-compile-tasks
-kotlin.jvm.target.validation.mode = WARNING
diff --git a/testkit/build.gradle.kts b/testkit/build.gradle.kts
@@ -41,3 +41,9 @@ dependencies {
     testImplementation(kotlin("test"))
     testImplementation(kotlin("test-junit5"))
 }
+
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+}