Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: add client info for react native user agent on ios #345

Closed
wants to merge 3 commits into from
Closed

chore: add client info for react native user agent on ios #345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
73ec0b0
chore: add client info for React Native user agent on iOS
mrehan27 Oct 9, 2024
3edaff9
NSE resources fix
mrehan27 Oct 9, 2024
62a1553
moved nse resources to subspec
mrehan27 Oct 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions Apps/APN/ios/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ target 'SampleApp' do
flags = get_default_flags()

# TODO: Remove this once iOS Native SDK is released and revert to original code
install_non_production_ios_sdk_git_branch(branch_name: 'feature/react-native-cdp', is_app_extension: false, push_service: "apn")
install_non_production_ios_sdk_git_branch(branch_name: 'rehan/rn-ios-user-agent', is_app_extension: false, push_service: "apn")
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TODO: Revert this to feature branch once iOS PR is merged

# pod 'customerio-reactnative/apn', :path => '../node_modules/customerio-reactnative'
# install_non_production_ios_sdk_local_path(local_path: '~/code/customerio-ios/', is_app_extension: false, push_service: "apn")
# install_non_production_ios_sdk_git_branch(branch_name: 'main', is_app_extension: false, push_service: "apn")
Expand Down Expand Up @@ -51,9 +51,7 @@ target 'SampleApp' do
end

target 'NotificationServiceExtension' do
# TODO: Remove this once iOS Native SDK is released and revert to original code
install_non_production_ios_sdk_git_branch(branch_name: 'feature/react-native-cdp', is_app_extension: true, push_service: "apn")
# pod 'customerio-reactnative-richpush/apn', :path => '../node_modules/customerio-reactnative'
pod 'customerio-reactnative-richpush/apn', :path => '../node_modules/customerio-reactnative'
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since pods are already installed, I think we can revert this to original implementation. This should give us more confidence in the changes.

# install_non_production_ios_sdk_local_path(local_path: '~/code/customerio-ios/', is_app_extension: true, push_service: "apn")
# install_non_production_ios_sdk_git_branch(branch_name: 'main', is_app_extension: true, push_service: "apn")
end
42 changes: 25 additions & 17 deletions Apps/APN/ios/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ PODS:
- CustomerIO/DataPipelines (= 3.4.1)
- CustomerIO/MessagingInApp (= 3.4.1)
- React-Core
- customerio-reactnative-richpush/apn (3.9.0):
- CustomerIO/MessagingPushAPN (= 3.4.1)
- customerio-reactnative/nopush (3.9.0):
- CustomerIO/DataPipelines (= 3.4.1)
- CustomerIO/MessagingInApp (= 3.4.1)
Expand All @@ -19,6 +21,8 @@ PODS:
- CustomerIOMessagingInApp (= 3.4.1)
- CustomerIO/MessagingPush (3.4.1):
- CustomerIOMessagingPush (= 3.4.1)
- CustomerIO/MessagingPushAPN (3.4.1):
- CustomerIOMessagingPushAPN (= 3.4.1)
- CustomerIOCommon (3.4.1)
- CustomerIODataPipelines (3.4.1):
- "AnalyticsSwiftCIO (= 1.5.14+cio.1)"
Expand Down Expand Up @@ -1116,11 +1120,12 @@ PODS:
DEPENDENCIES:
- boost (from `../node_modules/react-native/third-party-podspecs/boost.podspec`)
- customerio-reactnative (from `../node_modules/customerio-reactnative`)
- CustomerIOCommon (from `https://github.com/customerio/customerio-ios.git`, branch `feature/react-native-cdp`)
- CustomerIODataPipelines (from `https://github.com/customerio/customerio-ios.git`, branch `feature/react-native-cdp`)
- CustomerIOMessagingInApp (from `https://github.com/customerio/customerio-ios.git`, branch `feature/react-native-cdp`)
- CustomerIOMessagingPush (from `https://github.com/customerio/customerio-ios.git`, branch `feature/react-native-cdp`)
- CustomerIOMessagingPushAPN (from `https://github.com/customerio/customerio-ios.git`, branch `feature/react-native-cdp`)
- customerio-reactnative-richpush/apn (from `../node_modules/customerio-reactnative`)
- CustomerIOCommon (from `https://github.com/customerio/customerio-ios.git`, branch `rehan/rn-ios-user-agent`)
- CustomerIODataPipelines (from `https://github.com/customerio/customerio-ios.git`, branch `rehan/rn-ios-user-agent`)
- CustomerIOMessagingInApp (from `https://github.com/customerio/customerio-ios.git`, branch `rehan/rn-ios-user-agent`)
- CustomerIOMessagingPush (from `https://github.com/customerio/customerio-ios.git`, branch `rehan/rn-ios-user-agent`)
- CustomerIOMessagingPushAPN (from `https://github.com/customerio/customerio-ios.git`, branch `rehan/rn-ios-user-agent`)
- DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
- FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
- FBReactNativeSpec (from `../node_modules/react-native/React/FBReactNativeSpec`)
Expand Down Expand Up @@ -1197,20 +1202,22 @@ EXTERNAL SOURCES:
:podspec: "../node_modules/react-native/third-party-podspecs/boost.podspec"
customerio-reactnative:
:path: "../node_modules/customerio-reactnative"
customerio-reactnative-richpush:
:path: "../node_modules/customerio-reactnative"
CustomerIOCommon:
:branch: feature/react-native-cdp
:branch: rehan/rn-ios-user-agent
:git: https://github.com/customerio/customerio-ios.git
CustomerIODataPipelines:
:branch: feature/react-native-cdp
:branch: rehan/rn-ios-user-agent
:git: https://github.com/customerio/customerio-ios.git
CustomerIOMessagingInApp:
:branch: feature/react-native-cdp
:branch: rehan/rn-ios-user-agent
:git: https://github.com/customerio/customerio-ios.git
CustomerIOMessagingPush:
:branch: feature/react-native-cdp
:branch: rehan/rn-ios-user-agent
:git: https://github.com/customerio/customerio-ios.git
CustomerIOMessagingPushAPN:
:branch: feature/react-native-cdp
:branch: rehan/rn-ios-user-agent
:git: https://github.com/customerio/customerio-ios.git
DoubleConversion:
:podspec: "../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec"
Expand Down Expand Up @@ -1328,26 +1335,27 @@ EXTERNAL SOURCES:

CHECKOUT OPTIONS:
CustomerIOCommon:
:commit: f5176708f3875388a901338490ff8d64a1a930ae
:commit: 5ad38b01249572fdeb5e556516b84cf810918fd1
:git: https://github.com/customerio/customerio-ios.git
CustomerIODataPipelines:
:commit: f5176708f3875388a901338490ff8d64a1a930ae
:commit: 5ad38b01249572fdeb5e556516b84cf810918fd1
:git: https://github.com/customerio/customerio-ios.git
CustomerIOMessagingInApp:
:commit: f5176708f3875388a901338490ff8d64a1a930ae
:commit: 5ad38b01249572fdeb5e556516b84cf810918fd1
:git: https://github.com/customerio/customerio-ios.git
CustomerIOMessagingPush:
:commit: f5176708f3875388a901338490ff8d64a1a930ae
:commit: 5ad38b01249572fdeb5e556516b84cf810918fd1
:git: https://github.com/customerio/customerio-ios.git
CustomerIOMessagingPushAPN:
:commit: f5176708f3875388a901338490ff8d64a1a930ae
:commit: 5ad38b01249572fdeb5e556516b84cf810918fd1
:git: https://github.com/customerio/customerio-ios.git

SPEC CHECKSUMS:
AnalyticsSwiftCIO: d03712b33e85baecc86f0d38a6d53c97f7bc5bd1
boost: d3f49c53809116a5d38da093a8aa78bf551aed09
CustomerIO: 7563a4e69cc71940e45285b509074a0929132c46
customerio-reactnative: 8443cefc6cfbbcace089683bfc5d733dfe94874f
customerio-reactnative: 7eed682503a3f0f95f783136b4f3dd74c7b0674b
customerio-reactnative-richpush: 81af68bcc2a11247de6d74b13408073baf60bb2d
CustomerIOCommon: 4918263730b3e7349e9ab8fdd5d11ff577d44ae6
CustomerIODataPipelines: da9bee0a16b177b610078b72173615f2b1ddfa46
CustomerIOMessagingInApp: 3b12a3bb8b08cd426594d34cb3042ba187ac5141
Expand Down Expand Up @@ -1416,6 +1424,6 @@ SPEC CHECKSUMS:
Sovran: f8212bb3855042a24689a73ea0219ca5295235da
Yoga: 805bf71192903b20fc14babe48080582fee65a80

PODFILE CHECKSUM: f0db3d59efb5635626ea907f3b6a400ebe778048
PODFILE CHECKSUM: 8ba5dd109afa4846032d69669748f18edd09973c

COCOAPODS: 1.15.2
8 changes: 4 additions & 4 deletions Apps/APN/ios/SampleApp.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,15 +366,13 @@
);
inputPaths = (
"${PODS_ROOT}/Target Support Files/Pods-NotificationServiceExtension/Pods-NotificationServiceExtension-resources.sh",
"${PODS_CONFIGURATION_BUILD_DIR}/AnalyticsSwiftCIO/Segment_Privacy.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/CustomerIODataPipelines/CustomerIODataPipelines_Privacy.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/CustomerIOMessagingPushAPN/CustomerIOMessagingPushAPN_Privacy.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/customerio-reactnative-richpush/CustomerIO_NSEResources.bundle",
);
name = "[CP] Copy Pods Resources";
outputPaths = (
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Segment_Privacy.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CustomerIODataPipelines_Privacy.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CustomerIOMessagingPushAPN_Privacy.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CustomerIO_NSEResources.bundle",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
Expand Down Expand Up @@ -417,6 +415,7 @@
"${PODS_CONFIGURATION_BUILD_DIR}/RNCAsyncStorage/RNCAsyncStorage_resources.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/RNDeviceInfo/RNDeviceInfoPrivacyInfo.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/RCTI18nStrings.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/customerio-reactnative/CustomerIO_Resources.bundle",
);
name = "[CP] Copy Pods Resources";
outputPaths = (
Expand All @@ -427,6 +426,7 @@
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNCAsyncStorage_resources.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNDeviceInfoPrivacyInfo.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCTI18nStrings.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CustomerIO_Resources.bundle",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
Expand Down
39 changes: 21 additions & 18 deletions Apps/APN/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 2 additions & 4 deletions Apps/FCM/ios/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ target 'FCMSampleApp' do
)

# TODO: Remove this once iOS Native SDK is released and revert to original code
install_non_production_ios_sdk_git_branch(branch_name: 'feature/react-native-cdp', is_app_extension: false, push_service: "fcm")
install_non_production_ios_sdk_git_branch(branch_name: 'rehan/rn-ios-user-agent', is_app_extension: false, push_service: "fcm")
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TODO: Revert this to feature branch once iOS PR is merged

# pod 'customerio-reactnative/fcm', :path => '../node_modules/customerio-reactnative'
# install_non_production_ios_sdk_local_path(local_path: '~/code/customerio-ios/', is_app_extension: false, push_service: "fcm")
# install_non_production_ios_sdk_git_branch(branch_name: 'levi/v2-multiple-push-handlers', is_app_extension: false, push_service: "fcm")
Expand All @@ -63,9 +63,7 @@ target 'FCMSampleApp' do
end

target 'NotificationServiceExtension' do
# TODO: Remove this once iOS Native SDK is released and revert to original code
install_non_production_ios_sdk_git_branch(branch_name: 'feature/react-native-cdp', is_app_extension: true, push_service: "fcm")
# pod 'customerio-reactnative-richpush/fcm', :path => '../node_modules/customerio-reactnative'
pod 'customerio-reactnative-richpush/fcm', :path => '../node_modules/customerio-reactnative'
# install_non_production_ios_sdk_local_path(local_path: '~/code/customerio-ios/', is_app_extension: true, push_service: "fcm")
# install_non_production_ios_sdk_git_branch(branch_name: 'levi/v2-multiple-push-handlers', is_app_extension: true, push_service: "fcm")
end
Loading
Loading