diff --git a/.travis.yml b/.travis.yml index 6800f3ee..6693b96b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,6 +26,18 @@ matrix: - env: TARGET=x86_64-unknown-linux-gnu - env: TARGET=x86_64-unknown-linux-musl + # iOS + - env: TARGET=aarch64-apple-ios DISABLE_TESTS=1 + os: osx + - env: TARGET=armv7-apple-ios DISABLE_TESTS=1 + os: osx + - env: TARGET=armv7s-apple-ios DISABLE_TESTS=1 + os: osx + - env: TARGET=i386-apple-ios DISABLE_TESTS=1 + os: osx + - env: TARGET=x86_64-apple-ios DISABLE_TESTS=1 + os: osx + # Android - env: TARGET=arm-linux-androideabi DISABLE_TESTS=1 - env: TARGET=aarch64-linux-android DISABLE_TESTS=1 diff --git a/Cargo.toml b/Cargo.toml index f2f29bcd..7ae41069 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "livesplit-core" -version = "0.5.0" +version = "0.5.1" authors = ["Christopher Serr "] documentation = "https://docs.rs/livesplit-core/" repository = "https://github.com/CryZe/livesplit-core" diff --git a/README.md b/README.md index 80162972..8fb20c5f 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,7 @@ Additional Bindings are available for the following programming languages: - C# - Java with Java Native Access or Java Native Interface - Kotlin with Java Native Interface + - Swift - Ruby - Python - JavaScript + TypeScript for Node.js, asm.js and WebAssembly diff --git a/capi/Cargo.toml b/capi/Cargo.toml index be384529..921c54b0 100644 --- a/capi/Cargo.toml +++ b/capi/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "livesplit-core-capi" -version = "0.5.0" +version = "0.5.1" authors = ["Christopher Serr "] [dependencies] diff --git a/capi/bind_gen/src/kotlin/jni.rs b/capi/bind_gen/src/kotlin/jni.rs index 62d330e3..0d92d510 100644 --- a/capi/bind_gen/src/kotlin/jni.rs +++ b/capi/bind_gen/src/kotlin/jni.rs @@ -328,10 +328,8 @@ fn write_native_class>(path: P, classes: &BTreeMap r#"package livesplitcore object LiveSplitCoreNative { - companion object { - init { - System.loadLibrary("native-lib") - } + init { + System.loadLibrary("native-lib") } external fun Run_parseString(data: String): Long"#)?; diff --git a/ci/before_deploy.sh b/ci/before_deploy.sh index 4a69ab85..653e976a 100644 --- a/ci/before_deploy.sh +++ b/ci/before_deploy.sh @@ -29,7 +29,7 @@ main() { cp target/$TARGET/release/liblivesplit_core_capi.so $stage/liblivesplit_core.so 2>/dev/null || : ;; osx) - cp target/$TARGET/release/liblivesplit_core_capi.dylib $stage/liblivesplit_core.dylib + cp target/$TARGET/release/liblivesplit_core_capi.dylib $stage/liblivesplit_core.dylib 2>/dev/null || : ;; esac cp target/$TARGET/release/liblivesplit_core_capi.a $stage/liblivesplit_core.a diff --git a/ci/install.sh b/ci/install.sh index 76bb7340..98e4543d 100644 --- a/ci/install.sh +++ b/ci/install.sh @@ -13,6 +13,24 @@ main() { sort=gsort # for `sort --sort-version`, from brew's coreutils. fi + case $TARGET in + aarch64-apple-ios) + rustup target install aarch64-apple-ios + ;; + armv7-apple-ios) + rustup target install armv7-apple-ios + ;; + armv7s-apple-ios) + rustup target install armv7s-apple-ios + ;; + i386-apple-ios) + rustup target install i386-apple-ios + ;; + x86_64-apple-ios) + rustup target install x86_64-apple-ios + ;; + esac + # This fetches latest stable release local tag=$(git ls-remote --tags --refs --exit-code https://github.com/japaric/cross \ | cut -d/ -f3 \