From d4805f6c08391d02ec32dda3fb073f9e731264b3 Mon Sep 17 00:00:00 2001 From: Ryan Lepinski Date: Thu, 18 Apr 2024 16:08:19 -0700 Subject: [PATCH] Release 15.1.0 (#425) * Update to proxy 6.0.0 * [GH-424] Fix plugin not found if package contains a space * Fix warning * Changelog * Fix highlighting * Fix version * Other version * More versions --------- Co-authored-by: David --- CHANGELOG.md | 11 ++++++++++ cordova-airship-hms/package.json | 2 +- cordova-airship-hms/plugin.xml | 4 ++-- .../src/android/build-extras.gradle | 2 +- cordova-airship/package.json | 2 +- cordova-airship/plugin.xml | 6 ++--- .../src/android/AirshipCordovaVersion.kt | 2 +- .../src/android/build-extras.gradle | 2 +- cordova-airship/src/ios/AirshipCordova.swift | 22 ++++++++++++++----- .../src/ios/AirshipCordovaAutopilot.swift | 5 ++++- .../src/ios/AirshipCordovaVersion.swift | 2 +- 11 files changed, 43 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b6a584d9..8a3fa54e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,16 @@ # Cordova Plugin Changelog +## Version 15.1.0 April 18, 2024 +Minor release with several bug fixes. + +### Changes +- Updated Airship Android SDK to 17.8.0 +- Updated Airship iOS SDK to 18.1.0 +- Fixed `Airship.push.ios.resetBadge` method binding +- Fixed `Airship.contact.getNamedUserId` method binding +- Fixed plugin not found issue if the app contains a space in the name + + ## Version 15.0.0 March 6, 2024 Major release with several breaking changes. Apps should use the migration guide to update [Migration Guide](https://github.com/urbanairship/urbanairship-cordova/blob/main/MIGRATION.md) diff --git a/cordova-airship-hms/package.json b/cordova-airship-hms/package.json index f9ebec91..e40d041a 100644 --- a/cordova-airship-hms/package.json +++ b/cordova-airship-hms/package.json @@ -1,6 +1,6 @@ { "name": "@ua/cordova-airship-hms", - "version": "15.0.0", + "version": "15.1.0", "description": "Airship HMS Cordova plugin", "cordova": { "id": "@ua/cordova-airship-hms", diff --git a/cordova-airship-hms/plugin.xml b/cordova-airship-hms/plugin.xml index b869aec8..434adfbb 100644 --- a/cordova-airship-hms/plugin.xml +++ b/cordova-airship-hms/plugin.xml @@ -1,6 +1,6 @@ @@ -15,7 +15,7 @@ - + diff --git a/cordova-airship-hms/src/android/build-extras.gradle b/cordova-airship-hms/src/android/build-extras.gradle index 08bf60df..feded144 100644 --- a/cordova-airship-hms/src/android/build-extras.gradle +++ b/cordova-airship-hms/src/android/build-extras.gradle @@ -5,7 +5,7 @@ repositories { } dependencies { - implementation 'com.urbanairship.android:urbanairship-hms:17.1.0' + implementation 'com.urbanairship.android:urbanairship-hms:17.8.0' implementation 'com.huawei.hms:push:6.3.0.304' } diff --git a/cordova-airship/package.json b/cordova-airship/package.json index af8f8b78..12338e7f 100644 --- a/cordova-airship/package.json +++ b/cordova-airship/package.json @@ -1,6 +1,6 @@ { "name": "@ua/cordova-airship", - "version": "15.0.0", + "version": "15.1.0", "description": "Airship Cordova plugin", "cordova": { "id": "@ua/cordova-airship", diff --git a/cordova-airship/plugin.xml b/cordova-airship/plugin.xml index 652811d0..2a9f2c47 100644 --- a/cordova-airship/plugin.xml +++ b/cordova-airship/plugin.xml @@ -1,6 +1,6 @@ @@ -95,7 +95,7 @@ - 15.0.0 + 15.1.0 @@ -133,7 +133,7 @@ - + diff --git a/cordova-airship/src/android/AirshipCordovaVersion.kt b/cordova-airship/src/android/AirshipCordovaVersion.kt index ebdb0a3e..83fe5bac 100644 --- a/cordova-airship/src/android/AirshipCordovaVersion.kt +++ b/cordova-airship/src/android/AirshipCordovaVersion.kt @@ -3,5 +3,5 @@ package com.urbanairship.cordova object AirshipCordovaVersion { - var version = "15.0.0" + var version = "15.1.0" } \ No newline at end of file diff --git a/cordova-airship/src/android/build-extras.gradle b/cordova-airship/src/android/build-extras.gradle index c8cdd6cf..e9466966 100644 --- a/cordova-airship/src/android/build-extras.gradle +++ b/cordova-airship/src/android/build-extras.gradle @@ -1,5 +1,5 @@ dependencies { - api "com.urbanairship.android:airship-framework-proxy:5.3.0" + api "com.urbanairship.android:airship-framework-proxy:6.0.0" } cdvPluginPostBuildExtras.push({ diff --git a/cordova-airship/src/ios/AirshipCordova.swift b/cordova-airship/src/ios/AirshipCordova.swift index 85f5651c..1fc3ce1e 100644 --- a/cordova-airship/src/ios/AirshipCordova.swift +++ b/cordova-airship/src/ios/AirshipCordova.swift @@ -4,7 +4,7 @@ import Foundation import AirshipKit import AirshipFrameworkProxy -@objc +@objc(AirshipCordova) public final class AirshipCordova: CDVPlugin { struct Listener { @@ -230,7 +230,6 @@ public final class AirshipCordova: CDVPlugin { case "channel#enableChannelCreation": return try AirshipProxy.shared.channel.enableChannelCreation() - return nil // Contact case "contact#editTagGroups": @@ -308,7 +307,7 @@ public final class AirshipCordova: CDVPlugin { return try AirshipProxy.shared.push.getBadgeNumber() case "push#ios#setBadgeNumber": - try AirshipProxy.shared.push.setBadgeNumber( + try await AirshipProxy.shared.push.setBadgeNumber( try command.requireIntArg() ) return nil @@ -323,7 +322,7 @@ public final class AirshipCordova: CDVPlugin { return try AirshipProxy.shared.push.isAutobadgeEnabled() case "push#ios#resetBadge": - try AirshipProxy.shared.push.setBadgeNumber(0) + try await AirshipProxy.shared.push.setBadgeNumber(0) return nil case "push#ios#setNotificationOptions": @@ -354,8 +353,14 @@ public final class AirshipCordova: CDVPlugin { return try AirshipProxy.shared.push.isQuietTimeEnabled() case "push#ios#setQuietTime": + let proxySettings: CodableQuietTimeSettings = try command.requireCodableArg() try AirshipProxy.shared.push.setQuietTime( - try command.requireCodableArg() + QuietTimeSettings( + startHour: proxySettings.startHour, + startMinute: proxySettings.startMinute, + endHour: proxySettings.endHour, + endMinute: proxySettings.endMinute + ) ) return nil @@ -703,3 +708,10 @@ extension AirshipProxyEventEmitter { } } } + +public struct CodableQuietTimeSettings: Codable { + let startHour: UInt + let startMinute: UInt + let endHour: UInt + let endMinute: UInt +} diff --git a/cordova-airship/src/ios/AirshipCordovaAutopilot.swift b/cordova-airship/src/ios/AirshipCordovaAutopilot.swift index 954b395d..e299fd5f 100644 --- a/cordova-airship/src/ios/AirshipCordovaAutopilot.swift +++ b/cordova-airship/src/ios/AirshipCordovaAutopilot.swift @@ -50,7 +50,10 @@ extension AirshipCordovaAutopilot: AirshipProxyDelegate { ) if settings?.clearBadgeOnLaunch == true { - Airship.push.resetBadge() + Task { + try? await Airship.push.resetBadge() + } + } if settings?.enablePushOnLaunch == true { diff --git a/cordova-airship/src/ios/AirshipCordovaVersion.swift b/cordova-airship/src/ios/AirshipCordovaVersion.swift index f51f16d5..b177075b 100644 --- a/cordova-airship/src/ios/AirshipCordovaVersion.swift +++ b/cordova-airship/src/ios/AirshipCordovaVersion.swift @@ -3,5 +3,5 @@ import Foundation class AirshipCordovaVersion { - static let version = "15.0.0" + static let version = "15.1.0" }