From 9b75747e2942baaa7e10e09838c27bb24092f1c5 Mon Sep 17 00:00:00 2001 From: Ryan Lepinski Date: Fri, 21 Jun 2024 12:00:05 -0700 Subject: [PATCH] Release 18.4.1 (#3139) --- .github/workflows/release.yml | 4 ++++ Airship.podspec | 2 +- .../Automation/Engine/AutomationEventFeed.swift | 2 +- .../Engine/TriggerProcessor/PreparedTrigger.swift | 15 +-------------- Airship/AirshipConfig.xcconfig | 2 +- Airship/AirshipCore/Source/AirshipVersion.swift | 2 +- AirshipContentExtension.podspec | 2 +- AirshipDebug.podspec | 2 +- AirshipServiceExtension.podspec | 2 +- CHANGELOG.md | 6 ++++++ 10 files changed, 18 insertions(+), 21 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 945ad96ce..45cf6df2a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -122,6 +122,10 @@ jobs: files: | ./build/Airship.zip ./build/Airship.xcframeworks.zip + - name: Kickoff prebuilt repo + env: + GITHUB_TOKEN: ${{ secrets.IOS_DEPLOY_PREBUILT_PAT }} + run: gh --repo urbanairship/ios-library-prebuilt workflow run release.yml deploy-pods: runs-on: macos-14-xlarge diff --git a/Airship.podspec b/Airship.podspec index ae5cb8ec4..3b9171708 100644 --- a/Airship.podspec +++ b/Airship.podspec @@ -1,4 +1,4 @@ -AIRSHIP_VERSION="18.4.0" +AIRSHIP_VERSION="18.4.1" Pod::Spec.new do |s| s.version = AIRSHIP_VERSION diff --git a/Airship/AirshipAutomation/Source/Automation/Engine/AutomationEventFeed.swift b/Airship/AirshipAutomation/Source/Automation/Engine/AutomationEventFeed.swift index 48137e34c..5169d1870 100644 --- a/Airship/AirshipAutomation/Source/Automation/Engine/AutomationEventFeed.swift +++ b/Airship/AirshipAutomation/Source/Automation/Engine/AutomationEventFeed.swift @@ -115,7 +115,7 @@ final class AutomationEventFeed: AutomationEventFeedProtocol { group.addTask { for await event in await analyticsFeed.updates { guard !Task.isCancelled else { return } - guard let converted = event.toAutomationEvent() else { return } + guard let converted = event.toAutomationEvent() else { continue } for item in converted { await onEvent(item) diff --git a/Airship/AirshipAutomation/Source/Automation/Engine/TriggerProcessor/PreparedTrigger.swift b/Airship/AirshipAutomation/Source/Automation/Engine/TriggerProcessor/PreparedTrigger.swift index 5097e11c4..d37522e1f 100644 --- a/Airship/AirshipAutomation/Source/Automation/Engine/TriggerProcessor/PreparedTrigger.swift +++ b/Airship/AirshipAutomation/Source/Automation/Engine/TriggerProcessor/PreparedTrigger.swift @@ -144,7 +144,7 @@ extension EventAutomationTrigger { case .event(let type, let eventData, let value): guard self.type == type, - isPredicateMatching(value: eventData) + isPredicateMatching(value: eventData?.unWrap()) else { return nil } return evaluateResults(data: &data, increment: value) @@ -179,19 +179,6 @@ extension EventAutomationTrigger { } } - private func customEvenTriggerMatch(eventData: AirshipJSON, value: Double?, data: inout TriggerData) -> MatchResult? { - switch self.type { - case .customEventCount: - guard isPredicateMatching(value: eventData.unWrap()) else { return nil } - return evaluateResults(data: &data, increment: 1) - case .customEventValue: - guard isPredicateMatching(value: eventData.unWrap()) else { return nil } - return evaluateResults(data: &data, increment: value ?? 1.0) - default: - return nil - } - } - private func isPredicateMatching(value: Any?) -> Bool { guard let predicate = self.predicate else { return true } return predicate.evaluate(value) diff --git a/Airship/AirshipConfig.xcconfig b/Airship/AirshipConfig.xcconfig index 4a0991804..4cc88014e 100644 --- a/Airship/AirshipConfig.xcconfig +++ b/Airship/AirshipConfig.xcconfig @@ -1,6 +1,6 @@ //* Copyright Airship and Contributors */ -CURRENT_PROJECT_VERSION = 18.4.0 +CURRENT_PROJECT_VERSION = 18.4.1 // Uncomment to include the preview build warning // OTHER_CFLAGS = $(inherited) -DUA_PREVIEW=1 diff --git a/Airship/AirshipCore/Source/AirshipVersion.swift b/Airship/AirshipCore/Source/AirshipVersion.swift index 96809f4f5..eb6827257 100644 --- a/Airship/AirshipCore/Source/AirshipVersion.swift +++ b/Airship/AirshipCore/Source/AirshipVersion.swift @@ -3,7 +3,7 @@ import Foundation public struct AirshipVersion { - public static let version = "18.4.0" + public static let version = "18.4.1" public static func get() -> String { return version } diff --git a/AirshipContentExtension.podspec b/AirshipContentExtension.podspec index b7545c368..f131ce067 100644 --- a/AirshipContentExtension.podspec +++ b/AirshipContentExtension.podspec @@ -1,4 +1,4 @@ -AIRSHIP_VERSION="18.4.0" +AIRSHIP_VERSION="18.4.1" Pod::Spec.new do |s| s.version = AIRSHIP_VERSION diff --git a/AirshipDebug.podspec b/AirshipDebug.podspec index 9213768e5..6fecc76a9 100644 --- a/AirshipDebug.podspec +++ b/AirshipDebug.podspec @@ -1,4 +1,4 @@ -AIRSHIP_VERSION="18.4.0" +AIRSHIP_VERSION="18.4.1" Pod::Spec.new do |s| s.version = AIRSHIP_VERSION diff --git a/AirshipServiceExtension.podspec b/AirshipServiceExtension.podspec index 4610c1674..24057ac8e 100644 --- a/AirshipServiceExtension.podspec +++ b/AirshipServiceExtension.podspec @@ -1,4 +1,4 @@ -AIRSHIP_VERSION="18.4.0" +AIRSHIP_VERSION="18.4.1" Pod::Spec.new do |s| s.version = AIRSHIP_VERSION diff --git a/CHANGELOG.md b/CHANGELOG.md index 01779c457..901ef3454 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,12 @@ # iOS Changelog +## Version 18.4.1 June 21, 2024 +Patch release to fix a regression with IAX ignoring screen, version, and custom event triggers. Apps using those triggers that are on 18.4.0 should update. + +### Changes +- Fixed trigger regression for IAX introduced in 18.4.0. + ## Version 18.4.0, June 14, 2024 Minor release that adds contact management support to the preference center, support for anonymous channels, per-message in-app message theming, message center customization and logging improvements. Apps that use the message center or stories should update to this version.