backport -api and -bouncy modules to JDK 17

bitcoinj · Mar 8, 2024 · 6d4ad77 · 6d4ad77
1 parent cc5159c
commit 6d4ad77
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/secp256k1-api/build.gradle b/secp256k1-api/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 tasks.withType(JavaCompile).configureEach {
-    options.release = 21
+    options.release = 17
 }
 
 ext.moduleName = 'org.bitcoinj.secp256k1.api'

diff --git a/secp256k1-api/src/main/java/org/bitcoinj/secp256k1/api/Result.java b/secp256k1-api/src/main/java/org/bitcoinj/secp256k1/api/Result.java
@@ -29,10 +29,13 @@ static <T> Result<T> checked(int error_code, T result) {
     default T unwrap() {
         return unwrap("Error");
     }
-   default T unwrap(String message) {
-       return switch(this) {
-           case Ok<T> ok -> ok.result();
-           case Err<T> err -> throw new IllegalStateException(message + ": " + err.code());
-       };
-   }
+    default T unwrap(String message) {
+        if (this instanceof Ok<T> ok) {
+            return ok.result();
+        } else if (this instanceof Err<T> err) {
+           throw new IllegalStateException(message + ": " + err.code());
+        } else {
+            throw new IllegalStateException("Can't get here");
+        }
+    }
 }
diff --git a/secp256k1-bouncy/build.gradle b/secp256k1-bouncy/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 tasks.withType(JavaCompile).configureEach {
-    options.release = 21
+    options.release = 17
 }
 
 ext.moduleName = 'org.bitcoinj.secp256k1.bouncy'