Merge Staging -> Core for Core 2.0.0 update (#233)

* feat: adds react native wrapper for aep places

* [android12] add android:exported attribute to core extension's manifest (#202)

* clean up core extension

* fix review comments

* add a new API: clearUpdatedConfiguration

* update public docs

* update android native implementation

* add android:exported attribute to core extension's manifest file as it's required by Android 12

* Merge branch 'staging' into core (#201)

# Conflicts:
#	apps/AEPSampleApp/ios/Podfile.lock

* update core version

* [android12] add android:exported attribute to core extension's manifest (#202) (#203)

* clean up core extension

* fix review comments

* add a new API: clearUpdatedConfiguration

* update public docs

* update android native implementation

* add android:exported attribute to core extension's manifest file as it's required by Android 12

* Merge branch 'staging' into core (#201)

# Conflicts:
#	apps/AEPSampleApp/ios/Podfile.lock

* update core version

* build: updates xcode image in circleci

* feat: adds score to offer class, better type defs

* docs: update readme, copyrights

* docs: 📝 adds license

* docs: 📝 update docs with examples, add places to root docs

* feat: adds target rn wrapper

* docs: update docs for target

* docs: 📝 updates target docs with syntax

* fix: 🎨 pr feedback for adding score

* chore: ⬆️ updates to latest versions of messaging

* feat: ✨ adds support for campaign classic

* build: 💚 change test commad for circleci

* fix: 🥅 updates podfile

* chore: 🔖 upgrades beta packages to release

* Update Readme for Edge and Edge Identity.  Replace all https://aep-sdks.gitbook.io/docs/ to adobe.io docs.

Update Readme for Edge and Edge Identity.  Replace all https://aep-sdks.gitbook.io/docs/ to adobe.io docs.

* fix: defer to root project sdk version gradle params (#223)

* Bump up package versions to adopt Android 2.0 (#226)

* update extension packages with Android 2.0 builds

* no message

* revert messaging version to 1.0.0

* address review comments

* bump API level to 33 for test app

* Update SDK installation steps for Android 2.0 integration (#232)

* update extension packages with Android 2.0 builds

* no message

* installation doc update for Android 2.0

* update docs

* Update README.md

* update sample app

* Update README.md

* address review comments

---------

Co-authored-by: dsoffiantini <[email protected]>
Co-authored-by: Calise Cheung <[email protected]>
Co-authored-by: Kevin Dice <[email protected]>

Author: 4 people

.circleci/config.yml

@@ -42,11 +42,16 @@ jobs:
           
   build-sample-app-ios:
     macos:
-      xcode: "12.0.1"
+      xcode: "13.0.0"
 
     steps:
       - checkout
 
+      # CircleCI puts xcode app in consistent path, RN looks for versioned path
+      - run:
+          name: Move xcode
+          command: cd /Applications && mv Xcode.app Xcode-13.0.app
+
       - run:
           name: Install latest NodeJS
           command: brew install node
@@ -66,7 +71,7 @@ jobs:
           command: sudo gem install cocoapods
 
       - run:
-          name: install pods
+          name: Install pods
           command: yarn sampleapp:ios:pod:install
 
       - run:

README.md

@@ -1,7 +1,7 @@
 import * as React from 'react';
-import { Button, View } from 'react-native';
-import { createDrawerNavigator } from '@react-navigation/drawer';
-import { NavigationContainer } from '@react-navigation/native';
+import {Button, View} from 'react-native';
+import {createDrawerNavigator} from '@react-navigation/drawer';
+import {NavigationContainer} from '@react-navigation/native';
 import OptimizeView from './extensions/OptimizeView';
 import ProfileView from './extensions/ProfileView';
 import MessagingView from './extensions/MessagingView';
@@ -11,11 +11,14 @@ import ConsentView from './extensions/ConsentView';
 import EdgeView from './extensions/EdgeView';
 import AssuranceView from './extensions/AssuranceView';
 import EdgeIdentityView from './extensions/EdgeIdentityView';
-import { NavigationProps } from './types/props';
+import TargetView from './extensions/TargetView';
+import PlacesView from './extensions/PlacesView';
+import {NavigationProps} from './types/props';
+import CampaignClassicView from './extensions/CampaignClassicView';
 
-function HomeScreen({ navigation }: NavigationProps) {
+function HomeScreen({navigation}: NavigationProps) {
   return (
-    <View style={{ flex: 1, alignItems: 'center', justifyContent: 'center' }}>
+    <View style={{flex: 1, alignItems: 'center', justifyContent: 'center'}}>
       <Button
         onPress={() => navigation.navigate('CoreView')}
         title="Core/Lifecycle/Signal"
@@ -31,16 +34,15 @@ function HomeScreen({ navigation }: NavigationProps) {
 
       <Button
         onPress={() => navigation.navigate('MessagingView')}
-        title="Messaging" />        
+        title="Messaging"
+      />
 
       <Button
         onPress={() => navigation.navigate('OptimizeView')}
-        title="Optimize"/>
-
-      <Button
-        onPress={() => navigation.navigate('EdgeView')}
-        title="Edge"
+        title="Optimize"
       />
+
+      <Button onPress={() => navigation.navigate('EdgeView')} title="Edge" />
       <Button
         onPress={() => navigation.navigate('EdgeIdentityView')}
         title="EdgeIdentity"
@@ -53,6 +55,18 @@ function HomeScreen({ navigation }: NavigationProps) {
         onPress={() => navigation.navigate('AssuranceView')}
         title="Assurance"
       />
+      <Button
+        onPress={() => navigation.navigate('TargetView')}
+        title="Target"
+      />
+      <Button
+        onPress={() => navigation.navigate('PlacesView')}
+        title="Places"
+      />
+      <Button
+        onPress={() => navigation.navigate('CampaignClassicView')}
+        title="Campaign Classic"
+      />
     </View>
   );
 }
@@ -65,15 +79,18 @@ export default function App() {
       <Drawer.Navigator initialRouteName="Home">
         <Drawer.Screen name="Home" component={HomeScreen} />
         <Drawer.Screen name="CoreView" component={CoreView} />
-        <Drawer.Screen name="ProfileView" component={ProfileView} />
-        <Drawer.Screen name="IdentityView" component={IdentityView} />
-        <Drawer.Screen name="MessagingView" component={MessagingView} />
+        <Drawer.Screen name="AssuranceView" component={AssuranceView} />
+        <Drawer.Screen name="CampaignClassicView" component={CampaignClassicView} />
+        <Drawer.Screen name="ConsentView" component={ConsentView} />
         <Drawer.Screen name="EdgeView" component={EdgeView} />
         <Drawer.Screen name="EdgeIdentityView" component={EdgeIdentityView} />
-        <Drawer.Screen name="ConsentView" component={ConsentView} />
-        <Drawer.Screen name="AssuranceView" component={AssuranceView} />
-        <Drawer.Screen name="OptimizeView" component={OptimizeView}/>
-      </Drawer.Navigator >
-    </NavigationContainer >
+        <Drawer.Screen name="IdentityView" component={IdentityView} />
+        <Drawer.Screen name="MessagingView" component={MessagingView} />
+        <Drawer.Screen name="OptimizeView" component={OptimizeView} />
+        <Drawer.Screen name="PlacesView" component={PlacesView} />
+        <Drawer.Screen name="ProfileView" component={ProfileView} />
+        <Drawer.Screen name="TargetView" component={TargetView} />
+      </Drawer.Navigator>
+    </NavigationContainer>
   );
 }

apps/AEPSampleApp/App.tsx

@@ -11,6 +11,7 @@
 */
 package com.aepsampleapp;
 
+import com.adobe.marketing.mobile.MobileCore;
 import com.facebook.react.ReactActivity;
 import com.facebook.react.ReactActivityDelegate;
 import com.facebook.react.ReactRootView;
@@ -35,6 +36,19 @@ protected ReactActivityDelegate createReactActivityDelegate() {
     return new MainActivityDelegate(this, getMainComponentName());
   }
 
+  @Override
+  protected void onResume() {
+    super.onResume();
+    MobileCore.setApplication(getApplication());
+    MobileCore.lifecycleStart(null);
+  }
+
+  @Override
+  protected void onPause() {
+    super.onPause();
+    MobileCore.lifecyclePause();
+  }
+
   public static class MainActivityDelegate extends ReactActivityDelegate {
     public MainActivityDelegate(ReactActivity activity, String mainComponentName) {
       super(activity, mainComponentName);

apps/AEPSampleApp/android/app/src/main/java/com/aepsampleapp/MainActivity.java

@@ -14,21 +14,20 @@
 
 import android.app.Application;
 import android.content.Context;
-import com.adobe.marketing.mobile.AdobeCallback;
 import com.adobe.marketing.mobile.Assurance;
 import com.adobe.marketing.mobile.Edge;
-import com.adobe.marketing.mobile.InvalidInitException;
+import com.adobe.marketing.mobile.Extension;
 import com.adobe.marketing.mobile.Lifecycle;
 import com.adobe.marketing.mobile.LoggingMode;
 import com.adobe.marketing.mobile.Messaging;
 import com.adobe.marketing.mobile.MobileCore;
 import com.adobe.marketing.mobile.Signal;
 import com.adobe.marketing.mobile.UserProfile;
 import com.adobe.marketing.mobile.edge.consent.Consent;
-import com.adobe.marketing.mobile.edge.identity.Identity;
 import com.adobe.marketing.mobile.optimize.Optimize;
+import com.adobe.marketing.mobile.Places;
+import com.adobe.marketing.mobile.Target;
 import com.aepsampleapp.newarchitecture.MainApplicationReactNativeHost;
-import com.adobe.marketing.mobile.InvalidInitException;
 import com.facebook.react.PackageList;
 import com.facebook.react.ReactApplication;
 import com.facebook.react.ReactInstanceManager;
@@ -37,6 +36,7 @@
 import com.facebook.react.config.ReactFeatureFlags;
 import com.facebook.soloader.SoLoader;
 import java.lang.reflect.InvocationTargetException;
+import java.util.Arrays;
 import java.util.List;
 
 public class MainApplication extends Application implements ReactApplication {
@@ -87,16 +87,15 @@ public void onCreate() {
   }
 
   /**
-   * Loads Flipper in React Native templates. Call this in the onCreate method
-   * with something like initializeFlipper(this,
-   * getReactNativeHost().getReactInstanceManager());
+   * Loads Flipper in React Native templates. Call this in the onCreate method with something like
+   * initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
    *
    * @param context
    * @param reactInstanceManager
    */
   private static void
   initializeFlipper(Context context,
-                    ReactInstanceManager reactInstanceManager) {
+      ReactInstanceManager reactInstanceManager) {
     if (BuildConfig.DEBUG) {
       try {
         /*
@@ -106,7 +105,7 @@ public void onCreate() {
         Class<?> aClass = Class.forName("com.aepsampleapp.ReactNativeFlipper");
         aClass
             .getMethod("initializeFlipper", Context.class,
-                       ReactInstanceManager.class)
+                ReactInstanceManager.class)
             .invoke(null, context, reactInstanceManager);
       } catch (ClassNotFoundException e) {
         e.printStackTrace();
@@ -117,26 +116,21 @@ public void onCreate() {
       } catch (InvocationTargetException e) {
         e.printStackTrace();
       }
-
-      try {
-        Edge.registerExtension();
-        Identity.registerExtension();
-        Messaging.registerExtension();
-        UserProfile.registerExtension();
-        Lifecycle.registerExtension();
-        Signal.registerExtension();
-        Consent.registerExtension();
-        Assurance.registerExtension();
-        Optimize.registerExtension();
-      } catch (InvalidInitException e) {
-        e.printStackTrace();
-      }
       MobileCore.configureWithAppID("YOUR-APP-ID");
-      MobileCore.start(new AdobeCallback() {
-        @Override
-        public void call(Object o) {
-          MobileCore.lifecycleStart(null);
-        }
+      List<Class<? extends Extension>> extensions = Arrays.asList(
+          Lifecycle.EXTENSION,
+          Signal.EXTENSION,
+          Edge.EXTENSION,
+          com.adobe.marketing.mobile.edge.identity.Identity.EXTENSION,
+          Messaging.EXTENSION,
+          UserProfile.EXTENSION,
+          Assurance.EXTENSION,
+          Places.EXTENSION,
+          Target.EXTENSION,
+          Optimize.EXTENSION,
+          Consent.EXTENSION);
+      MobileCore.registerExtensions(extensions, o -> {
+        MobileCore.lifecycleStart(null);
       });
     }
   }

apps/AEPSampleApp/android/app/src/main/java/com/aepsampleapp/MainApplication.java

@@ -6,8 +6,8 @@ buildscript {
     ext {
         buildToolsVersion = "29.0.3"
         minSdkVersion = 21
-        compileSdkVersion = 31
-        targetSdkVersion = 31
+        compileSdkVersion = 33
+        targetSdkVersion = 33
 
         if (System.properties['os.arch'] == "aarch64") {
             // For M1 Users we need to use the NDK 24 which added support for aarch64
@@ -22,7 +22,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:7.0.4")
+        classpath("com.android.tools.build:gradle:7.2.2")
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }

apps/AEPSampleApp/android/build.gradle

@@ -0,0 +1,51 @@
+import {CampaignClassic} from '@adobe/react-native-aepcampaignclassic';
+import React from 'react';
+import {Button, ScrollView, Text, View} from 'react-native';
+import styles from '../styles/styles';
+import {NavigationProps} from '../types/props';
+
+function CampaignClassicView({navigation}: NavigationProps) {
+  const extensionVersion = async () => {
+    const version = await CampaignClassic.extensionVersion();
+    console.log(`AdobeExperienceSDK: Campaign Classic version: ${version}`);
+  };
+
+  const registerDeviceWithToken = () => {
+    CampaignClassic.registerDeviceWithToken('myToken', 'myUserKey');
+    console.log('Device registered!')
+  }
+
+  const trackNotificationClickWithUserInfo = () => {
+    CampaignClassic.trackNotificationClickWithUserInfo({'_mId': '12345', '_dId': 'testDId'});
+    console.log('Notification clicked!')
+  }
+    
+  const trackNotificationReceiveWithUserInfo = () => {
+    CampaignClassic.trackNotificationReceiveWithUserInfo({'_mId': '12345', '_dId': 'testDId'});
+    console.log('Notification received!')
+  }
+    
+
+  return (
+    <View style={{...styles.container, marginTop: 30}}>
+      <ScrollView contentContainerStyle={{marginTop: 75}}>
+        <Button onPress={() => navigation.goBack()} title="Go to main page" />
+        <Text style={styles.welcome}>Campaign Classic</Text>
+        <View style={{margin: 5}}>
+          <Button title="Extension Version" onPress={extensionVersion} />
+          <Button title="Register Device" onPress={registerDeviceWithToken} />
+          <Button
+            title="Track User Click"
+            onPress={trackNotificationClickWithUserInfo}
+          />
+          <Button
+            title="Track User Receive"
+            onPress={trackNotificationReceiveWithUserInfo}
+          />
+        </View>
+      </ScrollView>
+    </View>
+  );
+}
+
+export default CampaignClassicView;

apps/AEPSampleApp/extensions/CampaignClassicView.tsx

@@ -12,21 +12,45 @@ governing permissions and limitations under the License.
 
 import React from 'react';
 import {Button, Text, View, ScrollView} from 'react-native';
-import {Messaging} from '@adobe/react-native-aepmessaging';
+import {Message, Messaging} from '@adobe/react-native-aepmessaging';
 import styles from '../styles/styles';
 import {NavigationProps} from '../types/props';
 
-const messagingExtensionVersion = () =>
-  Messaging.extensionVersion().then(version =>
-    console.log('AdobeExperienceSDK: Messaging version: ' + version),
-  );
+const messagingExtensionVersion = async () => {
+  const version = await Messaging.extensionVersion();
+  console.log(`AdobeExperienceSDK: Messaging version: ${version}`);
+};
+
+const refreshInAppMessages = () => {
+  Messaging.refreshInAppMessages();
+  console.log('messages refreshed');
+};
+
+const setMessagingDelegate = () => {
+  Messaging.setMessagingDelegate({
+    onDismiss: () => console.log('dismissed!'),
+    onShow: () => console.log('show'),
+    shouldShowMessage: () => true,
+    urlLoaded: () => true,
+  });
+  console.log('messaging delegate set');
+};
+
+const saveMessage = () => {
+  const message = new Message('1', true);
+  Messaging.saveMessage(message);
+  console.log('message saved');
+};
 
 const MessagingView = ({navigation}: NavigationProps) => (
   <View style={styles.container}>
     <ScrollView contentContainerStyle={{marginTop: 75}}>
       <Button onPress={() => navigation.goBack()} title="Go to main page" />
       <Text style={styles.welcome}>Messaging</Text>
       <Button title="extensionVersion()" onPress={messagingExtensionVersion} />
+      <Button title="refreshInAppMessages()" onPress={refreshInAppMessages} />
+      <Button title="setMessagingDelegate()" onPress={setMessagingDelegate} />
+      <Button title="saveMessage()" onPress={saveMessage} />
     </ScrollView>
   </View>
 );