Swift 4.1

johnno1962 · johnno1962 · commit f3f5a5c49413 · 2018-04-19T18:48:28.000+01:00
diff --git a/JDBC/AppDelegate.swift b/JDBC/AppDelegate.swift
@@ -62,7 +62,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSTableViewDataSource, NSTab
         }
 
         // Use Thread class to run in background to get the correct class loader & classpath
-        Thread( {
+        JavaThread( {
 
             do {
                 if try JavaClass.forName( self.driverClass.stringValue ) == nil {
diff --git a/com_apple b/com_apple
@@ -1 +1 @@
-Subproject commit 91d2699cda183bab7bd70207d70d95b4e5337030
+Subproject commit 9f8cc09bf732d4f59de432825ef2216781eefba9
diff --git a/examples b/examples
@@ -1 +1 @@
-Subproject commit eac35bda3173c1581e9e51b3dcf415740e9db0e9
+Subproject commit d3b9161657b34acc5fb06a6a4ad202f448646162
diff --git a/java_awt b/java_awt
@@ -1 +1 @@
-Subproject commit 461f61d4473ed8cce975307fe770daaa67855f20
+Subproject commit 92155048dc15aa151dbd7a6a1a904a4d839c5c6e
diff --git a/java_lang b/java_lang
@@ -1 +1 @@
-Subproject commit c9b8b55fd8f40bc25ec2c49fa03a7d3a51b78766
+Subproject commit c5f459ed675d7d4e8d83b12d9567d772613d3553
diff --git a/java_sql b/java_sql
@@ -1 +1 @@
-Subproject commit ffe975cb112f9c89da63b01b9c54c640bf969d24
+Subproject commit 57301634eed0d3b4955f655a60db01fd1bd9bb8f
diff --git a/java_swift b/java_swift
@@ -1 +1 @@
-Subproject commit 1d31a0c46d90e3588a192509390aca022d03080b
+Subproject commit 22f8b3a571aff9730dafb30bb626e4002441f550
diff --git a/java_util b/java_util
@@ -1 +1 @@
-Subproject commit 61005cba6a74e0d080ac1949b2eadab46dc4602b
+Subproject commit 37ec96487a008a6a63c5c4a0b1149f4623c51ae9
diff --git a/javax_swing b/javax_swing
@@ -1 +1 @@
-Subproject commit 09496dd0c7077e4425aff254ebade9506fdd28de
+Subproject commit 46809e56f891238c9791ac8d7ae74e3f0458b1a9
diff --git a/src/genswift.java b/src/genswift.java
@@ -1,7 +1,7 @@
 //
 //  genswift.java
 //  https://github.com/SwiftJava/SwiftJava
-//  $Id: //depot/SwiftJava/src/genswift.java#94 $
+//  $Id: //depot/SwiftJava/src/genswift.java#95 $
 //
 //  Created by John Holdsworth on 14/07/2016.
 //  Copyright (c) 2016 John Holdsworth. All rights reserved.
@@ -125,6 +125,7 @@ boolean isUnavailable( Class<?> type ) {
             put( Class.class.getName(), true );
             put( Object.class.getName(), true );
             put( Enum.class.getName(), true );
+            put( Thread.class.getName(), true );
             put( String.class.getName(), true );
             put( Comparable.class.getName(), true );
             put( Error.class.getName(), true );
@@ -144,6 +145,7 @@ boolean isUnavailable( Class<?> type ) {
             put( Object.class.getName(), true );
             put( Class.class.getName(), true );
             put( Enum.class.getName(), true );
+            put( Thread.class.getName(), true );
             put( Runnable.class.getName(), true );
             put( Throwable.class.getName(), true );
             put( Exception.class.getName(), true );
@@ -481,7 +483,7 @@ boolean generate() throws Exception {
     				cases += (cases == "" ? "" : ", ") + ((Enum<?>)constant).name();
     			code.append("    case "+cases+"\n\n");
     			
-    			code.append("    static let enumConstants = try! JavaClass.forName(\""+clazz.getName()+"\")\n" +
+                code.append("    static let enumConstants = JavaClass(loading: \""+clazz.getName()+"\")\n" +
     	    			"        .getEnumConstants()!.map { "+classSuffix+"Forward( javaObject: $0.javaObject ) }\n\n");
     			
     			code.append("    public func underlier() -> "+classSuffix+"Forward"+" {\n");
@@ -1051,9 +1053,9 @@ public int compare(java.lang.reflect.Method o1, java.lang.reflect.Method o2) {
         String proxyClass = "org/swiftjava/" + currentFramework + "/" + classSuffix + "Proxy";
         code.append("        let clazz = JNI.FindClass( proxyClassName() )\n");
 
-        code.append("        withUnsafePointer(to: &natives[0]) {\n");
+        code.append("        natives.withUnsafeBufferPointer {\n");
         code.append("            nativesPtr in\n");
-        code.append("            if JNI.api.RegisterNatives( JNI.env, clazz, nativesPtr, jint(natives.count) ) != jint(JNI_OK) {\n");
+        code.append("            if JNI.api.RegisterNatives( JNI.env, clazz, nativesPtr.baseAddress, jint(nativesPtr.count) ) != jint(JNI_OK) {\n");
         code.append("                JNI.report( \"Unable to register java natives\" )\n");
         code.append("            }\n");
         code.append("        }\n\n");
diff --git a/swift-android-kotlin b/swift-android-kotlin
@@ -1 +1 @@
-Subproject commit 63a7879f0404b8eec9533d85f0d3cc7f795e9df4
+Subproject commit 59db01562aeb9126d7826b1a52afe9472e624508
diff --git a/swift-android-samples b/swift-android-samples
@@ -1 +1 @@
-Subproject commit ca9eb677dae81ae116807aa758c0ae87df90994a
+Subproject commit e874cc6a58716863f73016e9b6563d0347df65cf

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSTableViewDataSource, NSTab`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`// Use Thread class to run in background to get the correct class loader & classpath`
`65`		`- Thread( {`
	`65`	`+ JavaThread( {`
`66`	`66`
`67`	`67`	`do {`
`68`	`68`	`if try JavaClass.forName( self.driverClass.stringValue ) == nil {`