omnij-cli Module: require Java 21

OmniLayer · Sep 28, 2023 · 0cea79e · 0cea79e
1 parent acdbbcd
commit 0cea79e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/.github/workflows/graalvm.yml b/.github/workflows/graalvm.yml
@@ -8,7 +8,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macOS-latest]
-        java-version: [ '17', '21' ]
+        java-version: [ '21' ]
         distribution: [ 'graalvm-community' ]
       fail-fast: false
     name: ${{ matrix.os }} JDK ${{ matrix.java-version }}.${{ matrix.distribution }}

diff --git a/omnij-cli/build.gradle b/omnij-cli/build.gradle
@@ -6,7 +6,7 @@ plugins {
 ext.moduleName = 'foundation.omni.cli'
 
 tasks.withType(JavaCompile).configureEach {
-    options.release = 17
+    options.release = 21
 }
 
 configurations {

diff --git a/settings.gradle b/settings.gradle
@@ -19,9 +19,15 @@ include 'omnij-rest-client-jdk'        // JDK Omni REST client (using java.net.h
 include 'omnij-rpc'                    // Omni JSON-RPC + Groovy + Integration tests
 
 if (JavaVersion.current().compareTo(JavaVersion.VERSION_17) >= 0) {
-    System.err.println "Including JDK 17 modules because Java ${JavaVersion.current()} is JDK 17+"
-    include 'omnij-cli'
+    System.err.println "Including JDK 17 modules because Java is ${JavaVersion.current()}"
     include 'omnij-tx-records'
 } else {
     System.err.println "Skipping JDK 17 subprojects, requires Java 17+, currently running Java ${JavaVersion.current()}"
 }
+
+if (JavaVersion.current().compareTo(JavaVersion.VERSION_21) >= 0) {
+    System.err.println "Including JDK 21 modules because Java is ${JavaVersion.current()}"
+    include 'omnij-cli'
+} else {
+    System.err.println "Skipping JDK 21 modules, currently running Java ${JavaVersion.current()}"
+}