Build package scr for kotlin: aar, updated the folder structure, optimized for smaller release binaries

Signed-off-by: neoz666 <neoz.blockchain@gmail.com>

Author: NeoZ666

.github/workflows/test-kotlin.yml

@@ -1,4 +1,4 @@
-name: Kotlin Tests
+name: Android Tests
 
 on:
   push:
@@ -34,14 +34,22 @@ jobs:
         with:
           submodules: recursive
 
-      - name: Install Rust toolchain
-        uses: dtolnay/rust-toolchain@stable
-
       - name: Setup Java
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '21'
+          java-version: 21
+
+      - name: "Set up Android SDK"
+        uses: android-actions/setup-android@v3
+
+      - name: "Set up Android NDK"
+        uses: nttld/setup-ndk@v1
+        with:
+          ndk-version: r26c
+
+      - name: Install Rust toolchain
+        uses: dtolnay/rust-toolchain@stable
 
       - name: Cache Rust dependencies
         uses: actions/cache@v4
@@ -67,11 +75,17 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gradle-
 
-      - name: Build FFI bindings
-        working-directory: ./ffi-commons
+      - name: "Build Android library"
+        working-directory: ./coinswap-kotlin
+        run: |
+          chmod +x build-scripts/development/build-dev-linux-x86_64.sh
+          bash ./scripts/release/build-dev-linux-x86_64.sh
+
+      - name: "Enable KVM"
         run: |
-          chmod +x create_bindings.sh
-          ./create_bindings.sh
+          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+          sudo udevadm control --reload-rules
+          sudo udevadm trigger --name-match=kvm
 
       - name: Setup Docker environment
         working-directory: ./ffi-commons
@@ -98,12 +112,12 @@ jobs:
         working-directory: ./coinswap-kotlin
         run: |
           chmod +x gradlew
-          ./gradlew test --tests "coinswap.StandardSwap" --no-daemon --stacktrace
+          ./gradlew :lib:test --tests "coinswap.StandardSwap" --no-daemon --stacktrace
 
       - name: Run Kotlin Taproot Swap Test (P2TR)
         working-directory: ./coinswap-kotlin
         run: |
-          ./gradlew test --tests "coinswap.TaprootSwap" --no-daemon --stacktrace
+          ./gradlew :lib:test --tests "coinswap.TaprootSwap" --no-daemon --stacktrace
 
       - name: Cleanup Docker
         if: always()

README.md

@@ -11,7 +11,7 @@
 Coinswap FFI provides Foreign Function Interface (FFI) bindings for the [Coinswap](https://github.com/citadel-tech/coinswap) Bitcoin privacy protocol, enabling integration with multiple programming languages and platforms. This repository contains binding implementations for:
 
 ### JavaScript/TypeScript
-- **[coinswap-js](./coinswap-js)** - Node.js bindings via NAPI-RS for JavaScript/TypeScript applications
+- **[coinswap-js](./coinswap-js)** - Node.js bindings for JavaScript/TypeScript applications
 
 ### Multi-Language Bindings (via UniFFI)
 Generated from **[ffi-commons](./ffi-commons)** - the core UniFFI binding generator:
@@ -23,7 +23,7 @@ Generated from **[ffi-commons](./ffi-commons)** - the core UniFFI binding genera
 
 ## Quick Start
 
-### Node.js (NAPI)
+### Node.js (Node add-ons)
 
 ```bash
 cd coinswap-js
@@ -56,7 +56,7 @@ This generates bindings for all supported languages. See individual language REA
 
 ### Reference Implementation
 
-The [taker-app](https://github.com/citadel-tech/taker-app) demonstrates a production-ready desktop GUI built with the NAPI bindings, showcasing wallet management, swap execution, market analytics, and UTXO control. Use it as a reference for your own applications.
+The [taker-app](https://github.com/citadel-tech/taker-app) demonstrates a production-ready desktop GUI built with the node-addons, showcasing wallet management, swap execution, market analytics, and UTXO control. Use it as a reference for your own applications.
 
 ## Requirementss
 
@@ -67,7 +67,7 @@ The [taker-app](https://github.com/citadel-tech/taker-app) demonstrates a produc
 
 ### Platform-Specific
 
-#### NAPI (Node.js)
+#### NAPI (Node addons)
 - Node.js 18.0.0 or higher
 - Build tools: `build-essential`, `automake`, `libtool`
 

coinswap-kotlin/README.md

@@ -213,6 +213,23 @@ enum class AddressType {
 Complete examples are available in the [`test/`](test/) directory:
 - [`AndroidExample.kt`](test/AndroidExample.kt) - Android integration with coroutines
 
+## Testing
+
+The project includes comprehensive test suites in Kotlin:
+
+### Running Tests
+
+```bash
+# Run all tests
+./gradlew test
+
+# Run Taproot/Legacy swap tests
+./gradlew :lib:test --tests "coinswap.StandardSwap"
+./gradlew :lib:test --tests "coinswap.TaprootSwap"
+```
+
+See the [CI workflow](.github/workflows/test-kotlin.yml) for complete test setup.
+
 ## Requirements
 
 ### Android
@@ -252,12 +269,11 @@ Build for Android architectures:
 
 ```bash
 # Add Android targets
-rustup target add aarch64-linux-android armv7-linux-androideabi x86_64-linux-android
+rustup target add aarch64-linux-android x86_64-linux-android
 
 # Build for all Android architectures
 cd ../ffi-commons
 cargo build --release --target aarch64-linux-android
-cargo build --release --target armv7-linux-androideabi
 cargo build --release --target x86_64-linux-android
 ```
 

coinswap-kotlin/build-scripts/development/build-dev-linux-x86_64.sh

@@ -0,0 +1,38 @@
+#!/bin/bash
+
+# Test/Development build script - builds only x86_64 for Android Studio Emulator
+# Use this for fast local testing and development
+
+if [ -z "$ANDROID_NDK_ROOT" ]; then
+    echo "Error: ANDROID_NDK_ROOT is not defined in your environment"
+    exit 1
+fi
+
+PATH="$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH"
+CFLAGS="-D__ANDROID_MIN_SDK_VERSION__=24"
+AR="llvm-ar"
+LIB_NAME="libcoinswap_ffi.so"
+
+COMPILATION_TARGET_X86_64="x86_64-linux-android"
+RESOURCE_DIR_X86_64="x86_64"
+
+# Move to the Rust library directory
+cd ../../ffi-commons || exit
+
+# Install perl and make (required for building vendored OpenSSL)
+# Uncomment if not installed: sudo apt-get install -y perl make
+
+rustup target add $COMPILATION_TARGET_X86_64
+CC="x86_64-linux-android24-clang" CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER="x86_64-linux-android24-clang" cargo build --target $COMPILATION_TARGET_X86_64
+mkdir -p ../coinswap-kotlin/lib/src/main/jniLibs/$RESOURCE_DIR_X86_64/
+cargo run --bin uniffi-bindgen generate --library ./target/$COMPILATION_TARGET_X86_64/debug/$LIB_NAME --language kotlin --out-dir ../coinswap-kotlin/lib/src/main/kotlin/ --no-format
+cp ./target/$COMPILATION_TARGET_X86_64/debug/$LIB_NAME ../coinswap-kotlin/lib/src/main/jniLibs/$RESOURCE_DIR_X86_64
+cp ./target/$COMPILATION_TARGET_X86_64/debug/libcoinswap_ffi.d ../coinswap-kotlin/lib/src/main/jniLibs/$RESOURCE_DIR_X86_64/
+cp ./target/debug/uniffi-bindgen ../coinswap-kotlin/lib/src/main/jniLibs/
+cp ./target/debug/uniffi-bindgen.d ../coinswap-kotlin/lib/src/main/jniLibs/
+
+echo ""
+echo "====================================="
+echo "Built for: x86_64"
+echo "Binary location: lib/src/main/jniLibs/$RESOURCE_DIR_X86_64/$LIB_NAME"
+echo "====================================="

coinswap-kotlin/build-scripts/development/build-dev-macos-x86_64.sh

@@ -0,0 +1,38 @@
+#!/bin/bash
+
+# Test/Development build script - builds only x86_64 for Android Studio Emulator
+# Use this for fast local testing and development
+
+if [ -z "$ANDROID_NDK_ROOT" ]; then
+    echo "Error: ANDROID_NDK_ROOT is not defined in your environment"
+    exit 1
+fi
+
+PATH="$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/darwin-x86_64/bin:$PATH"
+CFLAGS="-D__ANDROID_MIN_SDK_VERSION__=24"
+AR="llvm-ar"
+LIB_NAME="coinswap_ffi.dylib"
+
+COMPILATION_TARGET_X86_64="x86_64-linux-android"
+RESOURCE_DIR_X86_64="x86_64"
+
+# Move to the Rust library directory
+cd ../../ffi-commons || exit
+
+# Install perl and make (required for building vendored OpenSSL)
+# Uncomment if not installed: sudo apt-get install -y perl make
+
+rustup target add $COMPILATION_TARGET_X86_64
+CC="x86_64-linux-android24-clang" CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER="x86_64-linux-android24-clang" cargo build --target $COMPILATION_TARGET_X86_64
+mkdir -p ../coinswap-kotlin/lib/src/main/jniLibs/$RESOURCE_DIR_X86_64/
+cargo run --bin uniffi-bindgen generate --library ./target/$COMPILATION_TARGET_X86_64/debug/$LIB_NAME --language kotlin --out-dir ../coinswap-kotlin/lib/src/main/kotlin/ --no-format
+cp ./target/$COMPILATION_TARGET_X86_64/debug/$LIB_NAME ../coinswap-kotlin/lib/src/main/jniLibs/$RESOURCE_DIR_X86_64
+cp ./target/$COMPILATION_TARGET_X86_64/debug/$LIB_NAME ../coinswap-kotlin/lib/src/main/jniLibs/$RESOURCE_DIR_X86_64/
+cp ./target/debug/uniffi-bindgen ../coinswap-kotlin/lib/src/main/jniLibs/
+cp ./target/debug/uniffi-bindgen.d ../coinswap-kotlin/lib/src/main/jniLibs/
+
+echo ""
+echo "====================================="
+echo "Built for: x86_64"
+echo "Binary location: lib/src/main/jniLibs/$RESOURCE_DIR_X86_64/$LIB_NAME"
+echo "====================================="

coinswap-kotlin/build-scripts/release/build-release-linux-arm64_v8a.sh

@@ -0,0 +1,39 @@
+#!/bin/bash
+
+if [ -z "$ANDROID_NDK_ROOT" ]; then
+    echo "Error: ANDROID_NDK_ROOT is not defined in your environment"
+    exit 1
+fi
+
+PATH="$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH"
+CFLAGS="-D__ANDROID_MIN_SDK_VERSION__=24"
+AR="llvm-ar"
+LIB_NAME="libcoinswap_ffi.so"
+
+COMPILATION_TARGET_ARM64_V8A="aarch64-linux-android"
+COMPILATION_TARGET_X86_64="x86_64-linux-android"
+RESOURCE_DIR_ARM64_V8A="arm64-v8a"
+RESOURCE_DIR_X86_64="x86_64"
+
+# Move to the Rust library directory
+cd ../ffi-commons/ || exit
+
+# Install perl and make (required for building vendored OpenSSL)
+# Uncomment if not installed: sudo apt-get install -y perl make
+
+rustup target add $COMPILATION_TARGET_ARM64_V8A $COMPILATION_TARGET_X86_64 
+
+# Build the binaries
+# The CC and CARGO_TARGET_<TARGET>_LINUX_ANDROID_LINKER environment variables must be declared on the same line as the cargo build command
+CC="aarch64-linux-android24-clang" CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER="aarch64-linux-android24-clang" cargo build --profile release-smaller --target $COMPILATION_TARGET_ARM64_V8A
+CC="x86_64-linux-android24-clang" CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER="x86_64-linux-android24-clang" cargo build --profile release-smaller --target $COMPILATION_TARGET_X86_64
+
+# Copy the binaries to their respective resource directories
+mkdir -p ../coinswap-kotlin/lib/src/main/jniLibs/$RESOURCE_DIR_ARM64_V8A/
+mkdir -p ../coinswap-kotlin/lib/src/main/jniLibs/$RESOURCE_DIR_X86_64/
+cp ./target/$COMPILATION_TARGET_ARM64_V8A/release-smaller/$LIB_NAME ../coinswap-kotlin/lib/src/main/jniLibs/$RESOURCE_DIR_ARM64_V8A/
+cp ./target/$COMPILATION_TARGET_X86_64/release-smaller/$LIB_NAME ../coinswap-kotlin/lib/src/main/jniLibs/$RESOURCE_DIR_X86_64/
+
+cargo run --bin uniffi-bindgen generate --library ./target/$COMPILATION_TARGET_ARM64_V8A/release-smaller/$LIB_NAME --language kotlin --out-dir ../coinswap-kotlin/lib/src/main/kotlin/ --no-format
+cp ./target/$COMPILATION_TARGET_ARM64_V8A/release-smaller/libcoinswap_ffi.d ../coinswap-kotlin/lib/src/main/jniLibs/$RESOURCE_DIR_ARM64_V8A/
+cp ./target/$COMPILATION_TARGET_X86_64/release-smaller/libcoinswap_ffi.d ../coinswap-kotlin/lib/src/main/jniLibs/$RESOURCE_DIR_X86_64/

coinswap-kotlin/build-scripts/release/build-release-macos-arm64_v8a.sh

@@ -0,0 +1,37 @@
+#!/bin/bash
+
+if [ -z "$ANDROID_NDK_ROOT" ]; then
+    echo "Error: ANDROID_NDK_ROOT is not defined in your environment"
+    exit 1
+fi
+
+PATH="$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/darwin-x86_64/bin:$PATH"
+CFLAGS="-D__ANDROID_MIN_SDK_VERSION__=24"
+AR="llvm-ar"
+LIB_NAME="libcoinswap_ffi.dylib"
+COMPILATION_TARGET_ARM64_V8A="aarch64-linux-android"
+COMPILATION_TARGET_X86_64="x86_64-linux-android"
+RESOURCE_DIR_ARM64_V8A="arm64-v8a"
+RESOURCE_DIR_X86_64="x86_64"
+
+# Move to the Rust library directory
+cd ../ffi-commons/ || exit
+
+# Install perl and make (required for building vendored OpenSSL)
+# Uncomment if not installed: sudo apt-get install -y perl make
+
+rustup target add $COMPILATION_TARGET_ARM64_V8A $COMPILATION_TARGET_X86_64 
+
+# Build the binaries
+# The CC and CARGO_TARGET_<TARGET>_LINUX_ANDROID_LINKER environment variables must be declared on the same line as the cargo build command
+CC="aarch64-linux-android24-clang" CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER="aarch64-linux-android24-clang" cargo build --profile release-smaller --target $COMPILATION_TARGET_ARM64_V8A
+CC="x86_64-linux-android24-clang" CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER="x86_64-linux-android24-clang" cargo build --profile release-smaller --target $COMPILATION_TARGET_X86_64
+
+mkdir -p ../coinswap-kotlin/lib/src/main/jniLibs/$RESOURCE_DIR_ARM64_V8A/
+mkdir -p ../coinswap-kotlin/lib/src/main/jniLibs/$RESOURCE_DIR_X86_64/
+cp ./target/$COMPILATION_TARGET_ARM64_V8A/release-smaller/$LIB_NAME ../coinswap-kotlin/lib/src/main/jniLibs/$RESOURCE_DIR_ARM64_V8A/
+cp ./target/$COMPILATION_TARGET_X86_64/release-smaller/$LIB_NAME ../coinswap-kotlin/lib/src/main/jniLibs/$RESOURCE_DIR_X86_64/
+
+cargo run --bin uniffi-bindgen generate --library ./target/$COMPILATION_TARGET_ARM64_V8A/release-smaller/$LIB_NAME --language kotlin --out-dir ../coinswap-kotlin/lib/src/main/kotlin/ --no-format
+cp ./target/$COMPILATION_TARGET_ARM64_V8A/release-smaller/$LIB_NAME ../coinswap-kotlin/lib/src/main/jniLibs/$RESOURCE_DIR_ARM64_V8A/
+cp ./target/$COMPILATION_TARGET_X86_64/release-smaller/$LIB_NAME ../coinswap-kotlin/lib/src/main/jniLibs/$RESOURCE_DIR_X86_64/

coinswap-kotlin/build-scripts/release/build-release-win-arm64_v8a.sh

@@ -0,0 +1,38 @@
+#!/bin/bash
+
+if [ -z "$ANDROID_NDK_ROOT" ]; then
+    echo "Error: ANDROID_NDK_ROOT is not defined in your environment"
+    exit 1
+fi
+
+PATH="$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/windows-x86_64/bin:$PATH"
+CFLAGS="-D__ANDROID_MIN_SDK_VERSION__=24"
+AR="llvm-ar"
+LIB_NAME="coinswap_ffi.dll"
+COMPILATION_TARGET_ARM64_V8A="aarch64-linux-android"
+COMPILATION_TARGET_X86_64="x86_64-linux-android"
+RESOURCE_DIR_ARM64_V8A="arm64-v8a"
+RESOURCE_DIR_X86_64="x86_64"
+
+# Move to the Rust library directory
+cd ../ffi-commons/ || exit
+
+# Install perl and make (required for building vendored OpenSSL)
+# Uncomment if not installed: sudo apt-get install -y perl make
+
+rustup target add $COMPILATION_TARGET_ARM64_V8A $COMPILATION_TARGET_X86_64 
+
+# Build the binaries
+# The CC and CARGO_TARGET_<TARGET>_LINUX_ANDROID_LINKER environment variables must be declared on the same line as the cargo build command
+CC="aarch64-linux-android24-clang.cmd" CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER="aarch64-linux-android24-clang.cmd" cargo build --profile release-smaller --target $COMPILATION_TARGET_ARM64_V8A
+CC="x86_64-linux-android24-clang.cmd" CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER="x86_64-linux-android24-clang.cmd" cargo build --profile release-smaller --target $COMPILATION_TARGET_X86_64
+
+# Copy the binaries to their respective resource directories
+mkdir -p ../coinswap-kotlin/lib/src/main/jniLibs/$RESOURCE_DIR_ARM64_V8A/
+mkdir -p ../coinswap-kotlin/lib/src/main/jniLibs/$RESOURCE_DIR_X86_64/
+cp ./target/$COMPILATION_TARGET_ARM64_V8A/release-smaller/$LIB_NAME ../coinswap-kotlin/lib/src/main/jniLibs/$RESOURCE_DIR_ARM64_V8A/
+cp ./target/$COMPILATION_TARGET_X86_64/release-smaller/$LIB_NAME ../coinswap-kotlin/lib/src/main/jniLibs/$RESOURCE_DIR_X86_64/
+
+cargo run --bin uniffi-bindgen generate --library ./target/$COMPILATION_TARGET_ARM64_V8A/release-smaller/$LIB_NAME --language kotlin --out-dir ../coinswap-kotlin/lib/src/main/kotlin/ --no-format
+cp ./target/$COMPILATION_TARGET_ARM64_V8A/release-smaller/$LIB_NAME ../coinswap-kotlin/lib/src/main/jniLibs/$RESOURCE_DIR_ARM64_V8A/
+cp ./target/$COMPILATION_TARGET_X86_64/release-smaller/$LIB_NAME ../coinswap-kotlin/lib/src/main/jniLibs/$RESOURCE_DIR_X86_64/

coinswap-kotlin/build.gradle.kts coinswap-kotlin/lib/build.gradle.ktscoinswap-kotlin/build.gradle.kts renamed to coinswap-kotlin/lib/build.gradle.kts

@@ -29,6 +29,12 @@ kotlin {
     jvmToolchain(21)
 }
 
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(21))
+    }
+}
+
 tasks.test {
     useJUnitPlatform()
 

coinswap-kotlin/lib/proguard-rules.pro

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile