Merge pull request #602 from urbanairship/fixOldArch

Ulrico972 · web-flow · commit 821000fd848b · 2024-10-23T11:52:33.000-04:00
fix live update and live activities on oldArch
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # React Native Module Changelog
 
+## Version 19.4.2 - October 22, 2024
+Patch release to fix live activities and live updates on react old architecture and update Android and iOS SDK.
+
+### Changes
+- Fixed live activities and live updates on react old architecture.
+- Updated Airship Android SDK to [18.3.3](https://github.com/urbanairship/android-library/releases/tag/18.3.3)
+- Updated Airship iOS SDK to [18.11.1](https://github.com/urbanairship/ios-library/releases/tag/18.11.1)
+
 ## Version 19.4.1 - October 9, 2024
 Patch release to fix a compile issue with the old Architecture on Android.
 
diff --git a/android/gradle.properties b/android/gradle.properties
@@ -3,4 +3,4 @@ Airship_minSdkVersion=21
 Airship_targetSdkVersion=34
 Airship_compileSdkVersion=34
 Airship_ndkversion=26.1.10909125
-Airship_airshipProxyVersion=10.0.0
+Airship_airshipProxyVersion=10.1.1
diff --git a/android/src/main/java/com/urbanairship/reactnative/AirshipModule.kt b/android/src/main/java/com/urbanairship/reactnative/AirshipModule.kt
@@ -713,36 +713,42 @@ class AirshipModule internal constructor(val context: ReactApplicationContext) :
         }
     }
 
+    @ReactMethod
     override fun liveActivityListAll(promise: Promise) {
         promise.resolveResult {
             throw IllegalStateException("Not supported on Android")
         }
     }
 
+    @ReactMethod
     override fun liveActivityList(request: ReadableMap?, promise: Promise) {
         promise.resolveResult {
             throw IllegalStateException("Not supported on Android")
         }
     }
 
+    @ReactMethod
     override fun liveActivityStart(request: ReadableMap?, promise: Promise) {
         promise.resolveResult {
             throw IllegalStateException("Not supported on Android")
         }
     }
 
+    @ReactMethod
     override fun liveActivityUpdate(request: ReadableMap?, promise: Promise) {
         promise.resolveResult {
             throw IllegalStateException("Not supported on Android")
         }
     }
 
+    @ReactMethod
     override fun liveActivityEnd(request: ReadableMap?, promise: Promise) {
         promise.resolveResult {
             throw IllegalStateException("Not supported on Android")
         }
     }
 
+    @ReactMethod
     override fun liveUpdateListAll(promise: Promise) {
         promise.resolveSuspending(scope) {
             proxy.liveUpdateManager.listAll().let {
@@ -751,6 +757,7 @@ class AirshipModule internal constructor(val context: ReactApplicationContext) :
         }
     }
 
+    @ReactMethod
     override fun liveUpdateList(request: ReadableMap?, promise: Promise) {
         promise.resolveSuspending(scope) {
             proxy.liveUpdateManager.list(
@@ -761,6 +768,7 @@ class AirshipModule internal constructor(val context: ReactApplicationContext) :
         }
     }
 
+    @ReactMethod
     override fun liveUpdateStart(request: ReadableMap?, promise: Promise) {
         promise.resolveSuspending(scope) {
             proxy.liveUpdateManager.start(
@@ -769,6 +777,7 @@ class AirshipModule internal constructor(val context: ReactApplicationContext) :
         }
     }
 
+    @ReactMethod
     override fun liveUpdateUpdate(request: ReadableMap?, promise: Promise) {
         promise.resolveSuspending(scope) {
             proxy.liveUpdateManager.update(
@@ -777,6 +786,7 @@ class AirshipModule internal constructor(val context: ReactApplicationContext) :
         }
     }
 
+    @ReactMethod
     override fun liveUpdateEnd(request: ReadableMap?, promise: Promise) {
         promise.resolveSuspending(scope) {
             proxy.liveUpdateManager.end(
@@ -785,6 +795,7 @@ class AirshipModule internal constructor(val context: ReactApplicationContext) :
         }
     }
 
+    @ReactMethod
     override fun liveUpdateClearAll(promise: Promise) {
         promise.resolveSuspending(scope) {
             proxy.liveUpdateManager.clearAll()
diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
@@ -1,25 +1,25 @@
 PODS:
-  - Airship (18.10.0):
-    - Airship/Automation (= 18.10.0)
-    - Airship/Basement (= 18.10.0)
-    - Airship/Core (= 18.10.0)
-    - Airship/FeatureFlags (= 18.10.0)
-    - Airship/MessageCenter (= 18.10.0)
-    - Airship/PreferenceCenter (= 18.10.0)
-  - Airship/Automation (18.10.0):
+  - Airship (18.11.1):
+    - Airship/Automation (= 18.11.1)
+    - Airship/Basement (= 18.11.1)
+    - Airship/Core (= 18.11.1)
+    - Airship/FeatureFlags (= 18.11.1)
+    - Airship/MessageCenter (= 18.11.1)
+    - Airship/PreferenceCenter (= 18.11.1)
+  - Airship/Automation (18.11.1):
     - Airship/Core
-  - Airship/Basement (18.10.0)
-  - Airship/Core (18.10.0):
+  - Airship/Basement (18.11.1)
+  - Airship/Core (18.11.1):
     - Airship/Basement
-  - Airship/FeatureFlags (18.10.0):
+  - Airship/FeatureFlags (18.11.1):
     - Airship/Core
-  - Airship/MessageCenter (18.10.0):
+  - Airship/MessageCenter (18.11.1):
     - Airship/Core
-  - Airship/PreferenceCenter (18.10.0):
+  - Airship/PreferenceCenter (18.11.1):
     - Airship/Core
-  - AirshipFrameworkProxy (10.0.0):
-    - Airship (= 18.10.0)
-  - AirshipServiceExtension (18.10.0)
+  - AirshipFrameworkProxy (10.1.1):
+    - Airship (= 18.11.1)
+  - AirshipServiceExtension (18.11.1)
   - boost (1.83.0)
   - DoubleConversion (1.1.6)
   - FBLazyVector (0.73.4)
@@ -907,8 +907,8 @@ PODS:
   - React-Mapbuffer (0.73.4):
     - glog
     - React-debug
-  - react-native-airship (19.4.1):
-    - AirshipFrameworkProxy (= 10.0.0)
+  - react-native-airship (19.4.2):
+    - AirshipFrameworkProxy (= 10.1.1)
     - glog
     - RCT-Folly (= 2022.05.16.00)
     - React-Core
@@ -1279,9 +1279,9 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/ReactCommon/yoga"
 
 SPEC CHECKSUMS:
-  Airship: f05f63abc90b20274854a7cda3334f383af370cd
-  AirshipFrameworkProxy: 8bf84e8ca65c3847c63b6851463822f1a3fb2982
-  AirshipServiceExtension: b62830295737abaadc92572a1ec93175a749ea98
+  Airship: 208ebe5da07e89abee6c4abd14dfefa6aee14fa2
+  AirshipFrameworkProxy: 2a5c7331dfdfb5b04bcaa2072d7f7985c761c034
+  AirshipServiceExtension: e9e648c00eeeda6f0407c202998fc17b01955b77
   boost: d3f49c53809116a5d38da093a8aa78bf551aed09
   DoubleConversion: fea03f2699887d960129cc54bba7e52542b6f953
   FBLazyVector: 84f6edbe225f38aebd9deaf1540a4160b1f087d7
@@ -1311,7 +1311,7 @@ SPEC CHECKSUMS:
   React-jsinspector: 9ac353eccf6ab54d1e0a33862ba91221d1e88460
   React-logger: 0a57b68dd2aec7ff738195f081f0520724b35dab
   React-Mapbuffer: 63913773ed7f96b814a2521e13e6d010282096ad
-  react-native-airship: d8f5b6cd7f62135b13c31a5f2b2b4eb144819166
+  react-native-airship: 0fe02cd8f0489993fe75bc2a1cc07cb1a55d29d2
   react-native-safe-area-context: b97eb6f9e3b7f437806c2ce5983f479f8eb5de4b
   React-nativeconfig: d7af5bae6da70fa15ce44f045621cf99ed24087c
   React-NativeModulesApple: 0123905d5699853ac68519607555a9a4f5c7b3ac
diff --git a/ios/AirshipReactNative.swift b/ios/AirshipReactNative.swift
@@ -39,7 +39,7 @@ public class AirshipReactNative: NSObject {
         AirshipProxy.shared
     }
 
-    public static let version: String = "19.4.1"
+    public static let version: String = "19.4.2"
 
     private let eventNotifier = EventNotifier()
 
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ua/react-native-airship",
-  "version": "19.4.1",
+  "version": "19.4.2",
   "description": "Airship plugin for React Native apps.",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
diff --git a/react-native-airship.podspec b/react-native-airship.podspec
@@ -22,6 +22,6 @@ Pod::Spec.new do |s|
     s.dependency "React-Core"
   end
   
-  s.dependency "AirshipFrameworkProxy", "10.0.0"
+  s.dependency "AirshipFrameworkProxy", "10.1.1"
 
 end

Original file line number	Diff line number	Diff line change
`@@ -713,36 +713,42 @@ class AirshipModule internal constructor(val context: ReactApplicationContext) :`
`713`	`713`	`}`
`714`	`714`	`}`
`715`	`715`
	`716`	`+ @ReactMethod`
`716`	`717`	`override fun liveActivityListAll(promise: Promise) {`
`717`	`718`	`promise.resolveResult {`
`718`	`719`	`throw IllegalStateException("Not supported on Android")`
`719`	`720`	`}`
`720`	`721`	`}`
`721`	`722`
	`723`	`+ @ReactMethod`
`722`	`724`	`override fun liveActivityList(request: ReadableMap?, promise: Promise) {`
`723`	`725`	`promise.resolveResult {`
`724`	`726`	`throw IllegalStateException("Not supported on Android")`
`725`	`727`	`}`
`726`	`728`	`}`
`727`	`729`
	`730`	`+ @ReactMethod`
`728`	`731`	`override fun liveActivityStart(request: ReadableMap?, promise: Promise) {`
`729`	`732`	`promise.resolveResult {`
`730`	`733`	`throw IllegalStateException("Not supported on Android")`
`731`	`734`	`}`
`732`	`735`	`}`
`733`	`736`
	`737`	`+ @ReactMethod`
`734`	`738`	`override fun liveActivityUpdate(request: ReadableMap?, promise: Promise) {`
`735`	`739`	`promise.resolveResult {`
`736`	`740`	`throw IllegalStateException("Not supported on Android")`
`737`	`741`	`}`
`738`	`742`	`}`
`739`	`743`
	`744`	`+ @ReactMethod`
`740`	`745`	`override fun liveActivityEnd(request: ReadableMap?, promise: Promise) {`
`741`	`746`	`promise.resolveResult {`
`742`	`747`	`throw IllegalStateException("Not supported on Android")`
`743`	`748`	`}`
`744`	`749`	`}`
`745`	`750`
	`751`	`+ @ReactMethod`
`746`	`752`	`override fun liveUpdateListAll(promise: Promise) {`
`747`	`753`	`promise.resolveSuspending(scope) {`
`748`	`754`	`proxy.liveUpdateManager.listAll().let {`
`@@ -751,6 +757,7 @@ class AirshipModule internal constructor(val context: ReactApplicationContext) :`
`751`	`757`	`}`
`752`	`758`	`}`
`753`	`759`
	`760`	`+ @ReactMethod`
`754`	`761`	`override fun liveUpdateList(request: ReadableMap?, promise: Promise) {`
`755`	`762`	`promise.resolveSuspending(scope) {`
`756`	`763`	`proxy.liveUpdateManager.list(`
`@@ -761,6 +768,7 @@ class AirshipModule internal constructor(val context: ReactApplicationContext) :`
`761`	`768`	`}`
`762`	`769`	`}`
`763`	`770`
	`771`	`+ @ReactMethod`
`764`	`772`	`override fun liveUpdateStart(request: ReadableMap?, promise: Promise) {`
`765`	`773`	`promise.resolveSuspending(scope) {`
`766`	`774`	`proxy.liveUpdateManager.start(`
`@@ -769,6 +777,7 @@ class AirshipModule internal constructor(val context: ReactApplicationContext) :`
`769`	`777`	`}`
`770`	`778`	`}`
`771`	`779`
	`780`	`+ @ReactMethod`
`772`	`781`	`override fun liveUpdateUpdate(request: ReadableMap?, promise: Promise) {`
`773`	`782`	`promise.resolveSuspending(scope) {`
`774`	`783`	`proxy.liveUpdateManager.update(`
`@@ -777,6 +786,7 @@ class AirshipModule internal constructor(val context: ReactApplicationContext) :`
`777`	`786`	`}`
`778`	`787`	`}`
`779`	`788`
	`789`	`+ @ReactMethod`
`780`	`790`	`override fun liveUpdateEnd(request: ReadableMap?, promise: Promise) {`
`781`	`791`	`promise.resolveSuspending(scope) {`
`782`	`792`	`proxy.liveUpdateManager.end(`
`@@ -785,6 +795,7 @@ class AirshipModule internal constructor(val context: ReactApplicationContext) :`
`785`	`795`	`}`
`786`	`796`	`}`
`787`	`797`
	`798`	`+ @ReactMethod`
`788`	`799`	`override fun liveUpdateClearAll(promise: Promise) {`
`789`	`800`	`promise.resolveSuspending(scope) {`
`790`	`801`	`proxy.liveUpdateManager.clearAll()`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public class AirshipReactNative: NSObject {`
`39`	`39`	`AirshipProxy.shared`
`40`	`40`	`}`
`41`	`41`
`42`		`- public static let version: String = "19.4.1"`
	`42`	`+ public static let version: String = "19.4.2"`
`43`	`43`
`44`	`44`	`private let eventNotifier = EventNotifier()`
`45`	`45`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@ua/react-native-airship",`
`3`		`- "version": "19.4.1",`
	`3`	`+ "version": "19.4.2",`
`4`	`4`	`"description": "Airship plugin for React Native apps.",`
`5`	`5`	`"main": "lib/commonjs/index",`
`6`	`6`	`"module": "lib/module/index",`