From 518fb69fd429dd6e15ff861a47382ae9f6a29d47 Mon Sep 17 00:00:00 2001
From: Josh Robson Chase <josh@robsonchase.com>
Date: Thu, 15 Aug 2024 11:18:01 -0400
Subject: [PATCH 1/2] add jdtls files to gitignore

---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index bf91a8b..932b2a6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
+.classpath
+.project
+.settings/
 target/
 .idea/
 .vscode/

From 778b7e748dffc61d7392ebfe9278d8eebcb2a832 Mon Sep 17 00:00:00 2001
From: Josh Robson Chase <josh@robsonchase.com>
Date: Thu, 15 Aug 2024 11:18:01 -0400
Subject: [PATCH 2/2] patch jaffi with a version declaring a lower jni version

---
 ngrok-java-native/Cargo.lock | 2 +-
 ngrok-java-native/Cargo.toml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ngrok-java-native/Cargo.lock b/ngrok-java-native/Cargo.lock
index a86159f..64b64a9 100644
--- a/ngrok-java-native/Cargo.lock
+++ b/ngrok-java-native/Cargo.lock
@@ -543,7 +543,7 @@ dependencies = [
 [[package]]
 name = "jaffi_support"
 version = "0.2.0"
-source = "git+https://github.com/ngrok-oss/jaffi.git?branch=nikolay/add-bool-support#e1ad672ac2ade60757b843c9b92bf6d1dad90c63"
+source = "git+https://github.com/ngrok-oss/jaffi.git?branch=josh/lower-jni-version#131d4bbff0b4aed69fe5a8fe53920c8974d5d357"
 dependencies = [
  "jni",
 ]
diff --git a/ngrok-java-native/Cargo.toml b/ngrok-java-native/Cargo.toml
index 8a16586..795e5b2 100644
--- 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' }