Skip to content

Commit

Permalink
Update iOS SDK to 19.0.2 (#79)
Browse files Browse the repository at this point in the history
* Update iOS SDK to 19.0.2

* Fix imports

* Update

---------

Co-authored-by: David <[email protected]>
  • Loading branch information
rlepinski and crow authored Feb 3, 2025
1 parent 3700311 commit 90131b6
Show file tree
Hide file tree
Showing 13 changed files with 41 additions and 29 deletions.
4 changes: 2 additions & 2 deletions AirshipFrameworkProxy.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

Pod::Spec.new do |s|
s.version = "12.1.0"
s.version = "12.1.1"
s.name = "AirshipFrameworkProxy"
s.summary = "Airship iOS mobile framework proxy"
s.documentation_url = "https://docs.airship.com/platform/mobile"
Expand All @@ -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.0.0"
s.dependency 'Airship', "19.0.2"
s.source_files = 'ios/AirshipFrameworkProxyLoader/**/*.{swift,h,m,c,cc,mm,cpp}', 'ios/AirshipFrameworkProxy/**/*.{swift,h,m,c,cc,mm,cpp}'
end

Expand Down
4 changes: 2 additions & 2 deletions Package.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/urbanairship/ios-library.git",
"state" : {
"revision" : "03baf0f2e1dac61ac1fb676d9b3a6d540d2f144f",
"version" : "19.0.0"
"revision" : "c44eaadef4e89ca7f5c630dc9bf85ffdba666565",
"version" : "19.0.2"
}
}
],
Expand Down
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ let package = Package(
)
],
dependencies: [
.package(url: "https://github.com/urbanairship/ios-library.git", from: "19.0.0")
.package(url: "https://github.com/urbanairship/ios-library.git", from: "19.0.2")
],
targets: [
.target(
Expand Down
2 changes: 1 addition & 1 deletion android/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[versions]

# Airship
airshipProxy = '12.1.0'
airshipProxy = '12.1.1'
airship = '19.0.0'

# Gradle plugins
Expand Down
16 changes: 10 additions & 6 deletions ios/AirshipFrameworkProxy/AirshipDelegate.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/* Copyright Airship and Contributors */

import Foundation
import UserNotifications
#if canImport(AirshipKit)
import AirshipKit
import Combine
Expand Down Expand Up @@ -136,9 +137,10 @@ extension AirshipDelegate: RegistrationDelegate {
AirshipPluginForwardDelegates.shared.registrationDelegate
}

nonisolated func apnsRegistrationSucceeded(withDeviceToken deviceToken: Data) {
@MainActor
func apnsRegistrationSucceeded(withDeviceToken deviceToken: Data) {
let token = AirshipUtils.deviceTokenStringFromDeviceToken(deviceToken)
Task { @MainActor in
Task {
await self.eventEmitter.addEvent(
PushTokenReceivedEvent(
pushToken: token
Expand All @@ -150,16 +152,18 @@ extension AirshipDelegate: RegistrationDelegate {
}
}

nonisolated func apnsRegistrationFailedWithError(_ error: any Error) {
Task { @MainActor in
@MainActor
func apnsRegistrationFailedWithError(_ error: any Error) {
Task {
forwardRegistrationDelegate?.apnsRegistrationFailedWithError(error)
}
}

nonisolated func notificationAuthorizedSettingsDidChange(
@MainActor
func notificationAuthorizedSettingsDidChange(
_ authorizedSettings: AirshipAuthorizedNotificationSettings
) {
Task { @MainActor in
Task {
await self.eventEmitter.addEvent(
AuthorizedNotificationSettingsChangedEvent(
authorizedSettings: authorizedSettings
Expand Down
1 change: 1 addition & 0 deletions ios/AirshipFrameworkProxy/AirshipExtensions.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/* Copyright Airship and Contributors */

import Foundation
import UserNotifications

#if canImport(AirshipKit)
import AirshipKit
Expand Down
1 change: 1 addition & 0 deletions ios/AirshipFrameworkProxy/AirshipProxyEvent.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import Foundation
import UserNotifications

#if canImport(AirshipKit)
import AirshipKit
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
/* Copyright Airship and Contributors */

import Foundation

#if canImport(AirshipKit)
public import AirshipKit
#elseif canImport(AirshipCore)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
/* Copyright Airship and Contributors */

import Foundation

#if canImport(AirshipKit)
public import AirshipKit
#elseif canImport(AirshipCore)
Expand Down
1 change: 1 addition & 0 deletions ios/AirshipFrameworkProxy/ProxyPushPayload.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/* Copyright Airship and Contributors */

import Foundation
import UserNotifications

#if canImport(AirshipKit)
public import AirshipKit
Expand Down
1 change: 1 addition & 0 deletions ios/AirshipFrameworkProxy/PushUtils.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/* Copyright Airship and Contributors */

import Foundation
import UserNotifications

#if canImport(AirshipKit)
import AirshipKit
Expand Down
2 changes: 1 addition & 1 deletion ios/Podfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
target 'AirshipFrameworkProxy' do
pod 'Airship', '19.0.0'
pod 'Airship', '19.0.2'
end

target 'AirshipFrameworkProxyTests' do
Expand Down
32 changes: 16 additions & 16 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
PODS:
- Airship (19.0.0):
- Airship/Automation (= 19.0.0)
- Airship/Basement (= 19.0.0)
- Airship/Core (= 19.0.0)
- Airship/FeatureFlags (= 19.0.0)
- Airship/MessageCenter (= 19.0.0)
- Airship/PreferenceCenter (= 19.0.0)
- Airship/Automation (19.0.0):
- Airship (19.0.2):
- Airship/Automation (= 19.0.2)
- Airship/Basement (= 19.0.2)
- Airship/Core (= 19.0.2)
- Airship/FeatureFlags (= 19.0.2)
- Airship/MessageCenter (= 19.0.2)
- Airship/PreferenceCenter (= 19.0.2)
- Airship/Automation (19.0.2):
- Airship/Core
- Airship/Basement (19.0.0)
- Airship/Core (19.0.0):
- Airship/Basement (19.0.2)
- Airship/Core (19.0.2):
- Airship/Basement
- Airship/FeatureFlags (19.0.0):
- Airship/FeatureFlags (19.0.2):
- Airship/Core
- Airship/MessageCenter (19.0.0):
- Airship/MessageCenter (19.0.2):
- Airship/Core
- Airship/PreferenceCenter (19.0.0):
- Airship/PreferenceCenter (19.0.2):
- Airship/Core

DEPENDENCIES:
- Airship (= 19.0.0)
- Airship (= 19.0.2)

SPEC REPOS:
trunk:
- Airship

SPEC CHECKSUMS:
Airship: 0b26712fb551e96c3f9e790352059ff8fd3eb920
Airship: 549342dfa294e0fd740871196f9798b86e64ab3a

PODFILE CHECKSUM: ab38d40ed32564525fb61f381e4782f404878bf9
PODFILE CHECKSUM: 4b51316d139118701bdb702afe39869e72116443

COCOAPODS: 1.16.2

0 comments on commit 90131b6

Please sign in to comment.