Revert "Revert "upgrade to bevy 0.15""

This reverts commit 4ce947a.

Author: extrawurst

CHANGELOG.md

@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## [0.5.0] - 2024-12-02
+
+### Fixed
+* upgrade to bevy `0.15`
+
 ## [0.4.2] - 2024-12-01
 
 ### Fixed

README.md

@@ -26,6 +26,7 @@ See also [bevy_ios_gamecenter](https://github.com/rustunit/bevy_ios_gamecenter),
 * listen to changes in transaction states
 * fetch list of all transactions (to restore old purchases of non-consumables)
 * supports subscriptions
+* convenient observer based API
 
 ## Notes
 * does not return locally un-signed/un-verified transactions
@@ -128,7 +129,8 @@ fn process_iap_events(
 
 |bevy|bevy\_ios\_iap|
 |---|---|
-|0.14|0.3,0.4,main|
+|0.15|0.5,main|
+|0.14|0.3,0.4|
 |0.13|0.2|
 
 # License

Sources/bevy_ios_iap/SwiftBridgeCore.swift

@@ -36,10 +36,6 @@ public protocol IntoRustString {
     func intoRustString() -> RustString;
 }
 
-public protocol ToRustStr {
-    func toRustStr<T> (_ withUnsafeRustStr: (RustStr) -> T) -> T;
-}
-
 extension String: IntoRustString {
     public func intoRustString() -> RustString {
         // TODO: When passing an owned Swift std String to Rust we've being wasteful here in that
@@ -73,6 +69,19 @@ func optionalStringIntoRustString<S: IntoRustString>(_ string: Optional<S>) -> R
     }
 }
 
+/// Used to safely get a pointer to a sequence of utf8 bytes, represented as a `RustStr`.
+///
+/// For example, the Swift `String` implementation of the `ToRustStr` protocol does the following:
+/// 1. Use Swift's `String.utf8.withUnsafeBufferPointer` to get a pointer to the strings underlying
+///    utf8 bytes.
+/// 2. Construct a `RustStr` that points to these utf8 bytes. This is safe because `withUnsafeBufferPointer`
+///    guarantees that the buffer pointer will be valid for the duration of the `withUnsafeBufferPointer`
+///    callback.
+/// 3. Pass the `RustStr` to the closure that was passed into `RustStr.toRustStr`.
+public protocol ToRustStr {
+    func toRustStr<T> (_ withUnsafeRustStr: (RustStr) -> T) -> T;
+}
+
 extension String: ToRustStr {
     /// Safely get a scoped pointer to the String and then call the callback with a RustStr
     /// that uses that pointer.

bevy_ios_iap/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "bevy_ios_iap"
-version = "0.4.2"
+version = "0.5.0"
 edition = "2021"
 build = "build.rs"
 readme = "../README.md"
@@ -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.14", default-features = false }
-bevy_ecs = { version = "0.14", default-features = false }
-bevy_ecs_macros = { version = "0.14", default-features = false }
-bevy_log = { version = "0.14", default-features = false }
-bevy_crossbeam_event = "0.6"
+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"
 swift-bridge = "0.1"
 
 [build-dependencies]

bevy_ios_iap/src/request.rs

@@ -139,7 +139,7 @@ pub fn plugin(app: &mut App) {
         PreUpdate,
         (
             cleanup_finished_requests,
-            process_events.run_if(on_event::<IosIapResponse>()),
+            process_events.run_if(on_event::<IosIapResponse>),
         )
             .chain()
             .in_set(BevyIosIapSet),