Skip to content

Commit

Permalink
Update to proxy 4.0.4
Browse files Browse the repository at this point in the history
  • Loading branch information
rlepinski committed Sep 1, 2023
1 parent bf52e94 commit 4b6b7bc
Show file tree
Hide file tree
Showing 6 changed files with 37 additions and 30 deletions.
4 changes: 2 additions & 2 deletions android/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ Airship_targetSdkVersion=31
Airship_compileSdkVersion=31
Airship_ndkversion=21.4.7075529

Airship_airshipProxyVersion=3.0.2
Airship_airshipProxyVersion=4.0.4

# workaround for now, used for HMS
Airship_airshipVersion=17.0.3
Airship_airshipVersion=17.1.0

Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ class AirshipModule internal constructor(val context: ReactApplicationContext) :
// Background events will create a headless JS task in ReactAutopilot since
// initialized wont be called until we have a JS task.
EventEmitter.shared().pendingEventListener
.filter { it.isForeground() }
.filter { it.type.isForeground() }
.collect {
notifyPending()
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class ReactAutopilot : BaseAutopilot() {

MainScope().launch {
EventEmitter.shared().pendingEventListener
.filter { !it.isForeground() }
.filter { !it.type.isForeground() }
.collect {
AirshipHeadlessEventService.startService(context)
}
Expand Down
55 changes: 31 additions & 24 deletions example/ios/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,21 +1,24 @@
PODS:
- Airship (17.0.3):
- Airship/Automation (= 17.0.3)
- Airship/Basement (= 17.0.3)
- Airship/Core (= 17.0.3)
- Airship/MessageCenter (= 17.0.3)
- Airship/PreferenceCenter (= 17.0.3)
- Airship/Automation (17.0.3):
- Airship (17.1.2):
- Airship/Automation (= 17.1.2)
- Airship/Basement (= 17.1.2)
- Airship/Core (= 17.1.2)
- Airship/FeatureFlags (= 17.1.2)
- Airship/MessageCenter (= 17.1.2)
- Airship/PreferenceCenter (= 17.1.2)
- Airship/Automation (17.1.2):
- Airship/Core
- Airship/Basement (17.0.3)
- Airship/Core (17.0.3):
- Airship/Basement (17.1.2)
- Airship/Core (17.1.2):
- Airship/Basement
- Airship/MessageCenter (17.0.3):
- Airship/FeatureFlags (17.1.2):
- Airship/Core
- Airship/PreferenceCenter (17.0.3):
- Airship/MessageCenter (17.1.2):
- Airship/Core
- AirshipFrameworkProxy (3.0.2):
- Airship (= 17.0.3)
- Airship/PreferenceCenter (17.1.2):
- Airship/Core
- AirshipFrameworkProxy (4.0.4):
- Airship (= 17.1.2)
- boost (1.76.0)
- CocoaAsyncSocket (7.6.5)
- DoubleConversion (1.1.6)
Expand Down Expand Up @@ -315,10 +318,14 @@ PODS:
- React-logger (0.71.1):
- glog
- react-native-airship (16.0.1):
- AirshipFrameworkProxy (= 3.0.2)
- AirshipFrameworkProxy (= 4.0.4)
- React-Core
- react-native-safe-area-context (4.7.1):
- react-native-safe-area-context (4.5.0):
- RCT-Folly
- RCTRequired
- RCTTypeSafety
- React-Core
- ReactCommon/turbomodule/core
- React-perflogger (0.71.1)
- React-RCTActionSheet (0.71.1):
- React-Core/RCTActionSheetHeaders (= 0.71.1)
Expand Down Expand Up @@ -400,9 +407,9 @@ PODS:
- React-jsi (= 0.71.1)
- React-logger (= 0.71.1)
- React-perflogger (= 0.71.1)
- RNGestureHandler (2.12.0):
- RNGestureHandler (2.9.0):
- React-Core
- RNScreens (3.22.1):
- RNScreens (3.19.0):
- React-Core
- React-RCTImage
- SocketRocket (0.6.1)
Expand Down Expand Up @@ -574,8 +581,8 @@ EXTERNAL SOURCES:
:path: "../node_modules/react-native/ReactCommon/yoga"

SPEC CHECKSUMS:
Airship: 9fdd1ccc3a78c42544f34b7de043d39491951023
AirshipFrameworkProxy: 9a0a26b1b117fe3ccbe1b2d4a9053875e2c0d6d2
Airship: 2694e68ba4ac7e6fa4ed539157119e75a60cbf36
AirshipFrameworkProxy: 0c2fee69440addbc12eac15b49c08c7f13681fcd
boost: 57d2868c099736d80fcd648bf211b4431e51a558
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
Expand Down Expand Up @@ -609,8 +616,8 @@ SPEC CHECKSUMS:
React-jsiexecutor: 60cf272aababc5212410e4249d17cea14fc36caa
React-jsinspector: ff56004b0c974b688a6548c156d5830ad751ae07
React-logger: 60a0b5f8bed667ecf9e24fecca1f30d125de6d75
react-native-airship: 68a842b1002cabb9e8f12a13cbf7c38260eae868
react-native-safe-area-context: 9697629f7b2cda43cf52169bb7e0767d330648c2
react-native-airship: 52736bac51899697fe53bad0e7514378f72c3fb8
react-native-safe-area-context: 39c2d8be3328df5d437ac1700f4f3a4f75716acc
React-perflogger: ec8eef2a8f03ecfa6361c2c5fb9197ef4a29cc85
React-RCTActionSheet: a0c023b86cf4c862fa9c4eb0f6f91fbe878fb2de
React-RCTAnimation: 168d53718c74153947c0109f55900faa64d79439
Expand All @@ -624,12 +631,12 @@ SPEC CHECKSUMS:
React-RCTVibration: 49d531ec8498e0afa2c9b22c2205784372e3d4f3
React-runtimeexecutor: 311feb67600774723fe10eb8801d3138cae9ad67
ReactCommon: 03be76588338a27a88d103b35c3c44a3fd43d136
RNGestureHandler: dec4645026e7401a0899f2846d864403478ff6a5
RNScreens: 50ffe2fa2342eabb2d0afbe19f7c1af286bc7fb3
RNGestureHandler: 071d7a9ad81e8b83fe7663b303d132406a7d8f39
RNScreens: ea4cd3a853063cda19a4e3c28d2e52180c80f4eb
SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
Yoga: 921eb014669cf9c718ada68b08d362517d564e0c
YogaKit: f782866e155069a2cca2517aafea43200b01fd5a

PODFILE CHECKSUM: b7a94a3aefc53b758c07410e8e9ddbf2ee273556

COCOAPODS: 1.12.1
COCOAPODS: 1.11.3
2 changes: 1 addition & 1 deletion ios/AirshipReactNative.swift
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ public class AirshipReactNative: NSObject {
try? AirshipProxy.shared.attemptTakeOff(launchOptions: launchOptions)

Task {
let stream = await AirshipProxyEventEmitter.shared.pendingEventTypeAdded
let stream = await AirshipProxyEventEmitter.shared.pendingEventAdded
for await _ in stream {
await self.eventNotifier.notifyPendingEvents()
}
Expand Down
2 changes: 1 addition & 1 deletion react-native-airship.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,6 @@ Pod::Spec.new do |s|



s.dependency "AirshipFrameworkProxy", "3.0.2"
s.dependency "AirshipFrameworkProxy", "4.0.4"

end

0 comments on commit 4b6b7bc

Please sign in to comment.