Dev: swift SwiftCallbackFunc with return type to New JNI API

andriydruk · andriydruk · commit db575d4c58e4 · 2018-01-17T22:36:53.000+02:00
diff --git a/compiler/src/main/java/com/readdle/codegen/SwiftCallbackFuncDescriptor.java b/compiler/src/main/java/com/readdle/codegen/SwiftCallbackFuncDescriptor.java
@@ -143,10 +143,10 @@ void generateCode(SwiftWriter swiftWriter, String javaFullName, String swiftType
         String jniMethodTemplate;
         if (returnSwiftType != null) {
             if (!isStatic) {
-                jniMethodTemplate = "guard let result = JNI.CallObjectMethod(jniObject, methodID: %s.javaMethod%s";
+                jniMethodTemplate = "guard let result = JNI.CallObjectMethod(jniObject, %s.javaMethod%s";
             }
             else {
-                jniMethodTemplate = "guard let result = JNI.CallStaticObjectMethod(javaClass, methodID: %s.javaMethod%s";
+                jniMethodTemplate = "guard let result = JNI.CallStaticObjectMethod(javaClass, %s.javaMethod%s";
             }
         }
         else {

Original file line number	Diff line number	Diff line change
`@@ -143,10 +143,10 @@ void generateCode(SwiftWriter swiftWriter, String javaFullName, String swiftType`
`143`	`143`	`String jniMethodTemplate;`
`144`	`144`	`if (returnSwiftType != null) {`
`145`	`145`	`if (!isStatic) {`
`146`		`- jniMethodTemplate = "guard let result = JNI.CallObjectMethod(jniObject, methodID: %s.javaMethod%s";`
	`146`	`+ jniMethodTemplate = "guard let result = JNI.CallObjectMethod(jniObject, %s.javaMethod%s";`
`147`	`147`	`}`
`148`	`148`	`else {`
`149`		`- jniMethodTemplate = "guard let result = JNI.CallStaticObjectMethod(javaClass, methodID: %s.javaMethod%s";`
	`149`	`+ jniMethodTemplate = "guard let result = JNI.CallStaticObjectMethod(javaClass, %s.javaMethod%s";`
`150`	`150`	`}`
`151`	`151`	`}`
`152`	`152`	`else {`