remember global ref

Author: madsodgaard

Sources/JExtractSwiftLib/JNI/JNISwift2JavaGenerator+SwiftThunkPrinting.swift

@@ -236,7 +236,7 @@ extension JNISwift2JavaGenerator {
       let methodSignature = MethodSignature(resultType: .void, parameterTypes: enumCase.parameterConversions.map(\.native.javaType))
       let methods = #"[.init(name: "<init>", signature: "\#(methodSignature.mangledName)")]"#
 
-      return #"_JNIMethodIDCache(environment: try! JavaVirtualMachine.shared().environment(), className: "\#(nativeParametersClassName)", methods: \#(methods), isSystemClass: false)"#
+      return #"_JNIMethodIDCache(className: "\#(nativeParametersClassName)", methods: \#(methods), isSystemClass: false)"#
   }
 
   private func printEnumGetAsCaseThunk(

Sources/SwiftJavaRuntimeSupport/DefaultCaches.swift

@@ -27,7 +27,6 @@ extension _JNIMethodIDCache {
     )
 
     private static let cache = _JNIMethodIDCache(
-      environment: try! JavaVirtualMachine.shared().environment(),
       className: "java/util/concurrent/CompletableFuture",
       methods: [completeMethod, completeExceptionallyMethod],
       isSystemClass: true
@@ -52,7 +51,6 @@ extension _JNIMethodIDCache {
     private static let messageConstructor = Method(name: "<init>", signature: "(Ljava/lang/String;)V")
 
     private static let cache = _JNIMethodIDCache(
-      environment: try! JavaVirtualMachine.shared().environment(),
       className: "java/lang/Exception",
       methods: [messageConstructor],
       isSystemClass: true

Sources/SwiftJavaRuntimeSupport/_JNIBoxedConversions.swift

@@ -26,54 +26,46 @@ public enum _JNIBoxedConversions {
   private static let doubleMethod = _JNIMethodIDCache.Method(name: "valueOf", signature: "(D)Ljava/lang/Double;", isStatic: true)
 
   private static let booleanCache = _JNIMethodIDCache(
-    environment: try! JavaVirtualMachine.shared().environment(),
     className: "java/lang/Boolean",
     methods: [booleanMethod],
     isSystemClass: true
   )
 
   private static let byteCache = _JNIMethodIDCache(
-    environment: try! JavaVirtualMachine.shared().environment(),
     className: "java/lang/Byte",
     methods: [byteMethod],
     isSystemClass: true
   )
   private static let charCache = _JNIMethodIDCache(
-    environment: try! JavaVirtualMachine.shared().environment(),
     className: "java/lang/Character",
     methods: [charMethod],
     isSystemClass: true
   )
 
   private static let shortCache = _JNIMethodIDCache(
-    environment: try! JavaVirtualMachine.shared().environment(),
     className: "java/lang/Short",
     methods: [shortMethod],
     isSystemClass: true
   )
   private static let intCache = _JNIMethodIDCache(
-    environment: try! JavaVirtualMachine.shared().environment(),
     className: "java/lang/Integer",
     methods: [intMethod],
     isSystemClass: true
   )
 
   private static let longCache = _JNIMethodIDCache(
-    environment: try! JavaVirtualMachine.shared().environment(),
     className: "java/lang/Long",
     methods: [longMethod],
     isSystemClass: true
   )
 
   private static let floatCache = _JNIMethodIDCache(
-    environment: try! JavaVirtualMachine.shared().environment(),
     className: "java/lang/Float",
     methods: [floatMethod],
     isSystemClass: true
   )
 
   private static let doubleCache = _JNIMethodIDCache(
-    environment: try! JavaVirtualMachine.shared().environment(),
     className: "java/lang/Double",
     methods: [doubleMethod],
     isSystemClass: true

Sources/SwiftJavaRuntimeSupport/_JNIMethodIDCache.swift

@@ -44,13 +44,15 @@ public final class _JNIMethodIDCache: Sendable {
   /// This is to make sure that the underlying reference remains valid
   nonisolated(unsafe) private let javaObjectHolder: JavaObjectHolder?
 
-  public init(environment: UnsafeMutablePointer<JNIEnv?>!, className: String, methods: [Method], isSystemClass: Bool) {
+  public init(className: String, methods: [Method], isSystemClass: Bool) {
+    let environment = try! JavaVirtualMachine.shared().environment()
+
     let clazz: jobject
     if isSystemClass {
       guard let jniClass = environment.interface.FindClass(environment, className) else {
             fatalError("Class \(className) could not be found!")
           }
-      clazz = jniClass
+      clazz = environment.interface.NewGlobalRef(environment, jniClass)!
       self.javaObjectHolder = nil
     } else {
       guard let javaClass = try? JNI.shared.applicationClassLoader.loadClass(className.replacingOccurrences(of: "/", with: ".")) else {