Refactor: java versions in root build.gradle

prdoyle · Aug 27, 2024 · 3077c9f · 3077c9f
1 parent d6b58e5
commit 3077c9f
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 18 deletions.
diff --git a/bosk-annotations/build.gradle b/bosk-annotations/build.gradle
@@ -6,12 +6,12 @@ plugins {
 
 java {
 	toolchain {
-		languageVersion = JavaLanguageVersion.of(22)
+		languageVersion = JavaLanguageVersion.of(jdkVersion)
 	}
 }
 
 compileJava {
-	options.release = 17
+	options.release = prodJavaVersion
 }
 
 compileTestJava {

diff --git a/bosk-core/build.gradle b/bosk-core/build.gradle
@@ -8,12 +8,12 @@ plugins {
 
 java {
 	toolchain {
-		languageVersion = JavaLanguageVersion.of(22)
+		languageVersion = JavaLanguageVersion.of(jdkVersion)
 	}
 }
 
 compileJava {
-	options.release = 17
+	options.release = prodJavaVersion
 }
 
 compileTestJava {

diff --git a/bosk-jackson/build.gradle b/bosk-jackson/build.gradle
@@ -7,12 +7,12 @@ plugins {
 
 java {
 	toolchain {
-		languageVersion = JavaLanguageVersion.of(22)
+		languageVersion = JavaLanguageVersion.of(jdkVersion)
 	}
 }
 
 compileJava {
-	options.release = 17
+	options.release = prodJavaVersion
 }
 
 compileTestJava {

diff --git a/bosk-logback/build.gradle b/bosk-logback/build.gradle
@@ -7,12 +7,12 @@ plugins {
 
 java {
 	toolchain {
-		languageVersion = JavaLanguageVersion.of(22)
+		languageVersion = JavaLanguageVersion.of(jdkVersion)
 	}
 }
 
 compileJava {
-	options.release = 17
+	options.release = prodJavaVersion
 }
 
 compileTestJava {

diff --git a/bosk-mongo/build.gradle b/bosk-mongo/build.gradle
@@ -12,12 +12,12 @@ base {
 
 java {
 	toolchain {
-		languageVersion = JavaLanguageVersion.of(22)
+		languageVersion = JavaLanguageVersion.of(jdkVersion)
 	}
 }
 
 compileJava {
-	options.release = 17
+	options.release = prodJavaVersion
 }
 
 compileTestJava {

diff --git a/bosk-spring-boot-3/build.gradle b/bosk-spring-boot-3/build.gradle
@@ -7,12 +7,12 @@ plugins {
 
 java {
 	toolchain {
-		languageVersion = JavaLanguageVersion.of(22)
+		languageVersion = JavaLanguageVersion.of(jdkVersion)
 	}
 }
 
 compileJava {
-	options.release = 17
+	options.release = prodJavaVersion
 }
 
 compileTestJava {

diff --git a/bosk-testing/build.gradle b/bosk-testing/build.gradle
@@ -7,12 +7,12 @@ plugins {
 
 java {
 	toolchain {
-		languageVersion = JavaLanguageVersion.of(22)
+		languageVersion = JavaLanguageVersion.of(jdkVersion)
 	}
 }
 
 compileJava {
-	options.release = 17
+	options.release = prodJavaVersion
 }
 
 compileTestJava {

diff --git a/build.gradle b/build.gradle
@@ -5,6 +5,11 @@ plugins {
 	id 'io.github.gradle-nexus.publish-plugin' version '2.0.0'
 }
 
+ext {
+	prodJavaVersion = 17
+	jdkVersion = 22
+}
+
 repositories {
 	maven {
 		url 'https://plugins.gradle.org/m2/'

diff --git a/example-hello/build.gradle b/example-hello/build.gradle
@@ -9,16 +9,16 @@ version = '0.0.1-SNAPSHOT'
 
 java {
 	toolchain {
-		languageVersion = JavaLanguageVersion.of(22)
+		languageVersion = JavaLanguageVersion.of(jdkVersion)
 	}
 }
 
 compileJava {
-	options.release = 17
+	options.release = prodJavaVersion
 }
 
 compileTestJava {
-	options.release = 22
+	options.release = null
 }
 
 configurations {

diff --git a/lib-testing/build.gradle b/lib-testing/build.gradle
@@ -5,7 +5,7 @@ plugins {
 
 java {
 	toolchain {
-		languageVersion = JavaLanguageVersion.of(22)
+		languageVersion = JavaLanguageVersion.of(jdkVersion)
 	}
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,7 @@ plugins { @@
     java {
     	toolchain {
-    		languageVersion = JavaLanguageVersion.of(22)
+    		languageVersion = JavaLanguageVersion.of(jdkVersion)
     	}
     }
@@ Expand Down @@