From 62ba6a57601b3c561e7cbf080322ec23850c690f Mon Sep 17 00:00:00 2001 From: dsoffiantini Date: Mon, 24 Oct 2022 14:41:58 -0600 Subject: [PATCH 1/4] chore: :arrow_up: updates to latest versions of messaging --- apps/AEPSampleApp/ios/Podfile.lock | 55 +++++++++++----------- packages/messaging/RCTAEPMessaging.podspec | 2 +- packages/messaging/android/build.gradle | 2 +- packages/messaging/package.json | 2 +- 4 files changed, 30 insertions(+), 31 deletions(-) diff --git a/apps/AEPSampleApp/ios/Podfile.lock b/apps/AEPSampleApp/ios/Podfile.lock index bbd6d60b..495ffd48 100644 --- a/apps/AEPSampleApp/ios/Podfile.lock +++ b/apps/AEPSampleApp/ios/Podfile.lock @@ -2,10 +2,10 @@ PODS: - AEPAssurance (3.0.1): - AEPCore (>= 3.1.0) - AEPServices (>= 3.1.0) - - AEPCore (3.7.0): + - AEPCore (3.7.1): - AEPRulesEngine (>= 1.1.0) - - AEPServices (>= 3.7.0) - - AEPEdge (1.4.1): + - AEPServices (>= 3.7.1) + - AEPEdge (1.5.0): - AEPCore (>= 3.5.0) - AEPEdgeIdentity - AEPEdgeConsent (1.0.1): @@ -13,23 +13,22 @@ PODS: - AEPEdge (>= 1.4.0) - AEPEdgeIdentity (1.1.0): - AEPCore (>= 3.6.0) - - AEPIdentity (3.7.0): - - AEPCore (>= 3.7.0) - - AEPLifecycle (3.7.0): - - AEPCore (>= 3.7.0) - - AEPMessaging (1.1.0-beta): + - AEPIdentity (3.7.1): + - AEPCore (>= 3.7.1) + - AEPLifecycle (3.7.1): + - AEPCore (>= 3.7.1) + - AEPMessaging (1.1.0-beta2): - AEPCore (>= 3.4.2) - AEPEdge (>= 1.1.0) - AEPEdgeIdentity (>= 1.0.0) - - AEPOptimize (>= 1.0.0) - AEPServices (>= 3.4.2) - AEPOptimize (1.0.0): - AEPCore (>= 3.2.0) - AEPEdge (>= 1.2.0) - AEPRulesEngine (1.2.0) - - AEPServices (3.7.0) - - AEPSignal (3.7.0): - - AEPCore (>= 3.7.0) + - AEPServices (3.7.1) + - AEPSignal (3.7.1): + - AEPCore (>= 3.7.1) - AEPUserProfile (3.0.1): - AEPCore - boost (1.76.0) @@ -138,7 +137,7 @@ PODS: - AEPEdgeIdentity (~> 1.0) - React - RCTAEPMessaging (1.0.0-beta.2): - - AEPMessaging (~> 1.0) + - AEPMessaging (~> 1.1.0-beta2) - React - RCTAEPOptimize (1.0.0-beta.1): - AEPOptimize (~> 1.0) @@ -344,7 +343,7 @@ PODS: - glog - react-native-safe-area-context (3.4.1): - React-Core - - react-native-webview (11.22.4): + - react-native-webview (11.23.1): - React-Core - React-perflogger (0.68.2) - React-RCTActionSheet (0.68.2): @@ -413,7 +412,7 @@ PODS: - React-perflogger (= 0.68.2) - RNCMaskedView (0.1.11): - React - - RNGestureHandler (2.5.0): + - RNGestureHandler (2.7.1): - React-Core - RNReanimated (2.2.4): - DoubleConversion @@ -444,7 +443,7 @@ PODS: - React-RCTVibration - ReactCommon/turbomodule/core - Yoga - - RNScreens (3.13.1): + - RNScreens (3.18.2): - React-Core - React-RCTImage - SocketRocket (0.6.0) @@ -651,22 +650,22 @@ EXTERNAL SOURCES: CHECKOUT OPTIONS: AEPMessaging: - :commit: ddb7fa78a9061cf420bec96e99a530e2116a3467 + :commit: 6c77316446a743a7c6c738f4cd392b3cbba13849 :git: https://github.com/adobe/aepsdk-messaging-ios.git SPEC CHECKSUMS: AEPAssurance: b25880cd4b14f22c61a1dce19807bd0ca0fe9b17 - AEPCore: 290dd609f261efe7a049bd3bdcbbc0734fe0e1fc - AEPEdge: 6faf60328f9e5ae7a107fd61f9a968f46ebf2928 + AEPCore: 412fe933382892ab6c6af958d2f69ebcbca11216 + AEPEdge: 924cd8ace3db40b9c42bc2bc5e8fb1fcad3a9b77 AEPEdgeConsent: a23b35ab331d2aa2013fcef49c9d6b80085d5597 AEPEdgeIdentity: 47f0c6ecbec5857b2a8cb9b7bf717c2424c6bae0 - AEPIdentity: 965c831d132eba4874566220598590399f7617ac - AEPLifecycle: 7c2ba7de3b067999eb8b6a66f85f5815e87a06dc - AEPMessaging: 72ebb84ce97be336660a4bbe7eed46f47965ba5c + AEPIdentity: 7cd5a51d8012aeaeee769e99597db016ad68b0d1 + AEPLifecycle: 94c36a54f7e5466c5274bc822c53eaa410b74888 + AEPMessaging: 31635f7570be215f1bd2781f0e67a7a3a49952aa AEPOptimize: 413690f88cb8ae574153a94081331788ca740a91 AEPRulesEngine: 71228dfdac24c9ded09be13e3257a7eb22468ccc - AEPServices: 7bc2af2a153ea223e87ec50c8e3fd6e0282869c6 - AEPSignal: a7fbfd170fc121a4c0c413b6af644513d9966fde + AEPServices: 7284c30359c789cd16bf366b4ea81094a66d21ab + AEPSignal: c9b3c239120190fae8e8479d584d54b60af37d99 AEPUserProfile: 2ddb5ba8e2c22dd8f942992306b050f4be2c2403 boost: a7c83b31436843459a1961bfd74b96033dc77234 CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 @@ -692,7 +691,7 @@ SPEC CHECKSUMS: RCTAEPEdge: 9938932e89a90adf5cd30250b46cc67fbe35dd06 RCTAEPEdgeConsent: b998b2d08f254635ef01263fea186d7262f2d242 RCTAEPEdgeIdentity: 1b18a3ff1947f8f4896d5f40083d31a6971e4bbc - RCTAEPMessaging: 5ff246c624ceb253f93dbb1ae96af4ec898c91af + RCTAEPMessaging: 051f0f67730cb0e59c0b409d153c0b1c8e49b2bd RCTAEPOptimize: 6d171e612151ad213d9e19148c4d0f78cb041ec7 RCTAEPUserProfile: 341c77e0d18d69872c81e425a2e9cae37fe82045 RCTRequired: 3e917ea5377751094f38145fdece525aa90545a0 @@ -708,7 +707,7 @@ SPEC CHECKSUMS: React-jsinspector: c5989c77cb89ae6a69561095a61cce56a44ae8e8 React-logger: a0833912d93b36b791b7a521672d8ee89107aff1 react-native-safe-area-context: 9e40fb181dac02619414ba1294d6c2a807056ab9 - react-native-webview: a1ed211d50a5047a4fe54e07140991e277cd66e6 + react-native-webview: d33e2db8925d090871ffeb232dfa50cb3a727581 React-perflogger: a18b4f0bd933b8b24ecf9f3c54f9bf65180f3fe6 React-RCTActionSheet: 547fe42fdb4b6089598d79f8e1d855d7c23e2162 React-RCTAnimation: bc9440a1c37b06ae9ebbb532d244f607805c6034 @@ -722,9 +721,9 @@ SPEC CHECKSUMS: React-runtimeexecutor: b960b687d2dfef0d3761fbb187e01812ebab8b23 ReactCommon: 095366164a276d91ea704ce53cb03825c487a3f2 RNCMaskedView: 0e1bc4bfa8365eba5fbbb71e07fbdc0555249489 - RNGestureHandler: bad495418bcbd3ab47017a38d93d290ebd406f50 + RNGestureHandler: b7a872907ee289ada902127f2554fa1d2c076122 RNReanimated: e7d8afaf8fed4b3bf1a46e06adb2e04a2b248f1c - RNScreens: 40a2cb40a02a609938137a1e0acfbf8fc9eebf19 + RNScreens: 34cc502acf1b916c582c60003dc3089fa01dc66d SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608 Yoga: 99652481fcd320aefa4a7ef90095b95acd181952 YogaKit: f782866e155069a2cca2517aafea43200b01fd5a diff --git a/packages/messaging/RCTAEPMessaging.podspec b/packages/messaging/RCTAEPMessaging.podspec index 85c1e81d..34534e41 100644 --- a/packages/messaging/RCTAEPMessaging.podspec +++ b/packages/messaging/RCTAEPMessaging.podspec @@ -18,5 +18,5 @@ Pod::Spec.new do |s| s.requires_arc = true s.dependency "React" - s.dependency "AEPMessaging", "~>1.0" + s.dependency "AEPMessaging", "~>1.1.0-beta2" end diff --git a/packages/messaging/android/build.gradle b/packages/messaging/android/build.gradle index 0edbbd53..749b8906 100644 --- a/packages/messaging/android/build.gradle +++ b/packages/messaging/android/build.gradle @@ -35,6 +35,6 @@ repositories { dependencies { api "com.adobe.marketing.mobile:optimize:1.+" - api "com.adobe.marketing.mobile:messaging:1.2.0-beta-1-SNAPSHOT" + api "com.adobe.marketing.mobile:messaging:1.3.0-beta-3-SNAPSHOT" implementation "com.facebook.react:react-native:+" } diff --git a/packages/messaging/package.json b/packages/messaging/package.json index 29a5fb23..10d6719c 100644 --- a/packages/messaging/package.json +++ b/packages/messaging/package.json @@ -1,6 +1,6 @@ { "name": "@adobe/react-native-aepmessaging", - "version": "1.0.0-beta.2", + "version": "1.0.0-beta.3", "description": "Adobe Experience Platform support for React Native apps.", "homepage": "https://aep-sdks.gitbook.io/docs/", "license": "Apache-2.0", From eeb5d0f317033ba1c505a4d2a47572a6ae371877 Mon Sep 17 00:00:00 2001 From: dsoffiantini Date: Mon, 19 Sep 2022 11:12:54 -0600 Subject: [PATCH 2/4] feat: :sparkles: adds support for campaign classic --- apps/AEPSampleApp/App.tsx | 18 +- .../extensions/CampaignClassicView.tsx | 51 +++ .../ios/AEPSampleApp/AppDelegate.h | 1 + .../ios/AEPSampleApp/AppDelegate.mm | 19 +- apps/AEPSampleApp/ios/Podfile.lock | 12 + apps/AEPSampleApp/package.json | 1 + packages/campaignclassic/.npmignore | 69 +++++ .../RCTAEPCampaignClassic.podspec | 22 ++ packages/campaignclassic/README.md | 170 ++++++++++ .../__tests__/CampaignClassic.spec.ts | 51 +++ packages/campaignclassic/android/build.gradle | 37 +++ .../android/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 54329 bytes .../gradle/wrapper/gradle-wrapper.properties | 6 + packages/campaignclassic/android/gradlew | 172 +++++++++++ packages/campaignclassic/android/gradlew.bat | 84 +++++ .../android/src/main/AndroidManifest.xml | 6 + .../RCTAEPCampaignClassicModule.java | 79 +++++ .../RCTAEPCampaignClassicPackage.java | 38 +++ .../RCTAEPCampaignClassicUtil.java | 116 +++++++ .../project.pbxproj | 292 ++++++++++++++++++ .../xcschemes/RCTAEPCampaignClassic.xcscheme | 67 ++++ .../ios/src/RCTAEPCampaignClassic.h | 19 ++ .../ios/src/RCTAEPCampaignClassic.m | 88 ++++++ packages/campaignclassic/package.json | 36 +++ .../campaignclassic/ts/CampaignClassic.ts | 79 +++++ packages/campaignclassic/ts/index.ts | 18 ++ .../campaignclassic/ts/models/UserInfo.ts | 5 + packages/campaignclassic/tsconfig.json | 9 + tests/jest/setup.ts | 8 +- 29 files changed, 1558 insertions(+), 15 deletions(-) create mode 100644 apps/AEPSampleApp/extensions/CampaignClassicView.tsx create mode 100644 packages/campaignclassic/.npmignore create mode 100644 packages/campaignclassic/RCTAEPCampaignClassic.podspec create mode 100644 packages/campaignclassic/README.md create mode 100644 packages/campaignclassic/__tests__/CampaignClassic.spec.ts create mode 100644 packages/campaignclassic/android/build.gradle create mode 100644 packages/campaignclassic/android/gradle/wrapper/gradle-wrapper.jar create mode 100644 packages/campaignclassic/android/gradle/wrapper/gradle-wrapper.properties create mode 100755 packages/campaignclassic/android/gradlew create mode 100644 packages/campaignclassic/android/gradlew.bat create mode 100644 packages/campaignclassic/android/src/main/AndroidManifest.xml create mode 100644 packages/campaignclassic/android/src/main/java/com/adobe/marketing/mobile/reactnative/campaignclassic/RCTAEPCampaignClassicModule.java create mode 100644 packages/campaignclassic/android/src/main/java/com/adobe/marketing/mobile/reactnative/campaignclassic/RCTAEPCampaignClassicPackage.java create mode 100644 packages/campaignclassic/android/src/main/java/com/adobe/marketing/mobile/reactnative/campaignclassic/RCTAEPCampaignClassicUtil.java create mode 100644 packages/campaignclassic/ios/RCTAEPCampaignClassic.xcodeproj/project.pbxproj create mode 100644 packages/campaignclassic/ios/RCTAEPCampaignClassic.xcodeproj/xcshareddata/xcschemes/RCTAEPCampaignClassic.xcscheme create mode 100644 packages/campaignclassic/ios/src/RCTAEPCampaignClassic.h create mode 100644 packages/campaignclassic/ios/src/RCTAEPCampaignClassic.m create mode 100644 packages/campaignclassic/package.json create mode 100644 packages/campaignclassic/ts/CampaignClassic.ts create mode 100644 packages/campaignclassic/ts/index.ts create mode 100644 packages/campaignclassic/ts/models/UserInfo.ts create mode 100644 packages/campaignclassic/tsconfig.json diff --git a/apps/AEPSampleApp/App.tsx b/apps/AEPSampleApp/App.tsx index c945d0eb..56efd66e 100644 --- a/apps/AEPSampleApp/App.tsx +++ b/apps/AEPSampleApp/App.tsx @@ -14,6 +14,7 @@ import EdgeIdentityView from './extensions/EdgeIdentityView'; import TargetView from './extensions/TargetView'; import PlacesView from './extensions/PlacesView'; import {NavigationProps} from './types/props'; +import CampaignClassicView from './extensions/CampaignClassicView'; function HomeScreen({navigation}: NavigationProps) { return ( @@ -62,6 +63,10 @@ function HomeScreen({navigation}: NavigationProps) { onPress={() => navigation.navigate('PlacesView')} title="Places" /> +