Swift 4.2/5

johnno1962 · johnno1962 · commit 6172ff68d6fc · 2018-12-20T20:59:27.000Z
diff --git a/Sources/JNIProxy.swift b/Sources/JNIProxy.swift
@@ -87,7 +87,7 @@ open class JNILocalProxy<Owned, OwnedType>: JNIReleasableProxy, JNIObjectProtoco
         }
     }
 
-    open static func swiftObject( jniEnv: UnsafeMutablePointer<JNIEnv?>?, javaObject: jobject?, swiftObject: jlong ) -> Owned {
+    public static func swiftObject( jniEnv: UnsafeMutablePointer<JNIEnv?>?, javaObject: jobject?, swiftObject: jlong ) -> Owned {
         return unsafeBitCast( recoverPointer( swiftObject ), to: JNILocalProxy<Owned, OwnedType>.self ).owned
     }
 
diff --git a/Sources/JavaThread.swift b/Sources/JavaThread.swift
@@ -20,7 +20,7 @@ open class JavaThread: JavaObject, Runnable {
 
     private static var MAX_PRIORITY_FieldID: jfieldID?
 
-    open static var MAX_PRIORITY: Int {
+    public static var MAX_PRIORITY: Int {
         get {
             let __value = JNIField.GetStaticIntField( fieldName: "MAX_PRIORITY", fieldType: "I", fieldCache: &MAX_PRIORITY_FieldID, className: "java/lang/Thread", classCache: &JavaThreadJNIClass )
             return Int(__value)
@@ -31,7 +31,7 @@ open class JavaThread: JavaObject, Runnable {
 
     private static var MIN_PRIORITY_FieldID: jfieldID?
 
-    open static var MIN_PRIORITY: Int {
+    public static var MIN_PRIORITY: Int {
         get {
             let __value = JNIField.GetStaticIntField( fieldName: "MIN_PRIORITY", fieldType: "I", fieldCache: &MIN_PRIORITY_FieldID, className: "java/lang/Thread", classCache: &JavaThreadJNIClass )
             return Int(__value)
@@ -42,7 +42,7 @@ open class JavaThread: JavaObject, Runnable {
 
     private static var NORM_PRIORITY_FieldID: jfieldID?
 
-    open static var NORM_PRIORITY: Int {
+    public static var NORM_PRIORITY: Int {
         get {
             let __value = JNIField.GetStaticIntField( fieldName: "NORM_PRIORITY", fieldType: "I", fieldCache: &NORM_PRIORITY_FieldID, className: "java/lang/Thread", classCache: &JavaThreadJNIClass )
             return Int(__value)
diff --git a/java_swift.xcodeproj/project.pbxproj b/java_swift.xcodeproj/project.pbxproj
@@ -361,7 +361,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "org.swiftjava.java-swift";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -383,7 +383,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "org.swiftjava.java-swift";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ open class JNILocalProxy<Owned, OwnedType>: JNIReleasableProxy, JNIObjectProtoco`
`87`	`87`	`}`
`88`	`88`	`}`
`89`	`89`
`90`		`- open static func swiftObject( jniEnv: UnsafeMutablePointer<JNIEnv?>?, javaObject: jobject?, swiftObject: jlong ) -> Owned {`
	`90`	`+ public static func swiftObject( jniEnv: UnsafeMutablePointer<JNIEnv?>?, javaObject: jobject?, swiftObject: jlong ) -> Owned {`
`91`	`91`	`return unsafeBitCast( recoverPointer( swiftObject ), to: JNILocalProxy<Owned, OwnedType>.self ).owned`
`92`	`92`	`}`
`93`	`93`