Targeting: Java 8, 17, 21, 25

Author: scottf

.github/workflows/build-main.yml

@@ -10,11 +10,11 @@ jobs:
   build:
     strategy:
       matrix:
-        jdk: [ 21, 25 ]
+        tc: [ 8, 17, 21, 25 ]
     runs-on: ubuntu-latest
     env:
       BUILD_EVENT: ${{ github.event_name }}
-      TARGET_COMPATIBILITY: ${{ matrix.jdk }}
+      TARGET_COMPATIBILITY: ${{ matrix.tc }}
       OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
       OSSRH_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
       SIGNING_KEY_ID: ${{ secrets.SIGNING_KEY_ID }}
@@ -24,7 +24,7 @@ jobs:
       - name: Setup JDK
         uses: actions/setup-java@v5
         with:
-          java-version: ${{ matrix.jdk }}
+          java-version: 25
           distribution: 'temurin'
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v5
@@ -41,7 +41,7 @@ jobs:
         with:
           github-token: ${{ secrets.COVERALLS_REPO_TOKEN }}
           parallel: true
-          flag-name: jdk-${{ matrix.jdk }}
+          flag-name: tc${{ matrix.tc }}
       - name: Publish Snapshot
         run: ./gradlew -i publishToSonatype
 
@@ -54,4 +54,4 @@ jobs:
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           parallel-finished: true
-          carryforward: "jdk-21"
+          carryforward: "tc8"

.github/workflows/build-pr.yml

@@ -9,16 +9,16 @@ jobs:
   build:
     strategy:
       matrix:
-        jdk: [ 21, 25 ]
+        tc: [ 8, 17, 21, 25 ]
     runs-on: ubuntu-latest
     env:
       BUILD_EVENT: ${{ github.event_name }}
-      TARGET_COMPATIBILITY: ${{ matrix.jdk }}
+      TARGET_COMPATIBILITY: ${{ matrix.tc }}
     steps:
       - name: Setup JDK
         uses: actions/setup-java@v5
         with:
-          java-version: ${{ matrix.jdk }}
+          java-version: 25
           distribution: 'temurin'
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v5
@@ -35,7 +35,7 @@ jobs:
         with:
           github-token: ${{ secrets.COVERALLS_REPO_TOKEN }}
           parallel: true
-          flag-name: jdk-${{ matrix.jdk }}
+          flag-name: tc${{ matrix.tc }}
 
   coveralls-finish:
     needs: build
@@ -46,4 +46,4 @@ jobs:
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           parallel-finished: true
-          carryforward: "jdk-21"
+          carryforward: "tc8"

.github/workflows/build-release.yml

@@ -11,11 +11,11 @@ jobs:
   build:
     strategy:
       matrix:
-        jdk: [ 21, 25 ]
+        tc: [ 8, 17, 21, 25 ]
     runs-on: ubuntu-latest
     env:
       BUILD_EVENT: ${{ github.event_name }}
-      TARGET_COMPATIBILITY: ${{ matrix.jdk }}
+      TARGET_COMPATIBILITY: ${{ matrix.tc }}
       OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
       OSSRH_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
       SIGNING_KEY_ID: ${{ secrets.SIGNING_KEY_ID }}
@@ -25,17 +25,15 @@ jobs:
       - name: Setup JDK
         uses: actions/setup-java@v5
         with:
-          java-version: ${{ matrix.jdk }}
+          java-version: 25
           distribution: 'temurin'
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v5
         with:
           gradle-version: current
       - name: Check out code
         uses: actions/checkout@v4
-      - name: Build and Test
-        run: chmod +x gradlew && ./gradlew clean test
-      - name: Verify Javadoc
-        run: ./gradlew javadoc
-      - name: Verify, Sign and Publish Release
-        run: ./gradlew -i publishToSonatype closeAndReleaseSonatypeStagingRepository
+      - name: Prepare Gradle Script
+        run: chmod +x gradlew && ./gradlew
+      - name: Build, Sign and Publish Release
+        run: ./gradlew clean compileJava publishToSonatype closeAndReleaseSonatypeStagingRepository

build.gradle

@@ -15,15 +15,19 @@ group = 'io.nats'
 
 def isRelease = System.getenv("BUILD_EVENT") == "release"
 def tc = System.getenv("TARGET_COMPATIBILITY")
-def targetId =          tc == "25" ? "25"                   : "21"
-def targetJavaVersion = tc == "25" ? JavaVersion.VERSION_25 : JavaVersion.VERSION_21
-def artifact = "nkeys-java-jdk" + targetId
-def bundleName = "io.nats.nkeys.java.jdk" + targetId
+def targetJavaVersion = tc == null ? JavaVersion.VERSION_1_8 : JavaVersion.toVersion(tc)
+def targetId = targetJavaVersion.toString()
+def artifact = "nkeys-java" + (targetJavaVersion == JavaVersion.VERSION_1_8 ? "" : "-jdk" + targetId)
+def bundleName = "io.nats.nkeys.java" + (targetJavaVersion == JavaVersion.VERSION_1_8 ? "" : ".jdk" + targetId)
+
+System.out.println("targetCompatibility: " + targetId)
+System.out.println("artifact: " + artifact)
+System.out.println("bundleName: " + bundleName)
 
 version = isRelease ? jarVersion : jarVersion + "-SNAPSHOT" // version is the variable the gradle uses.
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_21
+    sourceCompatibility = JavaVersion.VERSION_1_8
     targetCompatibility = targetJavaVersion
     withSourcesJar()
     withJavadocJar()
@@ -41,6 +45,8 @@ dependencies {
 
     testImplementation 'org.junit.jupiter:junit-jupiter:5.7.0'
     testImplementation 'nl.jqno.equalsverifier:equalsverifier:3.12.3'
+
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 }
 
 tasks.register('bundle', Bundle) {

src/main/java/io/nats/nkey/NKey.java

@@ -31,15 +31,16 @@
 
 public class NKey {
 
-    private static boolean notValidPublicPrefixByte(int prefix) {
-        return switch (prefix) {
-            case PREFIX_BYTE_SERVER,
-                 PREFIX_BYTE_CLUSTER,
-                 PREFIX_BYTE_OPERATOR,
-                 PREFIX_BYTE_ACCOUNT,
-                 PREFIX_BYTE_USER -> false;
-            default -> true;
-        };
+    static boolean notValidPublicPrefixByte(int prefix) {
+        switch (prefix) {
+            case PREFIX_BYTE_SERVER:
+            case PREFIX_BYTE_CLUSTER:
+            case PREFIX_BYTE_OPERATOR:
+            case PREFIX_BYTE_ACCOUNT:
+            case PREFIX_BYTE_USER:
+                return false;
+        }
+        return true;
     }
 
     static char[] removePaddingAndClear(char[] withPad) {
@@ -466,14 +467,14 @@ public boolean verify(byte[] input, byte[] signature) throws IOException {
 
     @Override
     public boolean equals(Object o) {
-        if (o == this) {
+        if (o == this)
             return true;
-            }
-
-        if (!(o instanceof NKey otherNkey)) {
+        if (!(o instanceof NKey)) {
             return false;
         }
 
+        NKey otherNkey = (NKey) o;
+
         if (this.type != otherNkey.type) {
             return false;
         }

src/main/java/io/nats/nkey/NKeyType.java

@@ -55,13 +55,14 @@ public enum NKeyType {
     }
 
     public static @Nullable NKeyType fromPrefix(int prefix) {
-        return switch (prefix) {
-            case PREFIX_BYTE_ACCOUNT, PREFIX_BYTE_PRIVATE -> ACCOUNT;
-            case PREFIX_BYTE_SERVER -> SERVER;
-            case PREFIX_BYTE_USER -> USER;
-            case PREFIX_BYTE_CLUSTER -> CLUSTER;
-            case PREFIX_BYTE_OPERATOR -> OPERATOR;
-            default -> null;
-        };
+        switch (prefix) {
+            case PREFIX_BYTE_ACCOUNT:
+            case PREFIX_BYTE_PRIVATE:  return ACCOUNT;
+            case PREFIX_BYTE_SERVER:   return SERVER;
+            case PREFIX_BYTE_USER:     return USER;
+            case PREFIX_BYTE_CLUSTER:  return CLUSTER;
+            case PREFIX_BYTE_OPERATOR: return OPERATOR;
+        }
+        return null;
     }
 }