Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:
command: sudo gem install cocoapods

- run:
name: intall pods
name: install pods
command: yarn sampleapp:ios:pod:install

- run:
Expand Down
1 change: 1 addition & 0 deletions apps/AEPSampleApp/android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
android:launchMode="singleTask"
android:windowSoftInputMode="adjustResize">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<action android:name="android.intent.action.VIEW" />

<category android:name="android.intent.category.DEFAULT" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import com.adobe.marketing.mobile.Assurance;
import com.adobe.marketing.mobile.edge.identity.Identity;
import com.adobe.marketing.mobile.edge.consent.Consent;
import com.adobe.marketing.mobile.optimize.Optimize;
import com.adobe.marketing.mobile.InvalidInitException;
import com.facebook.react.PackageList;
import com.facebook.react.ReactApplication;
Expand Down Expand Up @@ -73,7 +72,6 @@ public void onCreate() {
try {
Edge.registerExtension();
Identity.registerExtension();
Optimize.registerExtension();
Messaging.registerExtension();
UserProfile.registerExtension();
Lifecycle.registerExtension();
Expand Down
3 changes: 2 additions & 1 deletion apps/AEPSampleApp/babel.config.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
module.exports = {
presets: ['module:metro-react-native-babel-preset']
presets: ['module:metro-react-native-babel-preset'],
plugins: ['react-native-reanimated/plugin']
};
11 changes: 11 additions & 0 deletions apps/AEPSampleApp/extensions/EdgeIdentityView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ const EdgeIdentityView = ({navigation}: NavigationProps) => {
const [version, setVersion] = useState('');
const [identities, setIdentities] = useState('');
const [ecid, setECID] = useState('');
const [urlvariables, setUrlVariables] = useState('');
Identity.extensionVersion().then(version => setVersion(version));

function getIdentities() {
Expand Down Expand Up @@ -75,6 +76,14 @@ const EdgeIdentityView = ({navigation}: NavigationProps) => {
});
}

function getUrlVariables() {
Identity.getUrlVariables()
.then(urlVariables => {
setUrlVariables(urlVariables);
console.log('AdobeExperienceSDK: urlVariables = ' + urlVariables);
})
}

return (
<View style={styles.container}>
<ScrollView contentContainerStyle={{marginTop: 75}}>
Expand All @@ -84,9 +93,11 @@ const EdgeIdentityView = ({navigation}: NavigationProps) => {
<Button title="updateIdentities()" onPress={updateIdentities} />
<Button title="removeIdentity()" onPress={removeIdentity} />
<Button title="getIdentities()" onPress={getIdentities} />
<Button title="getUrlVariables()" onPress={getUrlVariables} />
<View style={styles.breakLine} />
<Text>{identities}</Text>
<Text>{ecid}</Text>
<Text>{urlvariables}</Text>
</ScrollView>
</View>
);
Expand Down
4 changes: 2 additions & 2 deletions apps/AEPSampleApp/ios/AEPSampleApp/AppDelegate.m
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
[AEPMobileCore setLogLevel: AEPLogLevelTrace];
[AEPMobileCore registerExtensions: @[AEPMobileEdgeIdentity.class,
AEPMobileEdge.class,
AEPMobileMessaging.class,
AEPMobileOptimize.class] completion:^{
AEPMobileMessaging.class
] completion:^{
[AEPMobileCore configureWithAppId:@"YOUR-APP-ID"];
}
];
Expand Down
85 changes: 45 additions & 40 deletions apps/AEPSampleApp/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,29 +2,34 @@ PODS:
- AEPAssurance (3.0.1):
- AEPCore (>= 3.1.0)
- AEPServices (>= 3.1.0)
- AEPCore (3.4.2):
- AEPCore (3.6.0):
- AEPRulesEngine (>= 1.1.0)
- AEPServices (>= 3.4.2)
- AEPEdge (1.3.0):
- AEPCore (>= 3.3.2)
- AEPServices (>= 3.6.0)
- AEPEdge (1.4.1):
- AEPCore (>= 3.5.0)
- AEPEdgeIdentity
- AEPEdgeConsent (1.0.0):
- AEPCore (>= 3.1.0)
- AEPEdgeIdentity (1.0.1):
- AEPCore (>= 3.1.1)
- AEPIdentity (3.4.2):
- AEPCore (>= 3.4.2)
- AEPLifecycle (3.4.2):
- AEPCore (>= 3.4.2)
- AEPMessaging (1.1.0):
- AEPEdgeConsent (1.0.1):
- AEPCore (>= 3.5.0)
- AEPEdge (>= 1.4.0)
- AEPEdgeIdentity (1.1.0):
- AEPCore (>= 3.6.0)
- AEPIdentity (3.6.0):
- AEPCore (>= 3.6.0)
- AEPLifecycle (3.6.0):
- AEPCore (>= 3.6.0)
- AEPMessaging (1.1.0-beta):
- AEPCore (>= 3.4.2)
- AEPEdge (>= 1.1.0)
- AEPEdgeIdentity (>= 1.0.0)
- AEPOptimize (>= 1.0.0)
- AEPServices (>= 3.4.2)
- AEPRulesEngine (1.1.0)
- AEPServices (3.4.2)
- AEPSignal (3.4.2):
- AEPCore (>= 3.4.2)
- AEPOptimize (1.0.0):
- AEPCore (>= 3.2.0)
- AEPEdge (>= 1.2.0)
- AEPRulesEngine (1.2.0)
- AEPServices (3.6.0)
- AEPSignal (3.6.0):
- AEPCore (>= 3.6.0)
- AEPUserProfile (3.0.1):
- AEPCore
- boost-for-react-native (1.63.0)
Expand Down Expand Up @@ -62,7 +67,7 @@ PODS:
- RCTAEPEdgeConsent (1.0.0):
- AEPEdgeConsent (~> 1.0)
- React
- RCTAEPEdgeIdentity (1.0.0):
- RCTAEPEdgeIdentity (1.1.0):
- AEPEdgeIdentity (~> 1.0)
- React
- RCTAEPMessaging (1.0.0-beta.2):
Expand Down Expand Up @@ -255,7 +260,7 @@ PODS:
- React-jsi (= 0.64.2)
- React-perflogger (= 0.64.2)
- React-jsinspector (0.64.2)
- react-native-safe-area-context (3.3.2):
- react-native-safe-area-context (3.4.1):
- React-Core
- React-perflogger (0.64.2)
- React-RCTActionSheet (0.64.2):
Expand Down Expand Up @@ -325,15 +330,14 @@ PODS:
- React
- RNGestureHandler (1.10.3):
- React-Core
- RNReanimated (2.2.4):
- RNReanimated (2.8.0):
- DoubleConversion
- FBLazyVector
- FBReactNativeSpec
- glog
- RCT-Folly
- RCTRequired
- RCTTypeSafety
- React
- React-callinvoker
- React-Core
- React-Core/DevSupport
Expand All @@ -351,10 +355,9 @@ PODS:
- React-RCTNetwork
- React-RCTSettings
- React-RCTText
- React-RCTVibration
- ReactCommon/turbomodule/core
- Yoga
- RNScreens (3.9.0):
- RNScreens (3.13.1):
- React-Core
- React-RCTImage
- Yoga (1.14.0)
Expand Down Expand Up @@ -413,6 +416,7 @@ SPEC REPOS:
- AEPEdgeIdentity
- AEPIdentity
- AEPLifecycle
- AEPOptimize
- AEPRulesEngine
- AEPServices
- AEPSignal
Expand Down Expand Up @@ -506,33 +510,34 @@ EXTERNAL SOURCES:

CHECKOUT OPTIONS:
AEPMessaging:
:commit: 6789761e59269ddfe340ff8e2a94c441d4fbf1a2
:commit: ddb7fa78a9061cf420bec96e99a530e2116a3467
:git: https://github.com/adobe/aepsdk-messaging-ios.git

SPEC CHECKSUMS:
AEPAssurance: b25880cd4b14f22c61a1dce19807bd0ca0fe9b17
AEPCore: b01856bf24972e4720cb0511a358d1e68067252a
AEPEdge: 500628aee1319ef2690dfaf5bd950badce6ec3f0
AEPEdgeConsent: dd46002b0c4bf55443f5441990e799248975713e
AEPEdgeIdentity: 5c42cef81835851232136a9e1fbbbe33b204ee11
AEPIdentity: fbf755560afcbb0acd66cd5b6a1c147530fca5f6
AEPLifecycle: 1e0e843465fb143f8d8949dcf06de169d5c26f62
AEPMessaging: 661cc08435254f3c9cc0899785c20a7952952e95
AEPRulesEngine: bb2927ed5501ddf9754c66e97f8d2b1cf8e33b19
AEPServices: 3214311f239c8cdc6267d757200b05ec0ab05878
AEPSignal: be3a4789b492f4d5a5aef7408f30ff8e866d1d79
AEPCore: 03a89f8b792a74e17f739ab535982569d6639b76
AEPEdge: 6faf60328f9e5ae7a107fd61f9a968f46ebf2928
AEPEdgeConsent: a23b35ab331d2aa2013fcef49c9d6b80085d5597
AEPEdgeIdentity: 47f0c6ecbec5857b2a8cb9b7bf717c2424c6bae0
AEPIdentity: bd5c639f2ddb02e2b15f909c661235ccd86bd98a
AEPLifecycle: 7c0452a650a8ccaaa2473a3625a7004e8687797e
AEPMessaging: 72ebb84ce97be336660a4bbe7eed46f47965ba5c
AEPOptimize: 413690f88cb8ae574153a94081331788ca740a91
AEPRulesEngine: 71228dfdac24c9ded09be13e3257a7eb22468ccc
AEPServices: fd41aa2d0eda1e6939ae00a99f8431a57d09e1ca
AEPSignal: bbdb296030fec8239fb316576f40b230267fcf7c
AEPUserProfile: 2ddb5ba8e2c22dd8f942992306b050f4be2c2403
boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
DoubleConversion: cf9b38bf0b2d048436d9a82ad2abe1404f11e7de
FBLazyVector: e686045572151edef46010a6f819ade377dfeb4b
FBReactNativeSpec: a2f531d996fa0cfec14dc62700efc19d68982a65
FBReactNativeSpec: e68eb3d28b515d9d0257ef6bb8e71c24a995f54b
glog: 73c2498ac6884b13ede40eda8228cb1eee9d9d62
RCT-Folly: ec7a233ccc97cc556cf7237f0db1ff65b986f27c
RCTAEPAssurance: 9f51b9b5da17f9b98a41ce29e4f3e3b67ea36c17
RCTAEPCore: d0f44837067a3804608287e62c3e309a8ae7d1d0
RCTAEPEdge: 9938932e89a90adf5cd30250b46cc67fbe35dd06
RCTAEPEdgeConsent: b998b2d08f254635ef01263fea186d7262f2d242
RCTAEPEdgeIdentity: 7f1cd37ab633945599fbe23d41db22a1176f3726
RCTAEPEdgeIdentity: 1b18a3ff1947f8f4896d5f40083d31a6971e4bbc
RCTAEPMessaging: 5ff246c624ceb253f93dbb1ae96af4ec898c91af
RCTAEPUserProfile: 341c77e0d18d69872c81e425a2e9cae37fe82045
RCTRequired: 6d3e854f0e7260a648badd0d44fc364bc9da9728
Expand All @@ -545,7 +550,7 @@ SPEC CHECKSUMS:
React-jsi: 67747b9722f6dab2ffe15b011bcf6b3f2c3f1427
React-jsiexecutor: 80c46bd381fd06e418e0d4f53672dc1d1945c4c3
React-jsinspector: cc614ec18a9ca96fd275100c16d74d62ee11f0ae
react-native-safe-area-context: 584dc04881deb49474363f3be89e4ca0e854c057
react-native-safe-area-context: 9e40fb181dac02619414ba1294d6c2a807056ab9
React-perflogger: 25373e382fed75ce768a443822f07098a15ab737
React-RCTActionSheet: af7796ba49ffe4ca92e7277a5d992d37203f7da5
React-RCTAnimation: 6a2e76ab50c6f25b428d81b76a5a45351c4d77aa
Expand All @@ -560,10 +565,10 @@ SPEC CHECKSUMS:
ReactCommon: 149906e01aa51142707a10665185db879898e966
RNCMaskedView: 0e1bc4bfa8365eba5fbbb71e07fbdc0555249489
RNGestureHandler: a479ebd5ed4221a810967000735517df0d2db211
RNReanimated: 024eff8202342abf4b24e11575a16afc441dabfe
RNScreens: 4d79118be80f79fa1f4aa131909a1d6e86280af3
RNReanimated: 7f3eef39b48facdb0b053873abdaafaa6a953b0d
RNScreens: 40a2cb40a02a609938137a1e0acfbf8fc9eebf19
Yoga: 575c581c63e0d35c9a83f4b46d01d63abc1100ac

PODFILE CHECKSUM: 18e76638d1b25ad6c02b6b9e0bfacb8bcefda684

COCOAPODS: 1.11.2
COCOAPODS: 1.10.1
Loading