test

reown-com · Sep 24, 2024 · 24689e1 · 24689e1
1 parent af9eff1
commit 24689e1
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 15 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -7,7 +7,7 @@ on:
 
 env:
   CARGO_TERM_COLOR: always
-  VERSION: ${{ github.event.inputs.version || '0.0.12' }}
+  VERSION: ${{ github.event.inputs.version || '0.0.13' }}
   TARGET_BRANCH: ${{ github.ref_name }}
 
 permissions:
@@ -55,6 +55,8 @@ jobs:
       - name: Build and Package Rust XCFramework
         run: |
           make build-ios-bindings
+          mkdir -p crates/ffi/YttriumCore/Sources/YttriumCore/SwiftFFI
+          cp -R crates/ffi/generated/* crates/ffi/YttriumCore/Sources/YttriumCore/SwiftFFI/
           make zip-rust-xcframework
           make compute-rust-checksum
           make generate-package-swift

diff --git a/Makefile b/Makefile
@@ -74,8 +74,7 @@ zip-rust-xcframework:
 	mkdir -p Output
 	cd crates/ffi/YttriumCore/ && \
 	zip -r ../../../Output/RustXcframework.xcframework.zip \
-		RustXcframework.xcframework \
-		../generated
+		RustXcframework.xcframework
 
 .PHONY: compute-rust-checksum
 compute-rust-checksum:

diff --git a/Package.swift b/Package.swift
@@ -21,19 +21,18 @@ let package = Package(
     targets: [
         .binaryTarget(
             name: "RustXcframework",
-            url: "https://github.com/reown-com/yttrium/releases/download/0.0.8/RustXcframework.xcframework.zip",
-            checksum: "2a9b8823a8b6e02d4590a24e3ce0f56184e88c14ec4d6f64e0a39c57c2efb3b1"
+            url: "https://github.com/reown-com/yttrium/releases/download/0.0.12/RustXcframework.xcframework.zip",
+            checksum: "<your_checksum_here>"
         ),
         .target(
             name: "YttriumCore",
             dependencies: [
                 "RustXcframework"
             ],
-            path: "crates/ffi",
-            exclude: ["YttriumCore/RustXcframework.xcframework"],
+            path: "crates/ffi/YttriumCore/Sources/YttriumCore",
             sources: [
-                "YttriumCore/Sources/YttriumCore",
-                "generated"
+                ".",
+                "SwiftFFI" 
             ]
         ),
         .target(

diff --git a/crates/ffi/YttriumCore/Package.swift b/crates/ffi/YttriumCore/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:5.9.0
+// swift-tools-version:5.9
 import PackageDescription
 
 let package = Package(
@@ -29,18 +29,19 @@ let package = Package(
                 "RustXcframework",
                 .product(name: "SwiftDotenv", package: "swift-dotenv")
             ],
-            path: ".",
-            exclude: ["RustXcframework.xcframework"],
+            path: "Sources/YttriumCore",
+            exclude: [],
             sources: [
-                "Sources/YttriumCore",
-                "../generated"
+                ".",       
+                "SwiftFFI"  
             ]
         ),
         .testTarget(
             name: "YttriumCoreTests",
             dependencies: [
                 "YttriumCore"
-            ]
+            ],
+            path: "Tests/YttriumCoreTests"
         ),
     ]
 )