Merge pull request #201 from breez/savage-rename-bindings-dirs

Rename bindings directories

.github/workflows/build-language-bindings.yml

@@ -96,15 +96,15 @@ jobs:
         if: ${{ inputs.swift }}
         working-directory: lib/bindings
         run: |
-          cargo run --features=uniffi/cli --bin uniffi-bindgen generate src/breez_liquid_sdk.udl --no-format --language swift --out-dir bindings-swift/Sources/BreezLiquidSDK
-          mv bindings-swift/Sources/BreezLiquidSDK/breez_liquid_sdk.swift bindings-swift/Sources/BreezLiquidSDK/BreezLiquidSDK.swift
+          cargo run --features=uniffi/cli --bin uniffi-bindgen generate src/breez_liquid_sdk.udl --no-format --language swift --out-dir swift/Sources/BreezLiquidSDK
+          mv swift/Sources/BreezLiquidSDK/breez_liquid_sdk.swift swift/Sources/BreezLiquidSDK/BreezLiquidSDK.swift
       
       - name: Archive Swift binding
         if: ${{ inputs.swift }}
         uses: actions/upload-artifact@v3
         with:
           name: bindings-swift
-          path: lib/bindings/bindings-swift/Sources/BreezLiquidSDK/*
+          path: lib/bindings/swift/Sources/BreezLiquidSDK/*
       
       - name: Build Python binding
         if: ${{ inputs.python }}

.github/workflows/main.yml

@@ -115,33 +115,33 @@ jobs:
           run-bootstrap: false
       
       - name: Initialize the workspace
-        working-directory: lib/bindings/bindings-flutter/
+        working-directory: lib/bindings/flutter/
         run: |
           just clean
           just init
       
       - name: Install flutter_rust_bridge_codegen dependencies
-        working-directory: lib/bindings/bindings-flutter/
+        working-directory: lib/bindings/flutter/
         run: just frb
 
       - name: Generate Dart/Flutter bindings
-        working-directory: lib/bindings/bindings-flutter/
+        working-directory: lib/bindings/flutter/
         continue-on-error: true
         run: |
           just codegen
 
       - name: Generate FFI bindings
-        working-directory: lib/bindings/bindings-flutter/
+        working-directory: lib/bindings/flutter/
         continue-on-error: true
         run: |
           just ffigen
 
       - name: Static Analysis
-        working-directory: lib/bindings/bindings-flutter/
+        working-directory: lib/bindings/flutter/
         run: melos analyze
 
       - name: Check Formatting
-        working-directory: lib/bindings/bindings-flutter/
+        working-directory: lib/bindings/flutter/
         run: melos check-format
 
       - name: Check git status

.github/workflows/publish-android.yml

@@ -45,15 +45,15 @@ jobs:
       - uses: actions/download-artifact@v3
         with:
           name: bindings-android-jniLibs
-          path: lib/bindings/bindings-android/lib/src/main/jniLibs
+          path: lib/bindings/android/lib/src/main/jniLibs
 
       - uses: actions/download-artifact@v3
         with:
           name: bindings-kotlin
-          path: lib/bindings/bindings-android/lib/src/main/kotlin
+          path: lib/bindings/android/lib/src/main/kotlin
 
       - name: Build Android project
-        working-directory: lib/bindings/bindings-android
+        working-directory: lib/bindings/android
         env:
           ORG_GRADLE_PROJECT_libraryVersion: ${{ inputs.package-version || '0.0.1' }}
         run: ./gradlew assemble
@@ -62,11 +62,11 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: android-release.aar
-          path: lib/bindings/bindings-android/lib/build/outputs/aar/lib-release.aar
+          path: lib/bindings/android/lib/build/outputs/aar/lib-release.aar
         
       - name: Publish artifacts
         if: ${{ inputs.publish }}
-        working-directory: lib/bindings/bindings-android
+        working-directory: lib/bindings/android
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           BREEZ_MVN_USERNAME: ${{ secrets.BREEZ_MVN_USERNAME }}
@@ -84,7 +84,7 @@ jobs:
           # We're waiting for at most 60s before triggering the Jitpack build to give our Maven repo
           # some time to process the just uploaded files (the Jitpack build is dependent upon them being available).
           # If anything fails here, we'll still finish sucessfully as this is an optional optimization.
-          timeout 60 bash -c 'while [[ "$(curl --output /dev/null --silent --head --write-out ''%{http_code}'' https://mvn.breez.technology/releases/breez_liquid_sdk/bindings-android/${{ inputs.package-version }}/bindings-android-${{ inputs.package-version }}.pom)" != "200" ]]; do echo "Waiting for package to be published on mvn.breez.technology..." && sleep 5; done && echo "Package found."' || echo "Package not found." && true
+          timeout 60 bash -c 'while [[ "$(curl --output /dev/null --silent --head --write-out ''%{http_code}'' https://mvn.breez.technology/releases/breez_liquid_sdk/android/${{ inputs.package-version }}/android-${{ inputs.package-version }}.pom)" != "200" ]]; do echo "Waiting for package to be published on mvn.breez.technology..." && sleep 5; done && echo "Package found."' || echo "Package not found." && true
           echo "Attempting to trigger Jitpack build..."
           curl -s -m 30 https://jitpack.io/api/builds/com.github.breez/breez-liquid-sdk/${{ inputs.package-version }} || true
           echo "Done"

.github/workflows/publish-csharp.yml

@@ -42,41 +42,41 @@ jobs:
       - uses: actions/download-artifact@v3
         with:
           name: bindings-csharp
-          path: lib/bindings/bindings-csharp/src
+          path: lib/bindings/csharp/src
 
       - uses: actions/download-artifact@v3
         with:
           name: bindings-aarch64-apple-darwin
-          path: lib/bindings/bindings-csharp/src/runtimes/osx-arm64/native
+          path: lib/bindings/csharp/src/runtimes/osx-arm64/native
 
       - uses: actions/download-artifact@v3
         with:
           name: bindings-x86_64-apple-darwin
-          path: lib/bindings/bindings-csharp/src/runtimes/osx-x64/native
+          path: lib/bindings/csharp/src/runtimes/osx-x64/native
 
       - uses: actions/download-artifact@v3
         with:
           name: bindings-aarch64-unknown-linux-gnu
-          path: lib/bindings/bindings-csharp/src/runtimes/linux-arm64/native
+          path: lib/bindings/csharp/src/runtimes/linux-arm64/native
 
       - uses: actions/download-artifact@v3
         with:
           name: bindings-x86_64-unknown-linux-gnu
-          path: lib/bindings/bindings-csharp/src/runtimes/linux-x64/native
+          path: lib/bindings/csharp/src/runtimes/linux-x64/native
 
       - uses: actions/download-artifact@v3
         with:
           name: bindings-x86_64-pc-windows-msvc
-          path: lib/bindings/bindings-csharp/src/runtimes/win-x64/native
+          path: lib/bindings/csharp/src/runtimes/win-x64/native
 
       - uses: actions/download-artifact@v3
         with:
           name: bindings-i686-pc-windows-msvc
-          path: lib/bindings/bindings-csharp/src/runtimes/win-x86/native
+          path: lib/bindings/csharp/src/runtimes/win-x86/native
 
       - name: Update package version
         if: ${{ inputs.package-version }}
-        working-directory: lib/bindings/bindings-csharp/src
+        working-directory: lib/bindings/csharp/src
         run: sed -i.bak -e 's/<Version>.*<\/Version>/<Version>${{ inputs.package-version }}<\/Version>/' Breez.Liquid.Sdk.csproj
 
       - name: Setup dotnet
@@ -85,18 +85,18 @@ jobs:
           dotnet-version: '6.0.x'
 
       - name: Build the project
-        working-directory: lib/bindings/bindings-csharp/src
+        working-directory: lib/bindings/csharp/src
         run: dotnet build Breez.Liquid.Sdk.csproj
 
       - name: Create the package
-        working-directory: lib/bindings/bindings-csharp/src
+        working-directory: lib/bindings/csharp/src
         run: dotnet pack --configuration Release Breez.Liquid.Sdk.csproj
 
       - name: Archive the package
         uses: actions/upload-artifact@v3
         with:
           name: Breez.Liquid.Sdk.${{ inputs.package-version || '0.0.1' }}.nupkg
-          path: lib/bindings/bindings-csharp/src/bin/Release/Breez.Liquid.Sdk.*.nupkg
+          path: lib/bindings/csharp/src/bin/Release/Breez.Liquid.Sdk.*.nupkg
 
   test-package:
     needs: build-package
@@ -121,7 +121,7 @@ jobs:
         if: ${{ !inputs.skip-tests }}
         with:
           name: Breez.Liquid.Sdk.${{ inputs.package-version || '0.0.1' }}.nupkg
-          path: lib/bindings/bindings-csharp/src/bin/Release
+          path: lib/bindings/csharp/src/bin/Release
 
       - name: Setup dotnet
         if: ${{ !inputs.skip-tests }}
@@ -131,7 +131,7 @@ jobs:
       
       - name: test package
         if: ${{ !inputs.skip-tests }}
-        working-directory: lib/bindings/bindings-csharp/test
+        working-directory: lib/bindings/csharp/test
         run: dotnet run
       
   publish-package:

.github/workflows/publish-flutter.yml

@@ -53,19 +53,19 @@ jobs:
           rm -r ios
           rm -r android
           rm -r lib
-          cp -r ../build/lib/bindings/bindings-flutter/ios .
+          cp -r ../build/lib/bindings/flutter/ios .
           mv ios/breez_liquid_sdk.podspec.production ios/breez_liquid_sdk.podspec
-          cp -r ../build/lib/bindings/bindings-flutter/android .
+          cp -r ../build/lib/bindings/flutter/android .
           mv android/build.gradle.production android/build.gradle
-          cp -r ../build/lib/bindings/bindings-flutter/lib .
-          cp ../build/lib/bindings/bindings-flutter/pubspec.yaml .
-          cp ../build/lib/bindings/bindings-flutter/pubspec.lock .
+          cp -r ../build/lib/bindings/flutter/lib .
+          cp ../build/lib/bindings/flutter/pubspec.yaml .
+          cp ../build/lib/bindings/flutter/pubspec.lock .
 
       - name: Copy docs
         working-directory: dist
         run: |
-          cp ../build/lib/bindings/bindings-flutter/README.pub.md README.md || true
-          cp ../build/lib/bindings/bindings-flutter/CHANGELOG.md . || true
+          cp ../build/lib/bindings/flutter/README.pub.md README.md || true
+          cp ../build/lib/bindings/flutter/CHANGELOG.md . || true
 
       - uses: actions/download-artifact@v3
         with:

.github/workflows/publish-kotlin-multiplatform.yml

@@ -45,35 +45,35 @@ jobs:
       - uses: actions/download-artifact@v3
         with:
           name: bindings-android-jniLibs
-          path: lib/bindings/bindings-kotlin-multiplatform/breez-liquid-sdk-kmp/src/androidMain/jniLibs
+          path: lib/bindings/kotlin-multiplatform/breez-liquid-sdk-kmp/src/androidMain/jniLibs
 
       - uses: actions/download-artifact@v3
         with:
           name: bindings-kotlin-multiplatform
-          path: lib/bindings/bindings-kotlin-multiplatform/breez-liquid-sdk-kmp/src
+          path: lib/bindings/kotlin-multiplatform/breez-liquid-sdk-kmp/src
 
       - name: Copy jvmMain
         working-directory: lib/bindings
         run: |
-          cp -r bindings-kotlin-multiplatform/breez-liquid-sdk-kmp/src/jvmMain/kotlin bindings-kotlin-multiplatform/breez-liquid-sdk-kmp/src/androidMain/
+          cp -r kotlin-multiplatform/breez-liquid-sdk-kmp/src/jvmMain/kotlin kotlin-multiplatform/breez-liquid-sdk-kmp/src/androidMain/
 
       - uses: actions/download-artifact@v3
         with:
           name: bindings-aarch64-apple-ios
-          path: lib/bindings/bindings-kotlin-multiplatform/breez-liquid-sdk-kmp/src/lib/ios-arm64
+          path: lib/bindings/kotlin-multiplatform/breez-liquid-sdk-kmp/src/lib/ios-arm64
 
       - uses: actions/download-artifact@v3
         with:
           name: bindings-aarch64-apple-ios-sim
-          path: lib/bindings/bindings-kotlin-multiplatform/breez-liquid-sdk-kmp/src/lib/ios-simulator-arm64
+          path: lib/bindings/kotlin-multiplatform/breez-liquid-sdk-kmp/src/lib/ios-simulator-arm64
 
       - uses: actions/download-artifact@v3
         with:
           name: bindings-x86_64-apple-ios
-          path: lib/bindings/bindings-kotlin-multiplatform/breez-liquid-sdk-kmp/src/lib/ios-simulator-x64
+          path: lib/bindings/kotlin-multiplatform/breez-liquid-sdk-kmp/src/lib/ios-simulator-x64
 
       - name: Build Kotlin Multiplatform project
-        working-directory: lib/bindings/bindings-kotlin-multiplatform
+        working-directory: lib/bindings/kotlin-multiplatform
         env:
           ORG_GRADLE_PROJECT_libraryVersion: ${{ inputs.package-version || '0.0.1' }}
         run: ./gradlew :breez-liquid-sdk-kmp:assemble
@@ -82,11 +82,11 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: kotlin-multiplatform-release.aar
-          path: lib/bindings/bindings-kotlin-multiplatform/breez-liquid-sdk-kmp/build/outputs/aar/breez-liquid-sdk-kmp-release.aar
+          path: lib/bindings/kotlin-multiplatform/breez-liquid-sdk-kmp/build/outputs/aar/breez-liquid-sdk-kmp-release.aar
         
       - name: Publish artifacts
         if: ${{ inputs.publish }}
-        working-directory: lib/bindings/bindings-kotlin-multiplatform
+        working-directory: lib/bindings/kotlin-multiplatform
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           BREEZ_MVN_USERNAME: ${{ secrets.BREEZ_MVN_USERNAME }}

.github/workflows/publish-python.yml

@@ -45,40 +45,40 @@ jobs:
       - uses: actions/download-artifact@v3
         with:
           name: bindings-darwin-universal
-          path: lib/bindings/bindings-python/src/breez_liquid_sdk
+          path: lib/bindings/python/src/breez_liquid_sdk
 
       - uses: actions/download-artifact@v3
         with:
           name: bindings-python
-          path: lib/bindings/bindings-python/src/breez_liquid_sdk
+          path: lib/bindings/python/src/breez_liquid_sdk
 
       - name: Clean up downloaded files
         run: |
-          rm -f lib/bindings/bindings-python/src/breez_liquid_sdk/*.a
-          ls -R lib/bindings/bindings-python
+          rm -f lib/bindings/python/src/breez_liquid_sdk/*.a
+          ls -R lib/bindings/python
 
       - name: Update package version
         if: ${{ inputs.package-version }}
-        working-directory: lib/bindings/bindings-python
+        working-directory: lib/bindings/python
         run: sed -i.bak -e 's/    version=".*",/    version="${{ inputs.package-version }}",/' setup.py
 
       - name: Install dependencies
-        working-directory: lib/bindings/bindings-python
+        working-directory: lib/bindings/python
         run: pip3 install wheel setuptools
 
       - name: Build wheel
-        working-directory: lib/bindings/bindings-python
+        working-directory: lib/bindings/python
         run: python3 setup.py bdist_wheel --plat-name macosx_11_0_universal2 --verbose
 
       - name: List wheel contents
-        working-directory: lib/bindings/bindings-python/dist
+        working-directory: lib/bindings/python/dist
         run: python3 -m zipfile --list *.whl || true
 
       - name: Archive the wheel
         uses: actions/upload-artifact@v3
         with:
           name: python-wheel-${{ matrix.python }}-macos
-          path: lib/bindings/bindings-python/dist/*.whl
+          path: lib/bindings/python/dist/*.whl
 
   build-linux-wheels:
     runs-on: ubuntu-20.04
@@ -101,30 +101,30 @@ jobs:
       - uses: actions/download-artifact@v3
         with:
           name: bindings-${{ matrix.arch }}-unknown-linux-gnu
-          path: lib/bindings/bindings-python/src/breez_liquid_sdk
+          path: lib/bindings/python/src/breez_liquid_sdk
 
       - uses: actions/download-artifact@v3
         with:
           name: bindings-python
-          path: lib/bindings/bindings-python/src/breez_liquid_sdk
+          path: lib/bindings/python/src/breez_liquid_sdk
 
       - name: Update package version
         if: ${{ inputs.package-version }}
-        working-directory: lib/bindings/bindings-python
+        working-directory: lib/bindings/python
         run: sed -i.bak -e 's/    version=".*",/    version="${{ inputs.package-version }}",/' setup.py
 
       - name: Install dependencies
-        working-directory: lib/bindings/bindings-python
+        working-directory: lib/bindings/python
         run: pip3 install wheel setuptools
 
       - name: "Build wheel"
-        working-directory: lib/bindings/bindings-python
+        working-directory: lib/bindings/python
         run: python3 setup.py bdist_wheel --plat-name manylinux_2_31_${{ matrix.arch }} --verbose
 
       - uses: actions/upload-artifact@v3
         with:
           name: python-wheel-${{ matrix.python }}-manylinux_2_31_${{ matrix.arch }}
-          path: lib/bindings/bindings-python/dist/*.whl
+          path: lib/bindings/python/dist/*.whl
 
   build-windows-wheels:
     runs-on: windows-latest
@@ -148,22 +148,22 @@ jobs:
         if: matrix.arch == 'win_amd64'
         with:
           name: bindings-x86_64-pc-windows-msvc
-          path: lib/bindings/bindings-python/src/breez_liquid_sdk
+          path: lib/bindings/python/src/breez_liquid_sdk
 
       - uses: actions/download-artifact@v3
         if: matrix.arch == 'win32'
         with:
           name: bindings-i686-pc-windows-msvc
-          path: lib/bindings/bindings-python/src/breez_liquid_sdk
+          path: lib/bindings/python/src/breez_liquid_sdk
 
       - uses: actions/download-artifact@v3
         with:
           name: bindings-python
-          path: lib/bindings/bindings-python/src/breez_liquid_sdk
+          path: lib/bindings/python/src/breez_liquid_sdk
 
       - name: Copy VC redistributable DLLs for Windows
         if: matrix.arch == 'win_amd64'
-        working-directory: lib/bindings/bindings-python/src/breez_liquid_sdk
+        working-directory: lib/bindings/python/src/breez_liquid_sdk
         run: |
           Copy-Item (vswhere -latest -find 'VC\Redist\MSVC\*\x64\*\msvcp140.dll') .
           Copy-Item (vswhere -latest -find 'VC\Redist\MSVC\*\x64\*\vcruntime140.dll') .
@@ -171,28 +171,28 @@ jobs:
 
       - name: Copy VC redistributable DLLs for Windows
         if: matrix.arch == 'win32'
-        working-directory: lib/bindings/bindings-python/src/breez_liquid_sdk
+        working-directory: lib/bindings/python/src/breez_liquid_sdk
         run: |
           Copy-Item (vswhere -latest -find 'VC\Redist\MSVC\*\x86\*\msvcp140.dll') .
           Copy-Item (vswhere -latest -find 'VC\Redist\MSVC\*\x86\*\vcruntime140.dll') .
 
       - name: Update package version
         if: ${{ inputs.package-version }}
-        working-directory: lib/bindings/bindings-python
+        working-directory: lib/bindings/python
         run: (Get-Content setup.py) | Foreach-Object {$_ -replace '    version=".*",', ('    version="${{ inputs.package-version }}",')} | Set-Content setup.py
 
       - name: Install dependencies
-        working-directory: lib/bindings/bindings-python
+        working-directory: lib/bindings/python
         run: python -m pip install --upgrade pip twine wheel setuptools
 
       - name: "Build wheel"
-        working-directory: lib/bindings/bindings-python
+        working-directory: lib/bindings/python
         run: python -m setup bdist_wheel --plat-name ${{ matrix.arch }} --verbose
 
       - uses: actions/upload-artifact@v3
         with:
           name: python-wheel-${{ matrix.python }}-${{ matrix.arch }}
-          path: lib/bindings/bindings-python/dist/*.whl
+          path: lib/bindings/python/dist/*.whl
 
   publish-package:
     runs-on: ubuntu-latest
@@ -207,10 +207,10 @@ jobs:
       - name: Download wheels
         uses: actions/download-artifact@v3
         with:
-          path: lib/bindings/bindings-python/dist/
+          path: lib/bindings/python/dist/
 
       - name: Clean downloaded contents
-        working-directory: lib/bindings/bindings-python
+        working-directory: lib/bindings/python
         run: |
           find dist -maxdepth 1 ! -path dist ! -name "python-wheel-*" -exec rm -rf {} \;
           ls -laR dist
@@ -222,4 +222,4 @@ jobs:
           verbose: true
           user: __token__
           password: ${{ secrets.PYPI_API_TOKEN }}
-          packages_dir: lib/bindings/bindings-python/dist/*/
+          packages_dir: lib/bindings/python/dist/*/

.github/workflows/publish-swift.yml

@@ -50,7 +50,7 @@ jobs:
         uses: actions/download-artifact@v3
         with:
           name: bindings-swift
-          path: bindings-swift
+          path: swift
 
       - name: Download aarch64-apple-ios
         uses: actions/download-artifact@v3
@@ -72,25 +72,25 @@ jobs:
 
       - name: Copy swift bindings
         run: |
-          mkdir -p build/lib/bindings/bindings-swift/Sources/BreezLiquidSDK
-          cp bindings-swift/BreezLiquidSDK.swift build/lib/bindings/bindings-swift/Sources/BreezLiquidSDK/BreezLiquidSDK.swift
-          cp bindings-swift/breez_liquid_sdkFFI.h build/lib/bindings/bindings-swift/breez_liquid_sdkFFI.xcframework/ios-arm64/breez_liquid_sdkFFI.framework/Headers
-          cp bindings-swift/breez_liquid_sdkFFI.h build/lib/bindings/bindings-swift/breez_liquid_sdkFFI.xcframework/ios-arm64_x86_64-simulator/breez_liquid_sdkFFI.framework/Headers
-          cp bindings-swift/breez_liquid_sdkFFI.h build/lib/bindings/bindings-swift/breez_liquid_sdkFFI.xcframework/macos-arm64_x86_64/breez_liquid_sdkFFI.framework/Headers
-          mkdir -p build/lib/bindings/bindings-swift/breez_liquid_sdkFFI.xcframework/ios-arm64/breez_liquid_sdkFFI.framework/breez_liquid_sdkFFI
-          cp aarch64-apple-ios/libbreez_liquid_sdk_bindings.a build/lib/bindings/bindings-swift/breez_liquid_sdkFFI.xcframework/ios-arm64/breez_liquid_sdkFFI.framework/breez_liquid_sdkFFI
-          mkdir -p build/lib/bindings/bindings-swift/breez_liquid_sdkFFI.xcframework/ios-arm64_x86_64-simulator/breez_liquid_sdkFFI.framework/breez_liquid_sdkFFI
-          cp ios-universal-sim/libbreez_liquid_sdk_bindings.a build/lib/bindings/bindings-swift/breez_liquid_sdkFFI.xcframework/ios-arm64_x86_64-simulator/breez_liquid_sdkFFI.framework/breez_liquid_sdkFFI
-          cp darwin-universal/libbreez_liquid_sdk_bindings.a build/lib/bindings/bindings-swift/breez_liquid_sdkFFI.xcframework/macos-arm64_x86_64/breez_liquid_sdkFFI.framework/breez_liquid_sdkFFI
+          mkdir -p build/lib/bindings/swift/Sources/BreezLiquidSDK
+          cp swift/BreezLiquidSDK.swift build/lib/bindings/swift/Sources/BreezLiquidSDK/BreezLiquidSDK.swift
+          cp swift/breez_liquid_sdkFFI.h build/lib/bindings/swift/breez_liquid_sdkFFI.xcframework/ios-arm64/breez_liquid_sdkFFI.framework/Headers
+          cp swift/breez_liquid_sdkFFI.h build/lib/bindings/swift/breez_liquid_sdkFFI.xcframework/ios-arm64_x86_64-simulator/breez_liquid_sdkFFI.framework/Headers
+          cp swift/breez_liquid_sdkFFI.h build/lib/bindings/swift/breez_liquid_sdkFFI.xcframework/macos-arm64_x86_64/breez_liquid_sdkFFI.framework/Headers
+          mkdir -p build/lib/bindings/swift/breez_liquid_sdkFFI.xcframework/ios-arm64/breez_liquid_sdkFFI.framework/breez_liquid_sdkFFI
+          cp aarch64-apple-ios/libbreez_liquid_sdk_bindings.a build/lib/bindings/swift/breez_liquid_sdkFFI.xcframework/ios-arm64/breez_liquid_sdkFFI.framework/breez_liquid_sdkFFI
+          mkdir -p build/lib/bindings/swift/breez_liquid_sdkFFI.xcframework/ios-arm64_x86_64-simulator/breez_liquid_sdkFFI.framework/breez_liquid_sdkFFI
+          cp ios-universal-sim/libbreez_liquid_sdk_bindings.a build/lib/bindings/swift/breez_liquid_sdkFFI.xcframework/ios-arm64_x86_64-simulator/breez_liquid_sdkFFI.framework/breez_liquid_sdkFFI
+          cp darwin-universal/libbreez_liquid_sdk_bindings.a build/lib/bindings/swift/breez_liquid_sdkFFI.xcframework/macos-arm64_x86_64/breez_liquid_sdkFFI.framework/breez_liquid_sdkFFI
 
       - name: Compress XCFramework
-        working-directory: build/lib/bindings/bindings-swift
+        working-directory: build/lib/bindings/swift
         run: |
           zip -9 -r breez_liquid_sdkFFI.xcframework.zip breez_liquid_sdkFFI.xcframework
           echo "XCF_CHECKSUM=`swift package compute-checksum breez_liquid_sdkFFI.xcframework.zip`" >> $GITHUB_ENV
 
       - name: Update Swift Package definition
-        working-directory: build/lib/bindings/bindings-swift
+        working-directory: build/lib/bindings/swift
         run: |
           sed 's#.binaryTarget(name: "breez_liquid_sdkFFI", path: "./breez_liquid_sdkFFI.xcframework"),#.binaryTarget(name: "breez_liquid_sdkFFI", url: "https://github.com/breez/breez-liquid-sdk-swift/releases/download/${{ inputs.package-version || '0.0.1' }}/breez_liquid_sdkFFI.xcframework.zip", checksum: "${{ env.XCF_CHECKSUM }}"),#;/.testTarget(name: "BreezLiquidSDKTests", dependencies: \["BreezLiquidSDK"\]),/d' Package.swift > ../../../../dist/Package.swift
           cp -r Sources ../../../../dist
@@ -120,7 +120,7 @@ jobs:
         if: ${{ inputs.publish }}
         uses: ncipollo/release-action@v1
         with:
-          artifacts: "build/lib/bindings/bindings-swift/breez_liquid_sdkFFI.xcframework.zip"
+          artifacts: "build/lib/bindings/swift/breez_liquid_sdkFFI.xcframework.zip"
           tag: ${{ inputs.package-version || '0.0.1' }}
           token: ${{ secrets.GITHUB_TOKEN }}
           name: ${{ inputs.package-version || '0.0.1' }}

README.md

@@ -3,7 +3,7 @@
 - `lib`: [lib/README.md](lib/core/README.md)
 - `cli`: [cli/README.md](cli/README.md)
 - Bindings
-  - `python`: [lib/bindings/bindings-python/README.md]()
+  - `python`: [lib/bindings/README.md]()
 
 ## Roadmap
 - [x] Send/Recieve Lightning payments

lib/Cargo.toml

@@ -22,7 +22,7 @@ lto = true
 [workspace]
 members = [
     "bindings",
-    "bindings/bindings-react-native",
+    "bindings/react-native",
     "core",
 ]
 resolver = "2"

lib/bindings/makefile

@@ -35,6 +35,7 @@ test:
 all: bindings-swift bindings-android python-darwin react-native
 
 ## Android 
+.PHONY: android
 android: aarch64-linux-android armv7-linux-androideabi i686-linux-android x86_64-linux-android
 	cargo run --features=uniffi/cli --bin uniffi-bindgen generate src/breez_liquid_sdk.udl --no-format --language kotlin -o ffi/kotlin
 
@@ -55,32 +56,33 @@ x86_64-linux-android: $(SOURCES) ndk-home
 	cp -a $(ANDROID_NDK_HOME)/toolchains/llvm/prebuilt/$(OS_NAME)-x86_64/sysroot/usr/lib/x86_64-linux-android/libc++_shared.so ffi/kotlin/jniLibs/x86_64/
 
 bindings-android: android
-	cp -r ffi/kotlin/jniLibs bindings-android/lib/src/main
-	cp -r ffi/kotlin/breez_liquid_sdk bindings-android/lib/src/main/kotlin/
-	cd bindings-android && ./gradlew assemble
+	cp -r ffi/kotlin/jniLibs android/lib/src/main
+	cp -r ffi/kotlin/breez_liquid_sdk android/lib/src/main/kotlin/
+	cd android && ./gradlew assemble
 	mkdir -p ffi/android
-	cp bindings-android/lib/build/outputs/aar/lib-release.aar ffi/android
+	cp android/lib/build/outputs/aar/lib-release.aar ffi/android
 
 ## Kotlin
+.PHONY: kotlin
 kotlin: $(SOURCES)
 	cargo build --release --target $(TARGET)
 	cargo run --features=uniffi/cli --bin uniffi-bindgen generate src/breez_liquid_sdk.udl --no-format --language kotlin -o ffi/kotlin
 
 bindings-kotlin-multiplatform: ios-universal android
-	mkdir -p bindings-kotlin-multiplatform/breez-liquid-sdk-kmp/src/androidMain
-	cp -r ffi/kotlin/jniLibs/ bindings-kotlin-multiplatform/breez-liquid-sdk-kmp/src/androidMain/jniLibs/
-	cp -r ffi/kmp/* bindings-kotlin-multiplatform/breez-liquid-sdk-kmp/src/
+	mkdir -p kotlin-multiplatform/breez-liquid-sdk-kmp/src/androidMain
+	cp -r ffi/kotlin/jniLibs/ kotlin-multiplatform/breez-liquid-sdk-kmp/src/androidMain/jniLibs/
+	cp -r ffi/kmp/* kotlin-multiplatform/breez-liquid-sdk-kmp/src/
 
-	cp -r bindings-kotlin-multiplatform/breez-liquid-sdk-kmp/src/jvmMain/kotlin bindings-kotlin-multiplatform/breez-liquid-sdk-kmp/src/androidMain/
+	cp -r kotlin-multiplatform/breez-liquid-sdk-kmp/src/jvmMain/kotlin kotlin-multiplatform/breez-liquid-sdk-kmp/src/androidMain/
 
-	mkdir -p bindings-kotlin-multiplatform/breez-liquid-sdk-kmp/src/lib/ios-arm64/
-	mkdir -p bindings-kotlin-multiplatform/breez-liquid-sdk-kmp/src/lib/ios-simulator-arm64/
-	mkdir -p bindings-kotlin-multiplatform/breez-liquid-sdk-kmp/src/lib/ios-simulator-x64/
+	mkdir -p kotlin-multiplatform/breez-liquid-sdk-kmp/src/lib/ios-arm64/
+	mkdir -p kotlin-multiplatform/breez-liquid-sdk-kmp/src/lib/ios-simulator-arm64/
+	mkdir -p kotlin-multiplatform/breez-liquid-sdk-kmp/src/lib/ios-simulator-x64/
 
-	cp ../target/aarch64-apple-ios/release/libbreez_liquid_sdk_bindings.a bindings-kotlin-multiplatform/breez-liquid-sdk-kmp/src/lib/ios-arm64/
-	cp ../target/aarch64-apple-ios-sim/release/libbreez_liquid_sdk_bindings.a bindings-kotlin-multiplatform/breez-liquid-sdk-kmp/src/lib/ios-simulator-arm64/
-	cp ../target/x86_64-apple-ios/release/libbreez_liquid_sdk_bindings.a bindings-kotlin-multiplatform/breez-liquid-sdk-kmp/src/lib/ios-simulator-x64/
-	cd bindings-kotlin-multiplatform && ./gradlew :breez-liquid-sdk-kmp:assemble
+	cp ../target/aarch64-apple-ios/release/libbreez_liquid_sdk_bindings.a kotlin-multiplatform/breez-liquid-sdk-kmp/src/lib/ios-arm64/
+	cp ../target/aarch64-apple-ios-sim/release/libbreez_liquid_sdk_bindings.a kotlin-multiplatform/breez-liquid-sdk-kmp/src/lib/ios-simulator-arm64/
+	cp ../target/x86_64-apple-ios/release/libbreez_liquid_sdk_bindings.a kotlin-multiplatform/breez-liquid-sdk-kmp/src/lib/ios-simulator-x64/
+	cd kotlin-multiplatform && ./gradlew :breez-liquid-sdk-kmp:assemble
 
 ## Apple
 ios-universal: $(SOURCES)		
@@ -113,17 +115,17 @@ swift-darwin: darwin-universal
 	cd ffi/swift-darwin && "swiftc" "-emit-module" "-module-name" "breez_liquid_sdk_bindings" "-Xcc" "-fmodule-map-file=$(CURRENT_DIR)/ffi/swift-darwin/breez_liquid_sdkFFI.modulemap" "-I" "."  "-L" "." "-lbreez_liquid_sdk_bindings" breez_liquid_sdk.swift
 
 bindings-swift: ios-universal darwin-universal
-	mkdir -p bindings-swift/Sources/BreezLiquidSDK
-	cargo run --features=uniffi/cli --bin uniffi-bindgen generate src/breez_liquid_sdk.udl --no-format --language swift -o bindings-swift/Sources/BreezLiquidSDK
-	mv bindings-swift/Sources/BreezLiquidSDK/breez_liquid_sdk.swift bindings-swift/Sources/BreezLiquidSDK/BreezLiquidSDK.swift
-	cp bindings-swift/Sources/BreezLiquidSDK/breez_liquid_sdkFFI.h bindings-swift/breez_liquid_sdkFFI.xcframework/ios-arm64/breez_liquid_sdkFFI.framework/Headers
-	cp bindings-swift/Sources/BreezLiquidSDK/breez_liquid_sdkFFI.h bindings-swift/breez_liquid_sdkFFI.xcframework/ios-arm64_x86_64-simulator/breez_liquid_sdkFFI.framework/Headers
-	cp bindings-swift/Sources/BreezLiquidSDK/breez_liquid_sdkFFI.h bindings-swift/breez_liquid_sdkFFI.xcframework/macos-arm64_x86_64/breez_liquid_sdkFFI.framework/Headers
-	cp ../target/aarch64-apple-ios/release/libbreez_liquid_sdk_bindings.a bindings-swift/breez_liquid_sdkFFI.xcframework/ios-arm64/breez_liquid_sdkFFI.framework/breez_liquid_sdkFFI
-	cp ../target/ios-universal-sim/release/libbreez_liquid_sdk_bindings.a bindings-swift/breez_liquid_sdkFFI.xcframework/ios-arm64_x86_64-simulator/breez_liquid_sdkFFI.framework/breez_liquid_sdkFFI
-	cp ../target/darwin-universal/release/libbreez_liquid_sdk_bindings.a bindings-swift/breez_liquid_sdkFFI.xcframework/macos-arm64_x86_64/breez_liquid_sdkFFI.framework/breez_liquid_sdkFFI
-	rm bindings-swift/Sources/BreezLiquidSDK/breez_liquid_sdkFFI.h
-	rm bindings-swift/Sources/BreezLiquidSDK/breez_liquid_sdkFFI.modulemap
+	mkdir -p swift/Sources/BreezLiquidSDK
+	cargo run --features=uniffi/cli --bin uniffi-bindgen generate src/breez_liquid_sdk.udl --no-format --language swift -o swift/Sources/BreezLiquidSDK
+	mv swift/Sources/BreezLiquidSDK/breez_liquid_sdk.swift swift/Sources/BreezLiquidSDK/BreezLiquidSDK.swift
+	cp swift/Sources/BreezLiquidSDK/breez_liquid_sdkFFI.h swift/breez_liquid_sdkFFI.xcframework/ios-arm64/breez_liquid_sdkFFI.framework/Headers
+	cp swift/Sources/BreezLiquidSDK/breez_liquid_sdkFFI.h swift/breez_liquid_sdkFFI.xcframework/ios-arm64_x86_64-simulator/breez_liquid_sdkFFI.framework/Headers
+	cp swift/Sources/BreezLiquidSDK/breez_liquid_sdkFFI.h swift/breez_liquid_sdkFFI.xcframework/macos-arm64_x86_64/breez_liquid_sdkFFI.framework/Headers
+	cp ../target/aarch64-apple-ios/release/libbreez_liquid_sdk_bindings.a swift/breez_liquid_sdkFFI.xcframework/ios-arm64/breez_liquid_sdkFFI.framework/breez_liquid_sdkFFI
+	cp ../target/ios-universal-sim/release/libbreez_liquid_sdk_bindings.a swift/breez_liquid_sdkFFI.xcframework/ios-arm64_x86_64-simulator/breez_liquid_sdkFFI.framework/breez_liquid_sdkFFI
+	cp ../target/darwin-universal/release/libbreez_liquid_sdk_bindings.a swift/breez_liquid_sdkFFI.xcframework/macos-arm64_x86_64/breez_liquid_sdkFFI.framework/breez_liquid_sdkFFI
+	rm swift/Sources/BreezLiquidSDK/breez_liquid_sdkFFI.h
+	rm swift/Sources/BreezLiquidSDK/breez_liquid_sdkFFI.modulemap
 
 ## Python
 python-linux: $(SOURCES)
@@ -136,5 +138,6 @@ python-darwin: darwin-universal
 	cp ../target/darwin-universal/release/libbreez_liquid_sdk_bindings.dylib ffi/python
 
 ## React Native
+.PHONY: react-native
 react-native:
-	make -C bindings-react-native codegen
+	make -C react-native codegen