diff --git a/AirshipFrameworkProxy.podspec b/AirshipFrameworkProxy.podspec index e8c781f..0740c55 100644 --- a/AirshipFrameworkProxy.podspec +++ b/AirshipFrameworkProxy.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| - s.version = "9.1.3" + s.version = "10.0.0" s.name = "AirshipFrameworkProxy" s.summary = "Airship iOS mobile framework proxy" s.documentation_url = "https://docs.airship.com/platform/mobile" @@ -15,7 +15,7 @@ Pod::Spec.new do |s| s.requires_arc = true s.swift_version = "5.0" s.source_files = "ios/AirshipFrameworkProxy/**/*.{h,m,swift}" - s.dependency 'Airship', "18.9.2" + s.dependency 'Airship', "18.10.0" s.source_files = 'ios/AirshipFrameworkProxyLoader/**/*.{swift,h,m,c,cc,mm,cpp}', 'ios/AirshipFrameworkProxy/**/*.{swift,h,m,c,cc,mm,cpp}' end diff --git a/Package.swift b/Package.swift index 2517b7e..3117ed3 100644 --- a/Package.swift +++ b/Package.swift @@ -15,7 +15,7 @@ let package = Package( ) ], dependencies: [ - .package(url: "https://github.com/urbanairship/ios-library.git", from: "18.9.2") + .package(url: "https://github.com/urbanairship/ios-library.git", from: "18.10.0") ], targets: [ .target( diff --git a/android/airship-framework-proxy/src/main/java/com/urbanairship/android/framework/proxy/proxies/LiveUpdatesManagerProxy.kt b/android/airship-framework-proxy/src/main/java/com/urbanairship/android/framework/proxy/proxies/LiveUpdatesManagerProxy.kt index 4a16ec2..81c15da 100644 --- a/android/airship-framework-proxy/src/main/java/com/urbanairship/android/framework/proxy/proxies/LiveUpdatesManagerProxy.kt +++ b/android/airship-framework-proxy/src/main/java/com/urbanairship/android/framework/proxy/proxies/LiveUpdatesManagerProxy.kt @@ -26,7 +26,7 @@ public class LiveUpdatesManagerProxy(private val managerProvider: () -> LiveUpda return this.manager.getAllActiveUpdates().map { LiveUpdateProxy(it) } } - public fun create(request: LiveUpdateRequest.Create) { + public fun start(request: LiveUpdateRequest.Start) { this.manager.start( name = request.name, type = request.type, @@ -53,6 +53,10 @@ public class LiveUpdatesManagerProxy(private val managerProvider: () -> LiveUpda dismissTimestamp = request.dismissalTimestamp ) } + + public fun clearAll() { + this.manager.clearAll() + } } public class LiveUpdateProxy(private val liveUpdate: LiveUpdate): JsonSerializable { @@ -118,7 +122,7 @@ public sealed class LiveUpdateRequest { } } - public data class Create( + public data class Start( val name: String, val type: String, val content: JsonMap, @@ -127,9 +131,9 @@ public sealed class LiveUpdateRequest { ): LiveUpdateRequest() { public companion object { @Throws(JsonException::class) - public fun fromJson(jsonValue: JsonValue): Create { + public fun fromJson(jsonValue: JsonValue): Start { val map = jsonValue.requireMap() - return Create( + return Start( name = map.requireField(NAME), type = map.requireField(TYPE), content = map.requireField(CONTENT), diff --git a/android/gradle/libs.versions.toml b/android/gradle/libs.versions.toml index 73a190e..ec30912 100644 --- a/android/gradle/libs.versions.toml +++ b/android/gradle/libs.versions.toml @@ -1,8 +1,8 @@ [versions] # Airship -airshipProxy = '9.1.3' -airship = '18.3.1' +airshipProxy = '10.0.0' +airship = '18.3.2' # Gradle plugins androidGradlePlugin = '8.3.2' diff --git a/ios/AirshipFrameworkProxy/LiveActivity/LiveActivityManager.swift b/ios/AirshipFrameworkProxy/LiveActivity/LiveActivityManager.swift index e84d60a..f5cd647 100644 --- a/ios/AirshipFrameworkProxy/LiveActivity/LiveActivityManager.swift +++ b/ios/AirshipFrameworkProxy/LiveActivity/LiveActivityManager.swift @@ -15,7 +15,7 @@ public actor LiveActivityManager: Sendable { fileprivate struct Entry { let list: () throws -> [LiveActivityInfo] - let create: (LiveActivityRequest.Create) async throws -> LiveActivityInfo + let start: (LiveActivityRequest.Start) async throws -> LiveActivityInfo let update: (LiveActivityRequest.Update) async throws -> Bool let end: (LiveActivityRequest.End) async throws -> Bool @@ -135,9 +135,9 @@ public actor LiveActivityManager: Sendable { }) } - public func create(_ request: LiveActivityRequest.Create) async throws -> LiveActivityInfo { + public func start(_ request: LiveActivityRequest.Start) async throws -> LiveActivityInfo { try await waitForSetup() - let result = try await findEntry(attributesType: request.attributesType).create(request) + let result = try await findEntry(attributesType: request.attributesType).start(request) if #unavailable(iOS 17.2) { await self.checkForActivities() } @@ -260,8 +260,8 @@ extension LiveActivityManager.Entry { try await Self.updateActivity(type, request: request) } - self.create = { request in - let activity: Activity = try Self.createActivity(request: request) + self.start = { request in + let activity: Activity = try Self.startActivity(request: request) if let airshipName = airshipNameExtractor?(activity.attributes) { Airship.channel.trackLiveActivity(activity, name: airshipName) } @@ -330,8 +330,8 @@ extension LiveActivityManager.Entry { return true } - private static func createActivity( - request: LiveActivityRequest.Create + private static func startActivity( + request: LiveActivityRequest.Start ) throws -> Activity { let decodedAttributes: T = try request.attributes.decode() let decodedContentState: T.ContentState = try request.content.state.decode() diff --git a/ios/AirshipFrameworkProxy/LiveActivity/LiveActivityRequest.swift b/ios/AirshipFrameworkProxy/LiveActivity/LiveActivityRequest.swift index fd1afa7..be6cdbd 100644 --- a/ios/AirshipFrameworkProxy/LiveActivity/LiveActivityRequest.swift +++ b/ios/AirshipFrameworkProxy/LiveActivity/LiveActivityRequest.swift @@ -58,7 +58,7 @@ public struct LiveActivityRequest: Sendable, Equatable { } } - public struct Create: Sendable, Equatable, Codable { + public struct Start: Sendable, Equatable, Codable { public var attributesType: String public var content: LiveActivityContent public var attributes: AirshipJSON diff --git a/ios/Podfile b/ios/Podfile index 289b229..513c847 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -1,5 +1,5 @@ target 'AirshipFrameworkProxy' do - pod 'Airship', '18.9.2' + pod 'Airship', '18.10.0' end target 'AirshipFrameworkProxyTests' do