patch jaffi with a version declaring a lower jni version

ngrok · Aug 15, 2024 · 8470f48 · 8470f48
1 parent 4c4782f
commit 8470f48
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 24 deletions.
diff --git a/flake.nix b/flake.nix
@@ -26,13 +26,15 @@
             fenix-flake.overlays.default
           ];
         };
-        rust-toolchain = pkgs.fenix.complete.withComponents [
-          "cargo"
-          "clippy"
-          "rust-src"
-          "rustc"
-          "rustfmt"
-          "rust-analyzer"
+        rust-toolchain = pkgs.fenix.combine [
+          (pkgs.fenix.complete.withComponents [
+            "cargo"
+            "clippy"
+            "rust-src"
+            "rustc"
+            "rustfmt"
+            "rust-analyzer"
+          ])
         ];
         java-toolchain = with pkgs; [
           openjdk17_headless
@@ -110,7 +112,7 @@
           CHALK_SOLVER_MAX_SIZE = 1500;
           OPENSSL_LIB_DIR = "${pkgs.openssl.out}/lib";
           OPENSSL_INCLUDE_DIR = "${pkgs.openssl.dev}/include";
-          RUSTC_WRAPPER="${pkgs.sccache}/bin/sccache";
+          RUSTC_WRAPPER = "${pkgs.sccache}/bin/sccache";
           JAVA_11_HOME = "${pkgs.openjdk11_headless}";
           JAVA_17_HOME = "${pkgs.openjdk17_headless}";
           buildInputs = with pkgs; [

diff --git a/ngrok-java-17/pom.xml b/ngrok-java-17/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>com.ngrok</groupId>
         <artifactId>ngrok-project</artifactId>
-        <version>1.1.0</version>
+        <version>1.1.1</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -46,7 +46,7 @@
         <dependency>
             <groupId>com.ngrok</groupId>
             <artifactId>ngrok-java</artifactId>
-            <version>1.1.0</version>
+            <version>1.1.1</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
@@ -55,4 +55,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-</project>
+</project>
diff --git a/ngrok-java-native/Cargo.lock b/ngrok-java-native/Cargo.lock
diff --git a/ngrok-java-native/Cargo.toml b/ngrok-java-native/Cargo.toml
@@ -24,4 +24,4 @@ url = "2.4.1"
 crate_type = ["cdylib"]
 
 [patch.crates-io]
-jaffi_support = { git = 'https://github.com/ngrok-oss/jaffi.git', branch = 'nikolay/add-bool-support' }
+jaffi_support = { git = 'https://github.com/ngrok-oss/jaffi.git', branch = 'josh/lower-jni-version' }
diff --git a/ngrok-java-native/pom.xml b/ngrok-java-native/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>com.ngrok</groupId>
         <artifactId>ngrok-project</artifactId>
-        <version>1.1.0</version>
+        <version>1.1.1</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -15,7 +15,7 @@
         <dependency>
             <groupId>com.ngrok</groupId>
             <artifactId>ngrok-java</artifactId>
-            <version>1.1.0</version>
+            <version>1.1.1</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -296,4 +296,4 @@
             </build>
         </profile>
     </profiles>
-</project>
+</project>
diff --git a/ngrok-java-native/src/main/java/com/ngrok/Runtime.java b/ngrok-java-native/src/main/java/com/ngrok/Runtime.java
@@ -144,4 +144,4 @@ public void log(String level, String target, String message) {
             logger.atLevel(lvl).log(format, target, message);
         }
     }
-}
+}
diff --git a/ngrok-java/pom.xml b/ngrok-java/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>com.ngrok</groupId>
         <artifactId>ngrok-project</artifactId>
-        <version>1.1.0</version>
+        <version>1.1.1</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -50,4 +50,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-</project>
+</project>
diff --git a/ngrok-jetty/pom.xml b/ngrok-jetty/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>com.ngrok</groupId>
         <artifactId>ngrok-project</artifactId>
-        <version>1.1.0</version>
+        <version>1.1.1</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -46,7 +46,7 @@
         <dependency>
             <groupId>com.ngrok</groupId>
             <artifactId>ngrok-java</artifactId>
-            <version>1.1.0</version>
+            <version>1.1.1</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
@@ -55,4 +55,4 @@
             <scope>compile</scope>
         </dependency>
     </dependencies>
-</project>
+</project>
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.ngrok</groupId>
     <artifactId>ngrok-project</artifactId>
-    <version>1.1.0</version>
+    <version>1.1.1</version>
     <packaging>pom</packaging>
 
     <name>ngrok :: Project</name>
@@ -26,7 +26,7 @@
         <url>https://github.com/ngrok/ngrok-java</url>
         <connection>scm:git:${project.scm.url}</connection>
         <developerConnection>scm:git:${project.scm.url}</developerConnection>
-        <tag>v1.1.0</tag>
+        <tag>v1.1.1</tag>
     </scm>
 
     <modules>