Dev: support Swift 5.7

Author: andriydruk

build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.5.10'
+    ext.kotlin_version = '1.6.21'
 
     repositories {
         google()
@@ -10,8 +10,8 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.2'
-        classpath "com.readdle.android.swift:gradle:1.4.0"
+        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath "com.readdle.android.swift:gradle:1.4.4"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-android-extensions:$kotlin_version"
         classpath 'io.github.gradle-nexus:publish-plugin:1.1.0'
@@ -34,5 +34,5 @@ apply from: "${rootDir}/publish-root.gradle"
 
 ext {
     PUBLISH_GROUP_ID = 'com.readdle.swift.java.codegen'
-    PUBLISH_VERSION = "0.9.3"
+    PUBLISH_VERSION = "0.9.4"
 }

compiler/src/main/java/com/readdle/codegen/JavaSwiftProcessor.java

@@ -316,13 +316,13 @@ private void generateJavaSwift(Filer filer) throws IOException {
         swiftWriter.emitStatement("public let SwiftRuntimeErrorClass = JNI.GlobalFindClass(\"com/readdle/codegen/anotation/SwiftRuntimeError\")");
         swiftWriter.emitEmptyLine();
         // TODO: remove when JavaCoder become deprecated
-        swiftWriter.emitStatement("@_silgen_name(\"Java_com_readdle_codegen_anotation_JavaSwift_init\")");
+        swiftWriter.emitStatement("@_cdecl(\"Java_com_readdle_codegen_anotation_JavaSwift_init\")");
         swiftWriter.emitStatement("public func Java_com_readdle_codegen_anotation_JavaBridgeable_init(env: UnsafeMutablePointer<JNIEnv?>, clazz: jclass) {");
         swiftWriter.emitStatement("JavaCoderConfig.RegisterBasicJavaTypes()");
         swiftWriter.emitStatement("}");
 
         // TODO: move to sample project
-        swiftWriter.emitStatement("@_silgen_name(\"Java_com_readdle_codegen_anotation_JavaSwift_dumpReferenceTables\")");
+        swiftWriter.emitStatement("@_cdecl(\"Java_com_readdle_codegen_anotation_JavaSwift_dumpReferenceTables\")");
         swiftWriter.emitStatement("public func Java_com_readdle_codegen_anotation_JavaBridgeable_dumpReferenceTables(env: UnsafeMutablePointer<JNIEnv?>, clazz: jclass) {");
         swiftWriter.emitStatement("JNI.dumpReferenceTables()");
         swiftWriter.emitStatement("}");

compiler/src/main/java/com/readdle/codegen/SwiftDelegateDescriptor.java

@@ -257,7 +257,7 @@ File generateCode() throws IOException {
         if (!isInterface) {
             String swiftFuncName = Utils.mangleFunctionName(javaFullName, "init", new ArrayList<>());
             swiftWriter.emitEmptyLine();
-            swiftWriter.emitStatement(String.format("@_silgen_name(\"%s\")", swiftFuncName));
+            swiftWriter.emitStatement(String.format("@_cdecl(\"%s\")", swiftFuncName));
             swiftWriter.emitStatement(String.format("public func %s(env: UnsafeMutablePointer<JNIEnv?>, this: jobject) {", swiftFuncName));
             swiftWriter.emitStatement(String.format("let swiftSelf = %s(jniObject: this)", simpleTypeName));
             swiftWriter.emitStatement("let nativePointer = jlong(Int(bitPattern: Unmanaged.passRetained(swiftSelf).toOpaque()))");

compiler/src/main/java/com/readdle/codegen/SwiftFuncDescriptor.java

@@ -90,7 +90,7 @@ public void generateCode(SwiftWriter swiftWriter, String javaFullName, String sw
         String swiftFuncName = Utils.mangleFunctionName(javaFullName, javaMethodName, params);
 
         swiftWriter.emitEmptyLine();
-        swiftWriter.emitStatement(String.format("@_silgen_name(\"%s\")", swiftFuncName));
+        swiftWriter.emitStatement(String.format("@_cdecl(\"%s\")", swiftFuncName));
         swiftWriter.emit(String.format("public func %s(env: UnsafeMutablePointer<JNIEnv?>, %s", swiftFuncName, isStatic ? "clazz: jclass" : "this: jobject"));
 
         for (SwiftParamDescriptor param : params) {

compiler/src/main/java/com/readdle/codegen/SwiftGetterDescriptor.java

@@ -57,7 +57,7 @@ public void generateCode(SwiftWriter swiftWriter, String javaFullName, String sw
         String swiftFuncName = Utils.mangleFunctionName(javaFullName, javaName, new ArrayList<>());
 
         swiftWriter.emitEmptyLine();
-        swiftWriter.emitStatement(String.format("@_silgen_name(\"%s\")", swiftFuncName));
+        swiftWriter.emitStatement(String.format("@_cdecl(\"%s\")", swiftFuncName));
         swiftWriter.emit(String.format("public func %s(env: UnsafeMutablePointer<JNIEnv?>, %s", swiftFuncName, isStatic ? "clazz: jclass" : "this: jobject"));
 
         String retType = "";

compiler/src/main/java/com/readdle/codegen/SwiftSetterDescriptor.java

@@ -49,7 +49,7 @@ public void generateCode(SwiftWriter swiftWriter, String javaFullName, String sw
         String swiftFuncName = Utils.mangleFunctionName(javaFullName, javaName, Collections.singletonList(param));
 
         swiftWriter.emitEmptyLine();
-        swiftWriter.emitStatement(String.format("@_silgen_name(\"%s\")", swiftFuncName));
+        swiftWriter.emitStatement(String.format("@_cdecl(\"%s\")", swiftFuncName));
         swiftWriter.emit(String.format("public func %s(env: UnsafeMutablePointer<JNIEnv?>, %s", swiftFuncName, isStatic ? "clazz: jclass" : "this: jobject"));
         swiftWriter.emit(String.format(", j%s: %s%s) {\n", param.name, param.swiftType.javaSigType(param.isOptional), param.isOptional ? "?" : ""));
         swiftWriter.emitEmptyLine();

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,5 @@
-#Wed Jan 27 00:03:50 EET 2021
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip