diff --git a/.github/workflows/cont_integration.yml b/.github/workflows/cont_integration.yml index f35a2be..d9e47e6 100644 --- a/.github/workflows/cont_integration.yml +++ b/.github/workflows/cont_integration.yml @@ -47,14 +47,14 @@ jobs: run: rustup update - name: Build - run: cargo build --features uniffi/cli + run: cargo build - name: Clippy if: ${{ matrix.rust.clippy }} - run: cargo clippy --all-targets --features "uniffi/bindgen-tests uniffi/cli" -- -D warnings + run: cargo clippy --all-targets --features "uniffi/bindgen-tests" -- -D warnings - name: Test - run: CLASSPATH=./tests/jna/jna-5.8.0.jar cargo test --features uniffi/bindgen-tests,uniffi/cli + run: CLASSPATH=./tests/jna/jna-5.8.0.jar cargo test --features uniffi/bindgen-tests fmt: name: Rust fmt diff --git a/.github/workflows/test-swift.yaml b/.github/workflows/test-swift.yaml index 18cfed5..38c1d97 100644 --- a/.github/workflows/test-swift.yaml +++ b/.github/workflows/test-swift.yaml @@ -24,13 +24,13 @@ jobs: - name: Run bdk-ffi-bindgen working-directory: bdk-ffi - run: cargo run --features uniffi/cli --bin uniffi-bindgen generate src/bdk.udl --language swift --out-dir ../bdk-swift/Sources/BitcoinDevKit --no-format + run: cargo run --bin uniffi-bindgen generate src/bdk.udl --language swift --out-dir ../bdk-swift/Sources/BitcoinDevKit --no-format - name: Build bdk-ffi for x86_64-apple-darwin - run: cargo build --package bdk-ffi --features uniffi/cli --profile release-smaller --target x86_64-apple-darwin + run: cargo build --package bdk-ffi --profile release-smaller --target x86_64-apple-darwin - name: Build bdk-ffi for aarch64-apple-darwin - run: cargo build --package bdk-ffi --features uniffi/cli --profile release-smaller --target aarch64-apple-darwin + run: cargo build --package bdk-ffi --profile release-smaller --target aarch64-apple-darwin - name: Create lipo-ios-sim and lipo-macos run: | diff --git a/bdk-android/plugins/src/main/kotlin/org/bitcoindevkit/plugins/UniFfiAndroidPlugin.kt b/bdk-android/plugins/src/main/kotlin/org/bitcoindevkit/plugins/UniFfiAndroidPlugin.kt index a0eab1c..2020086 100644 --- a/bdk-android/plugins/src/main/kotlin/org/bitcoindevkit/plugins/UniFfiAndroidPlugin.kt +++ b/bdk-android/plugins/src/main/kotlin/org/bitcoindevkit/plugins/UniFfiAndroidPlugin.kt @@ -21,7 +21,7 @@ internal class UniFfiAndroidPlugin : Plugin { val buildAndroidAarch64Binary by tasks.register("buildAndroidAarch64Binary") { workingDir("${projectDir}/../../bdk-ffi") - val cargoArgs: List = listOf("build", "--features", "uniffi/cli", "--profile", "release-smaller", "--target", "aarch64-linux-android") + val cargoArgs: List = listOf("build", "--profile", "release-smaller", "--target", "aarch64-linux-android") executable("cargo") args(cargoArgs) @@ -51,7 +51,7 @@ internal class UniFfiAndroidPlugin : Plugin { val buildAndroidX86_64Binary by tasks.register("buildAndroidX86_64Binary") { workingDir("${project.projectDir}/../../bdk-ffi") - val cargoArgs: List = listOf("build", "--features", "uniffi/cli", "--profile", "release-smaller", "--target", "x86_64-linux-android") + val cargoArgs: List = listOf("build", "--profile", "release-smaller", "--target", "x86_64-linux-android") executable("cargo") args(cargoArgs) @@ -81,7 +81,7 @@ internal class UniFfiAndroidPlugin : Plugin { val buildAndroidArmv7Binary by tasks.register("buildAndroidArmv7Binary") { workingDir("${project.projectDir}/../../bdk-ffi") - val cargoArgs: List = listOf("build", "--features", "uniffi/cli", "--profile", "release-smaller", "--target", "armv7-linux-androideabi") + val cargoArgs: List = listOf("build", "--profile", "release-smaller", "--target", "armv7-linux-androideabi") executable("cargo") args(cargoArgs) @@ -138,7 +138,7 @@ internal class UniFfiAndroidPlugin : Plugin { dependsOn(moveNativeAndroidLibs) workingDir("${project.projectDir}/../../bdk-ffi") - val cargoArgs: List = listOf("run", "--features", "uniffi/cli", "--bin", "uniffi-bindgen", "generate", "src/bdk.udl", "--language", "kotlin", "--out-dir", "../bdk-android/lib/src/main/kotlin", "--no-format") + val cargoArgs: List = listOf("run", "--bin", "uniffi-bindgen", "generate", "src/bdk.udl", "--language", "kotlin", "--out-dir", "../bdk-android/lib/src/main/kotlin", "--no-format") executable("cargo") args(cargoArgs) diff --git a/bdk-jvm/plugins/src/main/kotlin/org/bitcoindevkit/plugins/UniFfiJvmPlugin.kt b/bdk-jvm/plugins/src/main/kotlin/org/bitcoindevkit/plugins/UniFfiJvmPlugin.kt index 75217ba..71573ae 100644 --- a/bdk-jvm/plugins/src/main/kotlin/org/bitcoindevkit/plugins/UniFfiJvmPlugin.kt +++ b/bdk-jvm/plugins/src/main/kotlin/org/bitcoindevkit/plugins/UniFfiJvmPlugin.kt @@ -12,26 +12,26 @@ internal class UniFfiJvmPlugin : Plugin { override fun apply(target: Project): Unit = target.run { // register a task called buildJvmBinaries which will run something like - // cargo build --features uniffi/cli --release --target aarch64-apple-darwin + // cargo build --release --target aarch64-apple-darwin val buildJvmBinaries by tasks.register("buildJvmBinaries") { if (operatingSystem == OS.MAC) { exec { workingDir("${project.projectDir}/../../bdk-ffi") executable("cargo") - val cargoArgs: List = listOf("build", "--features", "uniffi/cli", "--profile", "release-smaller", "--target", "x86_64-apple-darwin") + val cargoArgs: List = listOf("build", "--profile", "release-smaller", "--target", "x86_64-apple-darwin") args(cargoArgs) } exec { workingDir("${project.projectDir}/../../bdk-ffi") executable("cargo") - val cargoArgs: List = listOf("build", "--features", "uniffi/cli", "--profile", "release-smaller", "--target", "aarch64-apple-darwin") + val cargoArgs: List = listOf("build", "--profile", "release-smaller", "--target", "aarch64-apple-darwin") args(cargoArgs) } } else if(operatingSystem == OS.LINUX) { exec { workingDir("${project.projectDir}/../../bdk-ffi") executable("cargo") - val cargoArgs: List = listOf("build", "--features", "uniffi/cli", "--profile", "release-smaller", "--target", "x86_64-unknown-linux-gnu") + val cargoArgs: List = listOf("build", "--profile", "release-smaller", "--target", "x86_64-unknown-linux-gnu") args(cargoArgs) } } @@ -90,7 +90,7 @@ internal class UniFfiJvmPlugin : Plugin { dependsOn(moveNativeJvmLibs) workingDir("${project.projectDir}/../../bdk-ffi") - val cargoArgs: List = listOf("run", "--features", "uniffi/cli", "--bin", "uniffi-bindgen", "generate", "src/bdk.udl", "--language", "kotlin", "--out-dir", "../bdk-jvm/lib/src/main/kotlin", "--no-format") + val cargoArgs: List = listOf("run", "--bin", "uniffi-bindgen", "generate", "src/bdk.udl", "--language", "kotlin", "--out-dir", "../bdk-jvm/lib/src/main/kotlin", "--no-format") executable("cargo") args(cargoArgs) diff --git a/bdk-python/generate.sh b/bdk-python/generate.sh index 90a5f65..19fb7ac 100644 --- a/bdk-python/generate.sh +++ b/bdk-python/generate.sh @@ -5,10 +5,10 @@ OS=$(uname -s) echo "Generating bdk.py..." cd ../bdk-ffi/ -cargo run --features uniffi/cli --bin uniffi-bindgen generate src/bdk.udl --language python --out-dir ../bdk-python/src/bdkpython/ --no-format +cargo run --bin uniffi-bindgen generate src/bdk.udl --language python --out-dir ../bdk-python/src/bdkpython/ --no-format echo "Generating native binaries..." -cargo build --features uniffi/cli --profile release-smaller +cargo build --profile release-smaller case $OS in "Darwin") echo "Copying macOS libbdkffi.dylib..." diff --git a/bdk-swift/build-local-swift.sh b/bdk-swift/build-local-swift.sh index dac4567..ec5b09b 100755 --- a/bdk-swift/build-local-swift.sh +++ b/bdk-swift/build-local-swift.sh @@ -13,14 +13,14 @@ rustup target add aarch64-apple-darwin x86_64-apple-darwin pushd bdk-ffi mkdir -p Sources/BitcoinDevKit -cargo run --features uniffi/cli --bin uniffi-bindgen generate src/bdk.udl --language swift --out-dir ../bdk-swift/Sources/BitcoinDevKit --no-format +cargo run --bin uniffi-bindgen generate src/bdk.udl --language swift --out-dir ../bdk-swift/Sources/BitcoinDevKit --no-format popd -cargo build --package bdk-ffi --features uniffi/cli --profile release-smaller --target x86_64-apple-darwin -cargo build --package bdk-ffi --features uniffi/cli --profile release-smaller --target aarch64-apple-darwin -cargo build --package bdk-ffi --features uniffi/cli --profile release-smaller --target x86_64-apple-ios -cargo build --package bdk-ffi --features uniffi/cli --profile release-smaller --target aarch64-apple-ios -cargo +nightly build --package bdk-ffi --features uniffi/cli --release -Z build-std --target aarch64-apple-ios-sim +cargo build --package bdk-ffi --profile release-smaller --target x86_64-apple-darwin +cargo build --package bdk-ffi --profile release-smaller --target aarch64-apple-darwin +cargo build --package bdk-ffi --profile release-smaller --target x86_64-apple-ios +cargo build --package bdk-ffi --profile release-smaller --target aarch64-apple-ios +cargo +nightly build --package bdk-ffi --release -Z build-std --target aarch64-apple-ios-sim mkdir -p target/lipo-ios-sim/release-smaller lipo target/aarch64-apple-ios-sim/release/libbdkffi.a target/x86_64-apple-ios/release-smaller/libbdkffi.a -create -output target/lipo-ios-sim/release-smaller/libbdkffi.a