Skip to content

Commit 7f6d70a

Browse files
committed
Avoid nightly for binding generation where possible
.. and use a particular nightly rev for where it's not.
1 parent e48b71a commit 7f6d70a

3 files changed

+11
-11
lines changed

scripts/uniffi_bindgen_generate_kotlin_android.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ BINDINGS_DIR="bindings/kotlin"
33
TARGET_DIR="target"
44
PROJECT_DIR="ldk-node-android"
55
PACKAGE_DIR="org/lightningdevkit/ldknode"
6-
UNIFFI_BINDGEN_BIN="cargo +nightly run --features=uniffi/cli --bin uniffi-bindgen"
6+
UNIFFI_BINDGEN_BIN="cargo run --features=uniffi/cli --bin uniffi-bindgen"
77
ANDROID_NDK_ROOT="/opt/homebrew/share/android-ndk"
88
LLVM_ARCH_PATH="darwin-x86_64"
99
PATH="$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/$LLVM_ARCH_PATH/bin:$PATH"
1010

11-
rustup +nightly target add x86_64-linux-android aarch64-linux-android armv7-linux-androideabi
12-
CFLAGS="-D__ANDROID_MIN_SDK_VERSION__=21" AR=llvm-ar CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER="x86_64-linux-android21-clang" CC="x86_64-linux-android21-clang" cargo +nightly build --profile release-smaller --features uniffi --target x86_64-linux-android || exit 1
13-
CFLAGS="-D__ANDROID_MIN_SDK_VERSION__=21" AR=llvm-ar CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER="armv7a-linux-androideabi21-clang" CC="armv7a-linux-androideabi21-clang" cargo +nightly build --profile release-smaller --features uniffi --target armv7-linux-androideabi || exit 1
14-
CFLAGS="-D__ANDROID_MIN_SDK_VERSION__=21" AR=llvm-ar CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER="aarch64-linux-android21-clang" CC="aarch64-linux-android21-clang" cargo +nightly build --profile release-smaller --features uniffi --target aarch64-linux-android || exit 1
11+
rustup target add x86_64-linux-android aarch64-linux-android armv7-linux-androideabi
12+
CFLAGS="-D__ANDROID_MIN_SDK_VERSION__=21" AR=llvm-ar CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER="x86_64-linux-android21-clang" CC="x86_64-linux-android21-clang" cargo build --profile release-smaller --features uniffi --target x86_64-linux-android || exit 1
13+
CFLAGS="-D__ANDROID_MIN_SDK_VERSION__=21" AR=llvm-ar CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER="armv7a-linux-androideabi21-clang" CC="armv7a-linux-androideabi21-clang" cargo build --profile release-smaller --features uniffi --target armv7-linux-androideabi || exit 1
14+
CFLAGS="-D__ANDROID_MIN_SDK_VERSION__=21" AR=llvm-ar CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER="aarch64-linux-android21-clang" CC="aarch64-linux-android21-clang" cargo build --profile release-smaller --features uniffi --target aarch64-linux-android || exit 1
1515
$UNIFFI_BINDGEN_BIN generate bindings/ldk_node.udl --language kotlin -o "$BINDINGS_DIR"/"$PROJECT_DIR"/lib/src/main/kotlin || exit 1
1616

1717
JNI_LIB_DIR="$BINDINGS_DIR"/"$PROJECT_DIR"/lib/src/main/jniLibs/
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22
BINDINGS_DIR="./bindings/python"
3-
UNIFFI_BINDGEN_BIN="cargo +nightly run --features=uniffi/cli --bin uniffi-bindgen"
3+
UNIFFI_BINDGEN_BIN="cargo run --features=uniffi/cli --bin uniffi-bindgen"
44

5-
cargo +nightly build --release --features uniffi || exit 1
5+
cargo build --release --features uniffi || exit 1
66
$UNIFFI_BINDGEN_BIN generate bindings/ldk_node.udl --language python -o "$BINDINGS_DIR" || exit 1
77
cp ./target/release/libldk_node.dylib "$BINDINGS_DIR"/libldk_node.dylib || exit 1

scripts/uniffi_bindgen_generate_swift.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ $UNIFFI_BINDGEN_BIN generate bindings/ldk_node.udl --language swift -o "$BINDING
88
mkdir -p $BINDINGS_DIR
99

1010
# Install rust target toolchains
11-
rustup install nightly-x86_64-apple-darwin
12-
rustup component add rust-src --toolchain nightly-x86_64-apple-darwin
11+
rustup install nightly-2023-04-10
12+
rustup component add rust-src --toolchain nightly-2023-04-10
1313
rustup target add aarch64-apple-ios x86_64-apple-ios
14-
rustup target add aarch64-apple-ios-sim --toolchain nightly
14+
rustup target add aarch64-apple-ios-sim --toolchain nightly-2023-04-10
1515
rustup target add aarch64-apple-darwin x86_64-apple-darwin
1616

1717
# Build rust target libs
@@ -20,7 +20,7 @@ cargo build --profile release-smaller --features uniffi --target x86_64-apple-da
2020
cargo build --profile release-smaller --features uniffi --target aarch64-apple-darwin || exit 1
2121
cargo build --profile release-smaller --features uniffi --target x86_64-apple-ios || exit 1
2222
cargo build --profile release-smaller --features uniffi --target aarch64-apple-ios || exit 1
23-
cargo +nightly build --release --features uniffi --target aarch64-apple-ios-sim || exit 1
23+
cargo +nightly-2023-04-10 build --release --features uniffi --target aarch64-apple-ios-sim || exit 1
2424

2525
# Combine ios-sim and apple-darwin (macos) libs for x86_64 and aarch64 (m1)
2626
mkdir -p target/lipo-ios-sim/release-smaller || exit 1

0 commit comments

Comments
 (0)