support Bevy 0.16 (#8)

Author: extrawurst

.github/workflows/ci.yml

@@ -12,72 +12,74 @@ jobs:
     runs-on: macos-latest
 
     steps:
-    - uses: actions/checkout@v4
-    - uses: dtolnay/rust-toolchain@stable
-
-    - name: Add iOS targets
-      run: rustup target add aarch64-apple-ios aarch64-apple-ios-sim x86_64-apple-ios
-
-    - name: Rust Cache
-      uses: Swatinem/rust-cache@v2
-      with:
-        workspaces: "./bevy_ios_iap"
-
-    - name: Check iOS Sim
-      run: |
-        cd bevy_ios_iap
-        cargo c --target=aarch64-apple-ios-sim
-        cargo b --target=aarch64-apple-ios-sim
-        cargo clippy --target=aarch64-apple-ios-sim
-
-    - name: Check iOS
-      run: |
-        cd bevy_ios_iap
-        cargo c --target=aarch64-apple-ios
-        cargo b --target=aarch64-apple-ios
-        cargo clippy --target=aarch64-apple-ios
-    
-    - name: Check MacOs
-      run: |
-        cd bevy_ios_iap
-        cargo c
-        cargo b
-        cargo clippy
-        cargo t
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@stable
+
+      - name: Add iOS targets
+        run: rustup target add aarch64-apple-ios aarch64-apple-ios-sim x86_64-apple-ios
+
+      - name: Rust Cache
+        uses: Swatinem/rust-cache@v2
+        with:
+          workspaces: "./bevy_ios_iap"
+
+      # TODO: enable once https://github.com/rust-lang/rust-bindgen/issues/3181 is released
+      # - name: Check iOS Sim
+      #   run: |
+      #     cd bevy_ios_iap
+      #     cargo c --target=aarch64-apple-ios-sim
+      #     cargo b --target=aarch64-apple-ios-sim
+      #     cargo clippy --target=aarch64-apple-ios-sim
+
+      - name: Check iOS
+        run: |
+          cd bevy_ios_iap
+          cargo c --target=aarch64-apple-ios
+          cargo b --target=aarch64-apple-ios
+          cargo clippy --target=aarch64-apple-ios
+
+      - name: Check MacOs
+        run: |
+          cd bevy_ios_iap
+          cargo c
+          cargo b
+          cargo clippy
+          cargo t
 
   build_egui:
     runs-on: macos-latest
 
     steps:
-    - uses: actions/checkout@v4
-    - uses: dtolnay/rust-toolchain@stable
-
-    - name: Add iOS targets
-      run: rustup target add aarch64-apple-ios aarch64-apple-ios-sim x86_64-apple-ios
-
-    - name: Rust Cache
-      uses: Swatinem/rust-cache@v2
-      with:
-        workspaces: "./bevy_ios_iap_egui"
-
-    - name: Check iOS Sim
-      run: |
-        cd bevy_ios_iap_egui
-        cargo c --target=aarch64-apple-ios-sim
-        cargo b --target=aarch64-apple-ios-sim
-        cargo clippy --target=aarch64-apple-ios-sim
-
-    - name: Check iOS
-      run: |
-        cd bevy_ios_iap_egui
-        cargo c --target=aarch64-apple-ios
-        cargo b --target=aarch64-apple-ios
-        cargo clippy --target=aarch64-apple-ios
-    
-    - name: Check MacOs
-      run: |
-        cd bevy_ios_iap_egui
-        cargo c
-        cargo b
-        cargo clippy
-        cargo t
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@stable
+
+      - name: Add iOS targets
+        run: rustup target add aarch64-apple-ios aarch64-apple-ios-sim x86_64-apple-ios
+
+      - name: Rust Cache
+        uses: Swatinem/rust-cache@v2
+        with:
+          workspaces: "./bevy_ios_iap_egui"
+
+      # TODO: enable once https://github.com/rust-lang/rust-bindgen/issues/3181 is released
+      # - name: Check iOS Sim
+      #   run: |
+      #     cd bevy_ios_iap_egui
+      #     cargo c --target=aarch64-apple-ios-sim
+      #     cargo b --target=aarch64-apple-ios-sim
+      #     cargo clippy --target=aarch64-apple-ios-sim
+
+      - name: Check iOS
+        run: |
+          cd bevy_ios_iap_egui
+          cargo c --target=aarch64-apple-ios
+          cargo b --target=aarch64-apple-ios
+          cargo clippy --target=aarch64-apple-ios
+
+      - name: Check MacOs
+        run: |
+          cd bevy_ios_iap_egui
+          cargo c
+          cargo b
+          cargo clippy
+          cargo t

CHANGELOG.md

@@ -7,15 +7,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
-## [0.6.0] - 2024-03-30
+## [0.7.0] - 2025-04-26
+
+### Fixed
+* upgrade to bevy `0.16`
+* temporarily disabled ios-sim support until rust-bindgen [releases](https://github.com/rust-lang/rust-bindgen/issues/3181)
+
+## [0.6.0] - 2025-03-30
 
 ### Changed
 * make `Transaction` `reason` and `storefront` available only ios `17.0` or up
 * introduce `Ios17Specific` Option-like that forces users to handle the fact that these values are only available on iOS 17 or up
 * make package iOS `16.0` compatible
 * remove `currency_code` as it was deprecated in iOS `16.0`
 
-## [0.5.2] - 2024-01-11
+## [0.5.2] - 2025-01-11
 
 ### Added
 * add `IosIapPurchaseError` and `IosIapStoreKitError` to `IosIapPurchaseResponse` to provide programmatic error handling
@@ -73,4 +79,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 *note:* the crate release matches the commit tagged with the `ru-` prefix because we release the swift package after the crate due to its dependency on each other
 
 ### Added
-* `IosIapPurchaseResult` can be `Unknown` if an invalid product ID is used for a purchase ([#3](https://github.com/rustunit/bevy_ios_iap/issues/3))
+* `IosIapPurchaseResult` can be `Unknown` if an invalid product ID is used for a purchase ([#3](https://github.com/rustunit/bevy_ios_iap/issues/3))

Package.swift

@@ -10,17 +10,17 @@ let package = Package(
         // Products define the executables and libraries a package produces, making them visible to other packages.
         .library(
             name: "bevy_ios_iap",
-            targets: ["bevy_ios_iap"]),
+            targets: ["bevy_ios_iap"])
     ],
     targets: [
         // Targets are the basic building blocks of a package, defining a module or a test suite.
         // Targets can depend on other targets in this package and products from dependencies.
         .binaryTarget(
             name: "RustXcframework",
-            // for local development:
-            //    path: "RustXcframework.xcframework"),
-         url: "https://github.com/rustunit/bevy_ios_iap/releases/download/rs-0.6.0/RustXcframework.xcframework.zip",
-         checksum: "ce0261d0fda41b2108b9f34bd2235f0e245c6b666a1921615a24a8a61fa41f1e"),
+            //for local development:
+            path: "RustXcframework.xcframework"),
+        //url: "https://github.com/rustunit/bevy_ios_iap/releases/download/rs-0.6.0/RustXcframework.xcframework.zip",
+        //checksum: "ce0261d0fda41b2108b9f34bd2235f0e245c6b666a1921615a24a8a61fa41f1e"),
         .target(
             name: "bevy_ios_iap",
             dependencies: ["RustXcframework"]),

README.md

@@ -51,17 +51,17 @@ It uses [Swift-Bridge](https://github.com/chinedufn/swift-bridge) to auto-genera
 
 * Don't forget to configure your purchases like for any other iOS app, this guide will not focus on that, as it is the same no matter what engine you use. this guide focuses on setting things up in a bevy project.
 
-**Note:** 
+**Note:**
 The rust crate used must be **exactly** the same version as the Swift Package (for binary compatibility reasons).
 I suggest using a specific version (like `0.2.0` in the screenshot) to make sure to always use binary matching versions!
 
 ### 2. Add Rust dependency
 
 ```
 cargo add bevy_ios_iap
-``` 
+```
 
-or 
+or
 
 ```toml
 # always pin to the same exact version you also of the Swift package
@@ -79,7 +79,7 @@ app.add_plugins(IosIapPlugin::new(true));
 
 ```rust
 fn bevy_system(mut iap: BevyIosIap) {
-    // If you set the plugin to manual init, this will register the 
+    // If you set the plugin to manual init, this will register the
     // TranscactionObserver to listen to updates to any Transactions and trigger
     // `IosIapEvents::Transaction` accordingly.
     // Note: this will require the user to be logged in into their apple-id and popup a login dialog if not
@@ -156,9 +156,10 @@ fn process_iap_events(
 
 ## Bevy version support
 
-|bevy|bevy\_ios\_iap|
+|bevy|crate|
 |---|---|
-|0.15|0.5,main|
+|0.16|0.6,main|
+|0.15|0.5|
 |0.14|0.3,0.4|
 |0.13|0.2|
 

Sources/bevy_ios_iap/BevyIosIAP.swift

@@ -214,6 +214,9 @@ public func convert_storekit_error(_ error: (StoreKitError)) -> IosIapStoreKitEr
     case .systemError(let e): IosIapStoreKitError.system_error(e.localizedDescription)
     case .notAvailableInStorefront: IosIapStoreKitError.not_available_in_storefront()
     case .notEntitled: IosIapStoreKitError.not_entitled()
+    
+    @unknown default:
+        IosIapStoreKitError.unknown()
     }
 }
 

bevy_ios_iap/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "bevy_ios_iap"
-version = "0.6.0"
-edition = "2021"
+version = "0.7.0"
+edition = "2024"
 build = "build.rs"
 readme = "../README.md"
 license = "MIT"
@@ -15,11 +15,11 @@ description = "Bevy Plugin and Swift Package to provide access to iOS native Sto
 crate-type = ["staticlib", "rlib"]
 
 [dependencies]
-bevy_app = { version = "0.15", default-features = false }
-bevy_ecs = { version = "0.15", default-features = false }
-bevy_ecs_macros = { version = "0.15", default-features = false }
-bevy_log = { version = "0.15", default-features = false }
-bevy_crossbeam_event = "0.7"
+bevy_app = { version = "0.16", default-features = false }
+bevy_ecs = { version = "0.16", default-features = false }
+bevy_ecs_macros = { version = "0.16", default-features = false }
+bevy_log = { version = "0.16", default-features = false }
+bevy_crossbeam_event = "0.8"
 swift-bridge = "0.1"
 
 [build-dependencies]

bevy_ios_iap/build-rust-release.sh

@@ -10,10 +10,13 @@ cd $THISDIR
 touch ./src/lib.rs
 cargo build --release --target aarch64-apple-ios
 cargo build --release --target x86_64-apple-ios
-cargo build --release --target aarch64-apple-ios-sim
+# TODO: enable once https://github.com/rust-lang/rust-bindgen/issues/3181 is released
+# cargo build --release --target aarch64-apple-ios-sim
+#
 mkdir -p ./target/universal-ios/release
 
-lipo \
-    ./target/aarch64-apple-ios-sim/release/libbevy_ios_iap.a \
-    ./target/x86_64-apple-ios/release/libbevy_ios_iap.a -create -output \
-    ./target/universal-ios/release/libbevy_ios_iap.a
+# TODO: add back sim target
+lipo -create \
+    "./target/aarch64-apple-ios/release/libbevy_ios_iap.a" \
+    "./target/x86_64-apple-ios/release/libbevy_ios_iap.a" \
+    -output ./target/universal-ios/release/libbevy_ios_iap.a

bevy_ios_iap/build-rust.sh

@@ -10,10 +10,13 @@ cd $THISDIR
 touch ./src/lib.rs
 cargo build --target aarch64-apple-ios
 cargo build --target x86_64-apple-ios
-cargo build --target aarch64-apple-ios-sim
+# TODO: enable once https://github.com/rust-lang/rust-bindgen/issues/3181 is released
+# cargo build --target aarch64-apple-ios-sim
+
 mkdir -p ./target/universal-ios/debug
 
-lipo \
-    ./target/aarch64-apple-ios-sim/debug/libbevy_ios_iap.a \
-    ./target/x86_64-apple-ios/debug/libbevy_ios_iap.a -create -output \
-    ./target/universal-ios/debug/libbevy_ios_iap.a
+# TODO: add back sim target
+lipo -create \
+    "./target/aarch64-apple-ios/debug/libbevy_ios_iap.a" \
+    "./target/x86_64-apple-ios/debug/libbevy_ios_iap.a" \
+    -output ./target/universal-ios/debug/libbevy_ios_iap.a

bevy_ios_iap/justfile

@@ -0,0 +1,5 @@
+check:
+    cargo c
+    cargo c --target=aarch64-apple-ios
+    cargo clippy
+    cargo fmt -- --check

bevy_ios_iap/src/native.rs

@@ -1,3 +1,5 @@
+#![allow(clippy::unnecessary_cast)]
+
 use std::sync::OnceLock;
 
 use bevy_crossbeam_event::CrossbeamEventSender;
@@ -6,13 +8,13 @@ use bevy_crossbeam_event::CrossbeamEventSender;
 pub use ffi::*;
 
 use crate::{
-    plugin::{IosIapEvents, IosIapResponse},
-    transaction::IosIapTransaction,
     IosIapCurrency, IosIapEnvironment, IosIapProduct, IosIapProductType, IosIapProductsResponse,
     IosIapPurchaseError, IosIapPurchaseResponse, IosIapRevocationReason, IosIapStoreKitError,
     IosIapStorefront, IosIapSubscriptionInfo, IosIapSubscriptionPeriod,
     IosIapSubscriptionPeriodUnit, IosIapSubscriptionRenewalState, IosIapSubscriptionStatus,
     IosIapTransactionFinishResponse, IosIapTransactionReason, IosIapTransactionResponse,
+    plugin::{IosIapEvents, IosIapResponse},
+    transaction::IosIapTransaction,
 };
 
 #[swift_bridge::bridge]
@@ -246,12 +248,12 @@ static SENDER_RESPONSE: OnceLock<Option<CrossbeamEventSender<IosIapResponse>>> =
 
 #[allow(dead_code)]
 pub fn set_sender_events(sender: CrossbeamEventSender<IosIapEvents>) {
-    while !SENDER_EVENTS.set(Some(sender.clone())).is_ok() {}
+    while SENDER_EVENTS.set(Some(sender.clone())).is_err() {}
 }
 
 #[allow(dead_code)]
 pub fn set_sender_response(sender: CrossbeamEventSender<IosIapResponse>) {
-    while !SENDER_RESPONSE.set(Some(sender.clone())).is_ok() {}
+    while SENDER_RESPONSE.set(Some(sender.clone())).is_err() {}
 }
 
 fn transaction_update(t: IosIapTransaction) {