From 658dc507b8f3b85c8b7c0ae8d31c5bb2916ef893 Mon Sep 17 00:00:00 2001 From: Yansong Yang Date: Fri, 22 Jul 2022 16:40:38 -0600 Subject: [PATCH 1/3] [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 --- apps/AEPSampleApp/android/build.gradle | 4 ++-- packages/core/android/build.gradle | 4 ++-- packages/core/android/src/main/AndroidManifest.xml | 14 +++++++++----- packages/core/package.json | 2 +- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/apps/AEPSampleApp/android/build.gradle b/apps/AEPSampleApp/android/build.gradle index b2794ec0..3638a407 100644 --- a/apps/AEPSampleApp/android/build.gradle +++ b/apps/AEPSampleApp/android/build.gradle @@ -6,8 +6,8 @@ buildscript { ext { buildToolsVersion = "29.0.3" minSdkVersion = 21 - compileSdkVersion = 29 - targetSdkVersion = 29 + compileSdkVersion = 31 + targetSdkVersion = 31 if (System.properties['os.arch'] == "aarch64") { // For M1 Users we need to use the NDK 24 which added support for aarch64 diff --git a/packages/core/android/build.gradle b/packages/core/android/build.gradle index 71717f9d..5a4268df 100644 --- a/packages/core/android/build.gradle +++ b/packages/core/android/build.gradle @@ -12,12 +12,12 @@ buildscript { apply plugin: 'com.android.library' android { - compileSdkVersion 28 + compileSdkVersion 31 // buildToolsVersion "23.0.1" defaultConfig { minSdkVersion 16 - targetSdkVersion 28 + targetSdkVersion 31 versionCode 1 versionName "1.0" } diff --git a/packages/core/android/src/main/AndroidManifest.xml b/packages/core/android/src/main/AndroidManifest.xml index 6fc028f5..eabb6ffe 100644 --- a/packages/core/android/src/main/AndroidManifest.xml +++ b/packages/core/android/src/main/AndroidManifest.xml @@ -1,9 +1,13 @@ - + package="com.adobe.marketing.mobile.reactnative"> + - - - + + + diff --git a/packages/core/package.json b/packages/core/package.json index eb5cd121..b08c2acd 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@adobe/react-native-aepcore", - "version": "1.0.0", + "version": "1.0.1", "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/3] 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" /> +