Merge Staging -> UserProfile for UserProfile 2.0.0 update

.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: intall pods
+          name: Install pods
           command: yarn sampleapp:ios:pod:install
 
       - run:

PRERELEASE.md

@@ -0,0 +1,19 @@
+
+# Using Pre-Release Extensions
+
+If you would like to use Optimize or Messaging before they have been released, you can use the following steps to install them onto your app
+
+## Steps to Install Optimize and Messaging
+
+- Place Optimize and Messaging packages folder into app repo or directory of your choosing
+- In your app repository, run 
+  ```javascript
+  npm install (path/to/optimize) (path/to/messaging)
+  ``` 
+  to install the local version of the package to your app
+
+### Android
+- Inside android/app.gradle add the following into the two repositories blocks in the file `maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }`
+
+### IOS
+- Inside Podfile, add the following line inside the target block `pod "AEPMessaging", :git => "https://github.com/adobe/aepsdk-messaging-ios.git", :branch => "staging"`

apps/AEPSampleApp/.gitignore

@@ -28,6 +28,7 @@ build/
 .gradle
 local.properties
 *.iml
+*.hprof
 
 # node.js
 #
@@ -55,5 +56,6 @@ buck-out/
 # Bundle artifact
 *.jsbundle
 
-# CocoaPods
+# Ruby / CocoaPods
 /ios/Pods/
+/vendor/bundle/

apps/AEPSampleApp/App.tsx

@@ -1,7 +1,8 @@
 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';
 import CoreView from './extensions/CoreView';
@@ -10,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"
@@ -27,13 +31,18 @@ function HomeScreen({ navigation }: NavigationProps) {
         onPress={() => navigation.navigate('IdentityView')}
         title="Identity"
       />
+
       <Button
         onPress={() => navigation.navigate('MessagingView')}
-        title="Messaging" />
+        title="Messaging"
+      />
+
       <Button
-        onPress={() => navigation.navigate('EdgeView')}
-        title="Edge"
+        onPress={() => navigation.navigate('OptimizeView')}
+        title="Optimize"
       />
+
+      <Button onPress={() => navigation.navigate('EdgeView')} title="Edge" />
       <Button
         onPress={() => navigation.navigate('EdgeIdentityView')}
         title="EdgeIdentity"
@@ -46,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>
   );
 }
@@ -58,14 +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.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/README.md

@@ -7,7 +7,7 @@
 How to run the sample app:
 
 ### Add your App Id:
-In `ios/**/AppDelegate.m`, find the call to `configureWithAppId` and add your app id.
+In `ios/**/AppDelegate.mm`, find the call to `configureWithAppId` and add your app id.
 
 In `android/**/MainApplication.java`, find the call to `configureWithAppId` and add your app id.
 

apps/AEPSampleApp/android/app/build.gradle

@@ -1,6 +1,7 @@
 apply plugin: "com.android.application"
 
 import com.android.build.OutputFile
+import org.apache.tools.ant.taskdefs.condition.Os
 
 /**
  * The react.gradle file registers a task for each build variant (e.g. bundleDebugJsAndAssets
@@ -114,35 +115,111 @@ def jscFlavor = 'org.webkit:android-jsc:+'
 /**
  * Whether to enable the Hermes VM.
  *
- * This should be set on project.ext.react and mirrored here.  If it is not set
+ * This should be set on project.ext.react and that value will be read here. If it is not set
  * on project.ext.react, JavaScript will not be compiled to Hermes Bytecode
  * and the benefits of using Hermes will therefore be sharply reduced.
  */
 def enableHermes = project.ext.react.get("enableHermes", false);
 
+/**
+ * Architectures to build native code for.
+ */
+def reactNativeArchitectures() {
+    def value = project.getProperties().get("reactNativeArchitectures")
+    return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"]
+}
+
 android {
     ndkVersion rootProject.ext.ndkVersion
 
     compileSdkVersion rootProject.ext.compileSdkVersion
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-
     defaultConfig {
         applicationId "com.aepsampleapp"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
         versionName "1.0"
+        buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
+
+        if (isNewArchitectureEnabled()) {
+            // We configure the NDK build only if you decide to opt-in for the New Architecture.
+            externalNativeBuild {
+                ndkBuild {
+                    arguments "APP_PLATFORM=android-21",
+                        "APP_STL=c++_shared",
+                        "NDK_TOOLCHAIN_VERSION=clang",
+                        "GENERATED_SRC_DIR=$buildDir/generated/source",
+                        "PROJECT_BUILD_DIR=$buildDir",
+                        "REACT_ANDROID_DIR=$rootDir/../node_modules/react-native/ReactAndroid",
+                        "REACT_ANDROID_BUILD_DIR=$rootDir/../node_modules/react-native/ReactAndroid/build"
+                    cFlags "-Wall", "-Werror", "-fexceptions", "-frtti", "-DWITH_INSPECTOR=1"
+                    cppFlags "-std=c++17"
+                    // Make sure this target name is the same you specify inside the
+                    // src/main/jni/Android.mk file for the `LOCAL_MODULE` variable.
+                    targets "aepsampleapp_appmodules"
+
+                    // Fix for windows limit on number of character in file paths and in command lines
+                    if (Os.isFamily(Os.FAMILY_WINDOWS)) {
+                        arguments "NDK_APP_SHORT_COMMANDS=true"
+                    }
+                }
+            }
+            if (!enableSeparateBuildPerCPUArchitecture) {
+                ndk {
+                    abiFilters (*reactNativeArchitectures())
+                }
+            }
+        }
+    }
+
+    if (isNewArchitectureEnabled()) {
+        // We configure the NDK build only if you decide to opt-in for the New Architecture.
+        externalNativeBuild {
+            ndkBuild {
+                path "$projectDir/src/main/jni/Android.mk"
+            }
+        }
+        def reactAndroidProjectDir = project(':ReactAndroid').projectDir
+        def packageReactNdkDebugLibs = tasks.register("packageReactNdkDebugLibs", Copy) {
+            dependsOn(":ReactAndroid:packageReactNdkDebugLibsForBuck")
+            from("$reactAndroidProjectDir/src/main/jni/prebuilt/lib")
+            into("$buildDir/react-ndk/exported")
+        }
+        def packageReactNdkReleaseLibs = tasks.register("packageReactNdkReleaseLibs", Copy) {
+            dependsOn(":ReactAndroid:packageReactNdkReleaseLibsForBuck")
+            from("$reactAndroidProjectDir/src/main/jni/prebuilt/lib")
+            into("$buildDir/react-ndk/exported")
+        }
+        afterEvaluate {
+            // If you wish to add a custom TurboModule or component locally,
+            // you should uncomment this line.
+            // preBuild.dependsOn("generateCodegenArtifactsFromSchema")
+            preDebugBuild.dependsOn(packageReactNdkDebugLibs)
+            preReleaseBuild.dependsOn(packageReactNdkReleaseLibs)
+
+            // Due to a bug inside AGP, we have to explicitly set a dependency
+            // between configureNdkBuild* tasks and the preBuild tasks.
+            // This can be removed once this is solved: https://issuetracker.google.com/issues/207403732
+            configureNdkBuildRelease.dependsOn(preReleaseBuild)
+            configureNdkBuildDebug.dependsOn(preDebugBuild)
+            reactNativeArchitectures().each { architecture ->
+                tasks.findByName("configureNdkBuildDebug[${architecture}]")?.configure {
+                    dependsOn("preDebugBuild")
+                }
+                tasks.findByName("configureNdkBuildRelease[${architecture}]")?.configure {
+                    dependsOn("preReleaseBuild")
+                }
+            }
+        }
     }
+
     splits {
         abi {
             reset()
             enable enableSeparateBuildPerCPUArchitecture
             universalApk false  // If true, also generate a universal APK
-            include "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
+            include (*reactNativeArchitectures())
         }
     }
     signingConfigs {
@@ -185,13 +262,14 @@ android {
 
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
+
     //noinspection GradleDynamicVersion
     implementation "com.facebook.react:react-native:+"  // From node_modules
 
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
 
     debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") {
-      exclude group:'com.facebook.fbjni'
+        exclude group:'com.facebook.fbjni'
     }
 
     debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") {
@@ -212,11 +290,31 @@ dependencies {
     }
 }
 
+if (isNewArchitectureEnabled()) {
+    // If new architecture is enabled, we let you build RN from source
+    // Otherwise we fallback to a prebuilt .aar bundled in the NPM package.
+    // This will be applied to all the imported transtitive dependency.
+    configurations.all {
+        resolutionStrategy.dependencySubstitution {
+            substitute(module("com.facebook.react:react-native"))
+                    .using(project(":ReactAndroid")).because("On New Architecture we're building React Native from source")
+        }
+    }
+}
+
 // Run this once to be able to run the application with BUCK
 // puts all compile dependencies into folder libs for BUCK to use
 task copyDownloadableDepsToLibs(type: Copy) {
-    from configurations.compile
+    from configurations.implementation
     into 'libs'
 }
 
 apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)
+
+def isNewArchitectureEnabled() {
+    // To opt-in for the New Architecture, you can either:
+    // - Set `newArchEnabled` to true inside the `gradle.properties` file
+    // - Invoke gradle with `-newArchEnabled=true`
+    // - Set an environment variable `ORG_GRADLE_PROJECT_newArchEnabled=true`
+    return project.hasProperty("newArchEnabled") && project.newArchEnabled == "true"
+}

apps/AEPSampleApp/android/app/src/debug/AndroidManifest.xml

@@ -8,6 +8,6 @@
         android:usesCleartextTraffic="true"
         tools:targetApi="28"
         tools:ignore="GoogleAppIndexingWarning">
-        <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
+        <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" android:exported="false" />
     </application>
 </manifest>

apps/AEPSampleApp/android/app/src/debug/java/com/aepsampleapp/ReactNativeFlipper.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * <p>This source code is licensed under the MIT license found in the LICENSE file in the root
  * directory of this source tree.
@@ -19,6 +19,7 @@
 import com.facebook.flipper.plugins.network.NetworkFlipperPlugin;
 import com.facebook.flipper.plugins.react.ReactFlipperPlugin;
 import com.facebook.flipper.plugins.sharedpreferences.SharedPreferencesFlipperPlugin;
+import com.facebook.react.ReactInstanceEventListener;
 import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.modules.network.NetworkingModule;
@@ -51,7 +52,7 @@ public void apply(OkHttpClient.Builder builder) {
       ReactContext reactContext = reactInstanceManager.getCurrentReactContext();
       if (reactContext == null) {
         reactInstanceManager.addReactInstanceEventListener(
-            new ReactInstanceManager.ReactInstanceEventListener() {
+            new ReactInstanceEventListener() {
               @Override
               public void onReactContextInitialized(ReactContext reactContext) {
                 reactInstanceManager.removeReactInstanceEventListener(this);