Merge pull request #101 from urbanairship/release-14.6.0

Release 14.6.0

Author: crow

AirshipFrameworkProxy.podspec

@@ -1,6 +1,6 @@
 
 Pod::Spec.new do |s|
-   s.version                 = "14.5.1"
+   s.version                 = "14.6.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           = "6.0"
    s.source_files            = "ios/AirshipFrameworkProxy/**/*.{h,m,swift}"
-   s.dependency                'Airship', "19.6.1"
+   s.dependency                'Airship', "19.8.0"
    s.source_files            = 'ios/AirshipFrameworkProxyLoader/**/*.{swift,h,m,c,cc,mm,cpp}', 'ios/AirshipFrameworkProxy/**/*.{swift,h,m,c,cc,mm,cpp}'
 end
 

Package.swift

@@ -15,7 +15,7 @@ let package = Package(
         )
     ],
     dependencies: [
-        .package(url: "https://github.com/urbanairship/ios-library.git", from: "19.6.1")
+        .package(url: "https://github.com/urbanairship/ios-library.git", from: "19.8.0")
     ],
     targets: [
         .target(

android/gradle/libs.versions.toml

@@ -1,8 +1,8 @@
 [versions]
 
 # Airship
-airshipProxy = '14.5.1'
-airship = '19.9.1'
+airshipProxy = '14.6.0'
+airship = '19.10.0'
 
 # Gradle plugins
 androidGradlePlugin = '8.3.2'

ios/AirshipFrameworkProxy/Proxies/AirshipProxy.swift

@@ -125,7 +125,7 @@ public final class AirshipProxy: Sendable {
 
     }
 
-
+    @available(*, deprecated, message: "Use AirshipProxy.takeOff(json:) instead")
     @MainActor
     public func takeOff(
         json: Any,
@@ -136,10 +136,22 @@ public final class AirshipProxy: Sendable {
             from: try AirshipJSONUtils.data(json)
         )
 
-        return try takeOff(config: proxyConfig, launchOptions: launchOptions)
+        return try takeOff(config: proxyConfig)
+    }
 
+    @MainActor
+    public func takeOff(
+        json: Any
+    ) throws -> Bool {
+        let proxyConfig = try JSONDecoder().decode(
+            ProxyConfig.self,
+            from: try AirshipJSONUtils.data(json)
+        )
+
+        return try takeOff(config: proxyConfig)
     }
 
+    @available(*, deprecated, message: "Use AirshipProxy.takeOff(config:) instead")
     @MainActor
     public func takeOff(
         config: ProxyConfig,
@@ -150,6 +162,15 @@ public final class AirshipProxy: Sendable {
         return Airship.isFlying
     }
 
+    @MainActor
+    public func takeOff(
+        config: ProxyConfig
+    ) throws -> Bool {
+        self.proxyStore.config = config
+        try? attemptTakeOff()
+        return Airship.isFlying
+    }
+
     @objc
     public func isFlying(
     ) -> Bool {
@@ -162,10 +183,16 @@ public final class AirshipProxy: Sendable {
         }
     }
 
+    @available(*, deprecated, message: "Use AirshipProxy.attemptTakeOff(_:) instead")
     @MainActor
     public func attemptTakeOff(
         launchOptions: [UIApplication.LaunchOptionsKey: Any]?
     ) throws {
+        try attemptTakeOff()
+    }
+
+    @MainActor
+    public func attemptTakeOff() throws {
         guard !Airship.isFlying else {
             return;
         }
@@ -175,14 +202,12 @@ public final class AirshipProxy: Sendable {
             migrateCalled = true
         }
 
-        AirshipLogger.debug("attemptTakeOff: \(String(describing: launchOptions))")
-
         let airshipConfig = makeConfig()
 
         self.airshipDelegate = AirshipDelegate(proxyStore: proxyStore)
 
         AirshipLogger.debug("Taking off! \(airshipConfig)")
-        try Airship.takeOff(airshipConfig, launchOptions: launchOptions)
+        try Airship.takeOff(airshipConfig)
         Airship.deepLinkDelegate = self.airshipDelegate
         Airship.push.registrationDelegate = self.airshipDelegate
         Airship.push.pushNotificationDelegate = self.airshipDelegate