Flutter uniFFI

.github/workflows/main.yml

@@ -200,6 +200,11 @@ jobs:
         working-directory: lib/bindings/langs/flutter/
         run: just codegen
 
+      - name: Link C Headers
+        working-directory: lib/bindings/langs/flutter/
+        if: ${{ success() || failure() }}
+        run: just link-headers
+
       - name: Generate FFI bindings
         working-directory: lib/bindings/langs/flutter/
         if: ${{ success() || failure() }}

.github/workflows/publish-all-platforms.yml

@@ -98,11 +98,10 @@ jobs:
       bindings-windows: ${{ !!needs.pre-setup.outputs.csharp-package-version || !!needs.pre-setup.outputs.golang-package-version || !!needs.pre-setup.outputs.python-package-version }}
       bindings-darwin: ${{ !!needs.pre-setup.outputs.csharp-package-version || !!needs.pre-setup.outputs.golang-package-version || !!needs.pre-setup.outputs.python-package-version || !!needs.pre-setup.outputs.swift-package-version }}
       bindings-linux: ${{ !!needs.pre-setup.outputs.csharp-package-version || !!needs.pre-setup.outputs.golang-package-version || !!needs.pre-setup.outputs.python-package-version }}
-      bindings-flutter: ${{ !!needs.pre-setup.outputs.flutter-package-version }}
       bindings-android: ${{ !!needs.pre-setup.outputs.kotlin-multiplatform-package-version || !!needs.pre-setup.outputs.maven-package-version || !!needs.pre-setup.outputs.golang-package-version }}
       bindings-ios: ${{ !!needs.pre-setup.outputs.kotlin-multiplatform-package-version || !!needs.pre-setup.outputs.maven-package-version || !!needs.pre-setup.outputs.swift-package-version }}
       kotlin: ${{ !!needs.pre-setup.outputs.kotlin-multiplatform-package-version || !!needs.pre-setup.outputs.maven-package-version }}
-      swift: ${{ !!needs.pre-setup.outputs.swift-package-version }}
+      swift: ${{ !!needs.pre-setup.outputs.swift-package-version || !!needs.pre-setup.outputs.flutter-package-version }}
       python: ${{ !!needs.pre-setup.outputs.python-package-version }}
       csharp: ${{ !!needs.pre-setup.outputs.csharp-package-version }}
       golang: ${{ !!needs.pre-setup.outputs.golang-package-version }}
@@ -152,15 +151,6 @@ jobs:
       ref: ${{ needs.setup.outputs.ref }}
       use-dummy-binaries: ${{ needs.setup.outputs.use-dummy-binaries == 'true' }}
 
-  build-bindings-flutter:
-    needs: setup
-    if: ${{ needs.setup.outputs.bindings-flutter == 'true' }}
-    uses: ./.github/workflows/build-bindings-flutter.yml
-    with:
-      repository: ${{ needs.setup.outputs.repository }}
-      ref: ${{ needs.setup.outputs.ref }}
-      use-dummy-binaries: ${{ needs.setup.outputs.use-dummy-binaries == 'true' }}
-
   build-bindings-android:
     needs: setup
     if: ${{ needs.setup.outputs.bindings-android == 'true' }}
@@ -275,7 +265,7 @@ jobs:
   publish-flutter:
     needs:
       - setup
-      - build-bindings-flutter
+      - build-language-bindings
       - publish-dart
     if: ${{ needs.setup.outputs.flutter == 'true' }}
     uses: ./.github/workflows/publish-flutter.yml

.github/workflows/publish-flutter.yml

@@ -57,14 +57,19 @@ jobs:
         run: |
           rm -rf android
           rm -rf ios
+          rm -rf macos
           rm -rf lib
           cp -r ../build/packages/flutter/android .
           cp -r ../build/packages/flutter/ios .
+          cp -r ../build/packages/flutter/macos .
           mv android/build.gradle.production android/build.gradle
           mv ios/flutter_breez_liquid.podspec.production ios/flutter_breez_liquid.podspec
-          rm ios/breez_sdk_liquid.podspec
+          mv macos/flutter_breez_liquid.podspec.production macos/flutter_breez_liquid.podspec
           cp -r ../build/packages/flutter/lib .
           cp -r ../build/lib/bindings/langs/flutter/breez_sdk_liquid/include/breez_sdk_liquid.h ios/Classes
+          cp -r ../build/lib/bindings/langs/flutter/breez_sdk_liquid/include/breez_sdk_liquid.h macos/Classes
+          cp -r ../build/lib/bindings/langs/flutter/breez_sdk_liquidFFI/include/breez_sdk_liquidFFI.h ios/Classes
+          cp -r ../build/lib/bindings/langs/flutter/breez_sdk_liquidFFI/include/breez_sdk_liquidFFI.h macos/Classes
           cp ../build/packages/flutter/analysis_options.yaml .
           cp ../build/packages/flutter/pubspec.yaml .
           cp ../build/packages/flutter/pubspec_overrides.yaml .
@@ -78,24 +83,35 @@ jobs:
 
       - uses: actions/download-artifact@v4
         with:
-          name: bindings-flutter
-          path: bindings/
+          name: bindings-swift
+          path: dist/ios/Sources/BreezSDKLiquid/
+
+      - name: Cleanup header file artifacts 
+        working-directory: dist/ios/Sources/BreezSDKLiquid/
+        run: |
+          rm breez_sdk_liquidFFI.h
+          rm breez_sdk_liquidFFI.modulemap
+
+      - name: Copy iOS sources to macOS sources
+        working-directory: dist
+        run: |
+          cp -r ios/Sources/ macos/Sources/
 
       - name: Set package version
         working-directory: dist
         run: |
           sed -i.bak -e 's/version:.*/version: ${{ inputs.package-version }}/' pubspec.yaml
           sed -i.bak -e 's/path:.*/git:\n      url: git@github.com:breez\/breez-sdk-liquid-dart.git\n      ref: ${{ inputs.package-version }}/' pubspec_overrides.yaml
           sed -i.bak -e "s/^version .*/version '${{ inputs.package-version }}'/" android/build.gradle
-          sed -i.bak -e 's/set(TagName.*/set(TagName "v${{ inputs.package-version }}")/' android/CMakeLists.txt
           sed -i.bak -e "s/^version = .*/version = '${{ inputs.package-version }}'/" ios/flutter_breez_liquid.podspec
+          sed -i.bak -e "s/^version = .*/version = '${{ inputs.package-version }}'/" macos/flutter_breez_liquid.podspec
           rm pubspec.yaml.bak
           rm pubspec_overrides.yaml.bak
           rm android/build.gradle.bak
-          rm android/CMakeLists.txt.bak
           rm ios/flutter_breez_liquid.podspec.bak
+          rm macos/flutter_breez_liquid.podspec.bak
 
-      - name: Update version number on podspec files & CMake scripts
+      - name: Update version number on podspec & gradle files
         working-directory: build/lib/bindings/langs/flutter/
         run: bash scripts/version.sh
 
@@ -118,16 +134,3 @@ jobs:
           git push
           git tag v${{ inputs.package-version }} -m "v${{ inputs.package-version }}"
           git push --tags
-
-      - name: Release and attach binary artifacts
-        if: ${{ inputs.publish }}
-        uses: softprops/action-gh-release@v2
-        with:
-          repository: breez/breez-sdk-liquid-flutter
-          files: |
-            bindings/android.tar.gz
-            bindings/breez_sdk_liquid.xcframework.zip
-          tag_name: v${{ inputs.package-version || '0.0.1' }}
-          generate_release_notes: false
-          token: ${{ secrets.SWIFT_RELEASE_TOKEN }}
-          prerelease: true

.gitignore

@@ -5,6 +5,8 @@
 # symlink headers
 packages/flutter/ios/Classes/breez_sdk_liquid.h
 packages/flutter/macos/Classes/breez_sdk_liquid.h
+packages/flutter/ios/Classes/breez_sdk_liquidFFI.h
+packages/flutter/macos/Classes/breez_sdk_liquidFFI.h
 # Miscellaneous
 .DS_Store
 .idea/

lib/bindings/langs/android/lib/src/main/kotlin/breez_sdk_liquid_notification/ForegroundService.kt

@@ -187,7 +187,7 @@ abstract class ForegroundService : SdkForegroundService, EventListener, Service(
     }
 
     @Suppress("unused")
-    fun setLogger(logger: Logger) {
+    fun setServiceLogger(logger: Logger) {
         this.logger = ServiceLogger(logger)
     }
 }