Ensure library is compatible with older java compilers (>= Java 11) (#3)

* Ensure library compatible with older java compilers * Revert kotlin upgrade * Remove java block where not required
camassia-io · Mar 25, 2024 · 3bcdd1d · 3bcdd1d
1 parent c99dc2c
commit 3bcdd1d
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 19 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -24,7 +24,9 @@ subprojects {
         withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
             kotlinOptions {
                 freeCompilerArgs = listOf("-Xjsr305=strict")
-                jvmTarget = "13"
+
+                // Users of this project need the below Java Version as a minimum
+                jvmTarget = "11"
             }
         }
     }

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -3,4 +3,4 @@ rootProject.name = "spring-boot-test-dbunit"
 include("spring-boot-test-dbunit")
 include("spring-boot-test-dbunit-demo")
 include("spring-boot-test-dbunit-integration-tests")
-include("spring-boot-test-dbunit-publishing-integration-tests")
+//include("spring-boot-test-dbunit-publishing-integration-tests")
diff --git a/spring-boot-test-dbunit-demo/build.gradle.kts b/spring-boot-test-dbunit-demo/build.gradle.kts
@@ -4,11 +4,6 @@ plugins {
     kotlin("plugin.spring") version "1.6.21"
 }
 
-java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
-}
-
 dependencies {
     implementation(project(":spring-boot-test-dbunit"))
     implementation("org.springframework.boot:spring-boot-starter-data-jdbc")

diff --git a/spring-boot-test-dbunit-integration-tests/build.gradle.kts b/spring-boot-test-dbunit-integration-tests/build.gradle.kts
@@ -4,11 +4,6 @@ plugins {
     kotlin("plugin.spring") version "1.6.21"
 }
 
-java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
-}
-
 dependencies {
     implementation(project(":spring-boot-test-dbunit"))
     implementation("org.springframework.boot:spring-boot-starter-data-jdbc")

diff --git a/spring-boot-test-dbunit-publishing-integration-tests/build.gradle.kts b/spring-boot-test-dbunit-publishing-integration-tests/build.gradle.kts
@@ -4,11 +4,6 @@ plugins {
     kotlin("plugin.spring") version "1.6.21"
 }
 
-java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
-}
-
 repositories {
     mavenCentral()
     maven("https://oss.sonatype.org/content/repositories/snapshots/")
@@ -39,4 +34,13 @@ tasks {
     bootJar {
         enabled = false
     }
+
+    withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
+        kotlinOptions {
+            freeCompilerArgs = listOf("-Xjsr305=strict")
+
+            // Users of this project need the below Java Version as a minimum
+            jvmTarget = JavaVersion.VERSION_17.toString()
+        }
+    }
 }
diff --git a/spring-boot-test-dbunit/build.gradle.kts b/spring-boot-test-dbunit/build.gradle.kts
@@ -12,8 +12,6 @@ repositories {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
     withSourcesJar()
     withJavadocJar()
 }