Skip to content

Commit ed989f8

Browse files
andriydrukandriydruk
authored
Merge pull request #35 from readdle/dev/arm-32-float-issue
ARM-32 floating type issues
2 parents 314ed06 + f5f1909 commit ed989f8

File tree

5 files changed

+27
-29
lines changed

5 files changed

+27
-29
lines changed

‎.github/workflows/android_x86.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,11 @@ jobs:
2020
run: wget https://dl.google.com/android/repository/android-ndk-r21e-darwin-x86_64.zip;
2121
unzip android-ndk-r21e-darwin-x86_64.zip
2222
- name: Install Swift Android Toolchain
23-
run: SWIFT_ANDROID=$(curl --silent "https://api.github.com/repos/readdle/swift-android-toolchain/releases/latest" | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/');
24-
wget https://github.com/readdle/swift-android-toolchain/releases/latest/download/swift-android-$SWIFT_ANDROID.zip;
25-
unzip swift-android-$SWIFT_ANDROID.zip;
26-
rm -rf swift-android-$SWIFT_ANDROID.zip;
27-
swift-android-$SWIFT_ANDROID/bin/swift-android tools --update;
28-
ln -sfn swift-android-$SWIFT_ANDROID swift-android-current
23+
run: wget https://github.com/readdle/swift-android-toolchain/releases/latest/download/swift-android-5.4-r1.zip;
24+
unzip swift-android-5.4-r1.zip;
25+
rm -rf swift-android-5.4-r1.zip;
26+
swift-android-5.4-r1/bin/swift-android tools --update;
27+
ln -sfn swift-android-5.4-r1 swift-android-current
2928
- name: Download Android Emulator
3029
run: $ANDROID_HOME/tools/bin/sdkmanager "system-images;android-29;google_apis;x86"
3130
- name: Create Android Emulator

‎.github/workflows/android_x86_64.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,11 @@ jobs:
2020
run: wget https://dl.google.com/android/repository/android-ndk-r21e-darwin-x86_64.zip;
2121
unzip android-ndk-r21e-darwin-x86_64.zip
2222
- name: Install Swift Android Toolchain
23-
run: SWIFT_ANDROID=$(curl --silent "https://api.github.com/repos/readdle/swift-android-toolchain/releases/latest" | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/');
24-
wget https://github.com/readdle/swift-android-toolchain/releases/latest/download/swift-android-$SWIFT_ANDROID.zip;
25-
unzip swift-android-$SWIFT_ANDROID.zip;
26-
rm -rf swift-android-$SWIFT_ANDROID.zip;
27-
swift-android-$SWIFT_ANDROID/bin/swift-android tools --update;
28-
ln -sfn swift-android-$SWIFT_ANDROID swift-android-current
23+
run: wget https://github.com/readdle/swift-android-toolchain/releases/latest/download/swift-android-5.4-r1.zip;
24+
unzip swift-android-5.4-r1.zip;
25+
rm -rf swift-android-5.4-r1.zip;
26+
swift-android-5.4-r1/bin/swift-android tools --update;
27+
ln -sfn swift-android-5.4-r1 swift-android-current
2928
- name: Download Android Emulator
3029
run: $ANDROID_HOME/tools/bin/sdkmanager "system-images;android-29;google_apis;x86_64"
3130
- name: Create Android Emulator

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -50,25 +50,25 @@ String javaSigType(boolean isOptional) {
5050
else {
5151
switch (swiftType) {
5252
case "Bool":
53-
return "jboolean";
53+
return "JavaBoolean";
5454
case "Int":
5555
case "Int32":
5656
case "UInt":
5757
case "UInt32":
58-
return "jint";
58+
return "JavaInt";
5959
case "Int8":
6060
case "UInt8":
61-
return "jbyte";
61+
return "JavaByte";
6262
case "Int16":
6363
case "UInt16":
64-
return "jshort";
64+
return "JavaShort";
6565
case "Int64":
6666
case "UInt64":
67-
return "jlong";
67+
return "JavaLong";
6868
case "Float":
69-
return "jfloat";
69+
return "JavaFloat";
7070
case "Double":
71-
return "jdouble";
71+
return "JavaDouble";
7272
default:
7373
return "jobject";
7474
}
@@ -155,25 +155,25 @@ Type makeUnsigned() {
155155
public String primitiveDefaultValue() {
156156
switch (swiftType) {
157157
case "Bool":
158-
return "jboolean(JNI_FALSE)";
158+
return "JavaBoolean.defaultValue()";
159159
case "Int":
160160
case "Int32":
161161
case "UInt":
162162
case "UInt32":
163-
return "jint(0)";
163+
return "JavaInt.defaultValue()";
164164
case "Int8":
165165
case "UInt8":
166-
return "jbyte(0)";
166+
return "JavaByte.defaultValue()";
167167
case "Int16":
168168
case "UInt16":
169-
return "jshort(0)";
169+
return "JavaShort.defaultValue()";
170170
case "Int64":
171171
case "UInt64":
172-
return "jlong(0)";
172+
return "JavaLong.defaultValue()";
173173
case "Float":
174-
return "jfloat(0)";
174+
return "JavaFloat.defaultValue()";
175175
case "Double":
176-
return "jdouble(0)";
176+
return "JavaDouble.defaultValue()";
177177
default:
178178
throw new IllegalStateException(swiftType + " is not primitive");
179179
}

‎sample/src/main/swift/Package.resolved

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎sample/src/main/swift/Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ let package = Package(
5555
dependencies: [
5656
.package(url: "https://github.com/readdle/java_swift.git", .upToNextMinor(from: "2.1.8")),
5757
.package(url: "https://github.com/readdle/swift-java.git", .upToNextMinor(from: "0.2.2")),
58-
.package(url: "https://github.com/readdle/swift-java-coder.git", .branch("dev/kotlin-support")),
58+
.package(url: "https://github.com/readdle/swift-java-coder.git", .branch("dev/arm-32-float-issue")),
5959
.package(url: "https://github.com/readdle/swift-anycodable.git", .upToNextMinor(from: "1.0.3")),
6060
],
6161
targets: addGenerated([

0 commit comments

Comments
 (0)