Merge pull request #35 from readdle/dev/arm-32-float-issue

ARM-32 floating type issues

Author: andriydruk

.github/workflows/android_x86.yml

@@ -20,12 +20,11 @@ jobs:
       run: wget https://dl.google.com/android/repository/android-ndk-r21e-darwin-x86_64.zip;
         unzip android-ndk-r21e-darwin-x86_64.zip
     - name: Install Swift Android Toolchain
-      run: SWIFT_ANDROID=$(curl --silent "https://api.github.com/repos/readdle/swift-android-toolchain/releases/latest" | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/');
-        wget https://github.com/readdle/swift-android-toolchain/releases/latest/download/swift-android-$SWIFT_ANDROID.zip;
-        unzip swift-android-$SWIFT_ANDROID.zip;
-        rm -rf swift-android-$SWIFT_ANDROID.zip;
-        swift-android-$SWIFT_ANDROID/bin/swift-android tools --update;
-        ln -sfn swift-android-$SWIFT_ANDROID swift-android-current
+      run: wget https://github.com/readdle/swift-android-toolchain/releases/latest/download/swift-android-5.4-r1.zip;
+        unzip swift-android-5.4-r1.zip;
+        rm -rf swift-android-5.4-r1.zip;
+        swift-android-5.4-r1/bin/swift-android tools --update;
+        ln -sfn swift-android-5.4-r1 swift-android-current
     - name: Download Android Emulator
       run: $ANDROID_HOME/tools/bin/sdkmanager "system-images;android-29;google_apis;x86"
     - name: Create Android Emulator

.github/workflows/android_x86_64.yml

@@ -20,12 +20,11 @@ jobs:
       run: wget https://dl.google.com/android/repository/android-ndk-r21e-darwin-x86_64.zip;
         unzip android-ndk-r21e-darwin-x86_64.zip
     - name: Install Swift Android Toolchain
-      run: SWIFT_ANDROID=$(curl --silent "https://api.github.com/repos/readdle/swift-android-toolchain/releases/latest" | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/');
-        wget https://github.com/readdle/swift-android-toolchain/releases/latest/download/swift-android-$SWIFT_ANDROID.zip;
-        unzip swift-android-$SWIFT_ANDROID.zip;
-        rm -rf swift-android-$SWIFT_ANDROID.zip;
-        swift-android-$SWIFT_ANDROID/bin/swift-android tools --update;
-        ln -sfn swift-android-$SWIFT_ANDROID swift-android-current
+      run: wget https://github.com/readdle/swift-android-toolchain/releases/latest/download/swift-android-5.4-r1.zip;
+        unzip swift-android-5.4-r1.zip;
+        rm -rf swift-android-5.4-r1.zip;
+        swift-android-5.4-r1/bin/swift-android tools --update;
+        ln -sfn swift-android-5.4-r1 swift-android-current
     - name: Download Android Emulator
       run: $ANDROID_HOME/tools/bin/sdkmanager "system-images;android-29;google_apis;x86_64"
     - name: Create Android Emulator

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

@@ -50,25 +50,25 @@ String javaSigType(boolean isOptional) {
             else {
                 switch (swiftType) {
                     case "Bool":
-                        return "jboolean";
+                        return "JavaBoolean";
                     case "Int":
                     case "Int32":
                     case "UInt":
                     case "UInt32":
-                        return "jint";
+                        return "JavaInt";
                     case "Int8":
                     case "UInt8":
-                        return "jbyte";
+                        return "JavaByte";
                     case "Int16":
                     case "UInt16":
-                        return "jshort";
+                        return "JavaShort";
                     case "Int64":
                     case "UInt64":
-                        return "jlong";
+                        return "JavaLong";
                     case "Float":
-                        return "jfloat";
+                        return "JavaFloat";
                     case "Double":
-                        return "jdouble";
+                        return "JavaDouble";
                     default:
                         return "jobject";
                 }
@@ -155,25 +155,25 @@ Type makeUnsigned() {
         public String primitiveDefaultValue() {
             switch (swiftType) {
                 case "Bool":
-                    return "jboolean(JNI_FALSE)";
+                    return "JavaBoolean.defaultValue()";
                 case "Int":
                 case "Int32":
                 case "UInt":
                 case "UInt32":
-                    return "jint(0)";
+                    return "JavaInt.defaultValue()";
                 case "Int8":
                 case "UInt8":
-                    return "jbyte(0)";
+                    return "JavaByte.defaultValue()";
                 case "Int16":
                 case "UInt16":
-                    return "jshort(0)";
+                    return "JavaShort.defaultValue()";
                 case "Int64":
                 case "UInt64":
-                    return "jlong(0)";
+                    return "JavaLong.defaultValue()";
                 case "Float":
-                    return "jfloat(0)";
+                    return "JavaFloat.defaultValue()";
                 case "Double":
-                    return "jdouble(0)";
+                    return "JavaDouble.defaultValue()";
                 default:
                     throw new IllegalStateException(swiftType + " is not primitive");
             }

sample/src/main/swift/Package.resolved

@@ -55,7 +55,7 @@ let package = Package(
     dependencies: [
         .package(url: "https://github.com/readdle/java_swift.git", .upToNextMinor(from: "2.1.8")),
         .package(url: "https://github.com/readdle/swift-java.git", .upToNextMinor(from: "0.2.2")),
-        .package(url: "https://github.com/readdle/swift-java-coder.git", .branch("dev/kotlin-support")),
+        .package(url: "https://github.com/readdle/swift-java-coder.git", .branch("dev/arm-32-float-issue")),
         .package(url: "https://github.com/readdle/swift-anycodable.git", .upToNextMinor(from: "1.0.3")),
     ],
     targets: addGenerated([