Merge modulemaps, setup test case for multi-crate project

antoniusnaumann · Apr 8, 2024 · 012c920 · 012c920
1 parent 093bccb
commit 012c920
Show file tree

Hide file tree

Showing 18 changed files with 617 additions and 21 deletions.
diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml
@@ -2,9 +2,9 @@ name: Examples
 
 on:
   push:
-    branches: [ "main" ]
+    branches: ["main"]
   pull_request:
-    branches: [ "main" ]
+    branches: ["main"]
 
 env:
   CARGO_TERM_COLOR: always
@@ -13,23 +13,25 @@ jobs:
   tests:
     strategy:
       matrix:
-        path: [
-            './swift-examples/hello-world/greeter',
-            './swift-examples/hello-world-macro/greeter'
+        path:
+          [
+            "./swift-examples/hello-world/greeter",
+            "./swift-examples/hello-world-macro/greeter",
+            "./swift-examples/hello-world-macro-multi-crate/greeter",
           ]
         target: [
-            'platform=macOS,arch=x86_64', 
-            'generic/platform=iOS',
+            "platform=macOS,arch=x86_64",
+            "generic/platform=iOS",
             # 'platform=iOS Simulator,os=latest'
           ]
     runs-on: macos-latest
     steps:
-    - uses: actions/checkout@v4
-    - name: Install
-      run: cargo install --force --path .
-    - name: Build example libraries
-      working-directory: ${{ matrix.path }}
-      run: cargo swift package --accept-all
-    - name: Build example apps
-      working-directory: ${{ matrix.path }}/../app
-      run: xcodebuild -scheme App -destination "${{ matrix.target }}" CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO
+      - uses: actions/checkout@v4
+      - name: Install
+        run: cargo install --force --path .
+      - name: Build example libraries
+        working-directory: ${{ matrix.path }}
+        run: cargo swift package --accept-all
+      - name: Build example apps
+        working-directory: ${{ matrix.path }}/../app
+        run: xcodebuild -scheme App -destination "${{ matrix.target }}" CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO
diff --git a/src/bindings.rs b/src/bindings.rs
@@ -1,4 +1,7 @@
-use std::fs::{self, create_dir};
+use std::{
+    fs::{self, create_dir},
+    io,
+};
 
 use crate::Result;
 use camino::Utf8Path;
@@ -28,6 +31,11 @@ pub fn generate_bindings(lib_path: &Utf8Path) -> Result<()> {
         false,
     )?;
 
+    let mut modulemap = fs::OpenOptions::new()
+        .create(true)
+        .append(true)
+        .open(headers.join("module.modulemap"))?;
+
     for output in uniffi_outputs {
         let crate_name = output.crate_name;
         fs::copy(
@@ -40,10 +48,11 @@ pub fn generate_bindings(lib_path: &Utf8Path) -> Result<()> {
             out_dir.join(format!("{ffi_name}.h")),
             headers.join(format!("{ffi_name}.h")),
         )?;
-        fs::copy(
-            out_dir.join(format!("{ffi_name}.modulemap")),
-            headers.join(format!("{ffi_name}.modulemap")),
-        )?;
+
+        let mut modulemap_part = fs::OpenOptions::new()
+            .read(true)
+            .open(out_dir.join(format!("{ffi_name}.modulemap")))?;
+        io::copy(&mut modulemap_part, &mut modulemap)?;
     }
 
     Ok(())

diff --git a/swift-examples/hello-world-macro-multi-crate/app/.gitignore b/swift-examples/hello-world-macro-multi-crate/app/.gitignore
@@ -0,0 +1,3 @@
+**/xcuserdata/
+.DS_Store
+build/