Release 3.0.0

Release 3.0.0

Author: cacheung

.circleci/config.yml

@@ -25,6 +25,10 @@ jobs:
             - 1-gems-{{ checksum "ios/Gemfile.lock" }}
 
       # make sure we're on the right version of cocoapods
+      - run:
+          name: Install latest Cocoapods
+          command: sudo gem install cocoapods
+
       - run:
           name: Verify Cocoapods Version
           command: cd ios && bundle check || bundle install --path vendor/bundle
@@ -72,7 +76,9 @@ jobs:
 
       - run:
           name: Building Android Sample App
-          command: make build-sample-android
+          command: |
+            export NODE_OPTIONS=--max-old-space-size=8192
+            make build-sample-android
 
 
   build-sample-app-ios:
@@ -86,6 +92,10 @@ jobs:
           name: Install react-native-cli
           command: npm install -g react-native-cli
 
+      - run:
+          name: Install latest Cocoapods
+          command: sudo gem install cocoapods
+          
       - run:
           name: Copy changes into sample app
           command: make copy-to-sample

Makefile

@@ -16,10 +16,11 @@ build-ios: setup
 	(cd ios && xcodebuild build -workspace RCT${PROJECT_NAME}.xcworkspace -scheme RCT${PROJECT_NAME})
 
 build-sample-android:
-	(cd sample/ACP*Sample/android && ./gradlew assembleRelease)
+	(cd sample/ACP*SampleApp/android && ./gradlew clean assembleRelease -x bundleReleaseJsAndAssets)
 
 build-sample-ios:
-	(cd sample/ACP*Sample/ios && xcodebuild build -project ACPMediaSample.xcodeproj -scheme ACPMediaSample CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED="NO" CODE_SIGNING_ALLOWED="NO")
+	(cd sample/ACP*SampleApp/ios && pod update)
+	(cd sample/ACP*SampleApp && npx react-native run-ios)
 
 run-tests:
 	jest --testPathIgnorePatterns sample/ node_modules/ --modulePathIgnorePatterns sample/ --runInBand
@@ -28,7 +29,7 @@ run-tests-locally: setup
 	./node_modules/.bin/jest --testPathIgnorePatterns sample/ node_modules/ --modulePathIgnorePatterns sample/
 
 copy-to-sample:
-	cd sample/ACP*Sample/ && sh copy-changes-to-sample.sh
+	(cd sample/ACP*SampleApp/ && make sync)
 
 # fetches the latest iOS & Android SDK and put them in the project
 update-libs:

RCTACPMedia.podspec

@@ -18,13 +18,5 @@ Pod::Spec.new do |s|
   s.requires_arc = true
 
   s.dependency "React"
-
-  s.ios.vendored_frameworks = 'ios/libs/ACPMedia.xcframework'
-  s.ios.frameworks = 'UIKit', 'SystemConfiguration', 'WebKit', 'UserNotifications'
-  s.ios.library = 'sqlite3.0', 'c++', 'z'
-
-  s.tvos.vendored_frameworks = 'ios/libs/ACPMediaTV.xcframework'
-  s.tvos.frameworks = 'SystemConfiguration'
-  s.tvos.library = 'sqlite3.0', 'c++', 'z'
-
+  s.dependency "ACPMedia"
 end

README.md

@@ -8,7 +8,6 @@
 
 `@adobe/react-native-acpmedia` is a wrapper around the iOS, tvOS and Android [AEP Media SDK](https://aep-sdks.gitbook.io/docs/using-mobile-extensions/adobe-media-analytics) to allow for integration with React Native applications. Functionality to enable Adobe Media Analytics is provided entirely through JavaScript documented below.
 
-
 ## Installation
 
 You need to install the SDK with [npm](https://www.npmjs.com/) and configure the native Android/iOS project in your react native project. Before installing the Media extension it is recommended to begin by installing the [Core extension](https://github.com/adobe/react-native-acpcore) and the [Analytics extension](https://github.com/adobe/react-native-acpanalytics).
@@ -77,7 +76,7 @@ ACPMedia.extensionVersion().then(version => console.log("AdobeExperienceSDK: ACP
 
 ##### Registering the extension with ACPCore:
 
-> Note: It is recommended to initialize the SDK via native code inside your AppDelegate and MainApplication in iOS and Android respectively. However, you can still initialize the SDK in Javascript. For more information see how to initialize [Core](https://github.com/adobe/react-native-acpcore#initializing-the-sdk).
+> Note: It is recommended to initialize the SDK via native code inside your AppDelegate and MainApplication in iOS and Android respectively.
 
 ##### **iOS**
 ```objective-c
@@ -93,13 +92,6 @@ import com.adobe.marketing.mobile.Media;
 Media.registerExtension();
 ```
 
-##### **Javascript:**
-```javascript
-import {ACPMedia} from '@adobe/react-native-acpmedia';
-
-ACPMedia.registerExtension();
-```
-
 #### Media API:
 
 ##### Create a media tracker:

__tests__/ACPMediaTests.js

@@ -25,12 +25,6 @@ describe('ACPMedia', () => {
     expect(spy).toHaveBeenCalled();
   });
 
-  test('registerExtension is called', async () => {
-    const spy = jest.spyOn(NativeModules.ACPMedia, 'registerExtension');
-    await ACPMedia.registerExtension();
-    expect(spy).toHaveBeenCalled();
-  });
-
   test('createMediaObject returns correct value', async () => {
     let name = "mediaName";
     let mediaId = "mediaId";

android/build.gradle

@@ -29,11 +29,10 @@ android {
 
 repositories {
     google()
-    jcenter()
     mavenCentral()
 }
 
 dependencies {
     implementation "com.facebook.react:react-native:+"
-    api "com.adobe.marketing.mobile:media:2.1.1"
+    api "com.adobe.marketing.mobile:media:2.+"
 }

android/src/main/java/com/adobe/marketing/mobile/reactnative/media/RCTACPMediaModule.java

@@ -49,15 +49,6 @@ public void extensionVersion(final Promise promise) {
       promise.resolve(Media.extensionVersion());
   }
 
-  @ReactMethod
-  public void registerExtension() {
-      try {
-          Media.registerExtension();
-      } catch (InvalidInitException e) {
-          Log.d(getName(), "Registering Media extension failed with error: " + e.getMessage());
-      }
-  }
-
   @ReactMethod
   public void createTracker(final Promise promise) {
       MediaTracker mediaTracker = Media.createTracker();

ios/Podfile

@@ -16,4 +16,26 @@ target 'RCTACPMedia' do
   pod 'DoubleConversion', :podspec => "#{react_native_path}/third-party-podspecs/DoubleConversion.podspec"
   pod "yoga", :path => "#{react_native_path}/ReactCommon/yoga"
   pod "Folly", :podspec => "#{react_native_path}/third-party-podspecs/Folly.podspec"
+
+  pod "ACPMedia"
+
 end
+
+post_install do |installer|
+  ## Fix for XCode 12.5 beta
+  find_and_replace("../node_modules/react-native/React/CxxBridge/RCTCxxBridge.mm",
+  "_initializeModules:(NSArray<id<RCTBridgeModule>> *)modules", "_initializeModules:(NSArray<Class> *)modules")
+end
+
+def find_and_replace(dir, findstr, replacestr)
+  Dir[dir].each do |name|
+      text = File.read(name)
+      replace = text.gsub(findstr,replacestr)
+      if text != replace
+          puts "Fix: " + name
+          File.open(name, "w") { |file| file.puts replace }
+          STDOUT.flush
+      end
+  end
+  Dir[dir + '*/'].each(&method(:find_and_replace))
+end

ios/Podfile.lock

@@ -1,4 +1,12 @@
 PODS:
+  - ACPCore (2.9.4):
+    - ACPCore/main (= 2.9.4)
+  - ACPCore/main (2.9.4)
+  - ACPMedia (2.3.1):
+    - ACPCore (>= 2.9.0)
+    - ACPMedia/xcframeworks (= 2.3.1)
+  - ACPMedia/xcframeworks (2.3.1):
+    - ACPCore (>= 2.9.0)
   - boost-for-react-native (1.63.0)
   - DoubleConversion (1.1.6)
   - Folly (2018.10.22.00):
@@ -43,6 +51,7 @@ PODS:
   - yoga (0.60.6.React)
 
 DEPENDENCIES:
+  - ACPMedia
   - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
   - Folly (from `../node_modules/react-native/third-party-podspecs/Folly.podspec`)
   - React-Core (from `../node_modules/react-native/React`)
@@ -56,6 +65,9 @@ SPEC REPOS:
   https://github.com/CocoaPods/Specs.git:
     - boost-for-react-native
     - glog
+  trunk:
+    - ACPCore
+    - ACPMedia
 
 EXTERNAL SOURCES:
   DoubleConversion:
@@ -76,6 +88,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/ReactCommon/yoga"
 
 SPEC CHECKSUMS:
+  ACPCore: 7d09a5b7233d72fa7cb4369c99a8250fd7240305
+  ACPMedia: 3868c04bb540b50ee54a4a75eae2765a58a406ee
   boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
   DoubleConversion: 5805e889d232975c086db112ece9ed034df7a0b2
   Folly: 30e7936e1c45c08d884aa59369ed951a8e68cf51
@@ -87,6 +101,6 @@ SPEC CHECKSUMS:
   React-jsinspector: a58b86545a0185f69768e78ac96ca9fe43fa3694
   yoga: 5079887aa3e4c62142d6bcee493022643ee4d730
 
-PODFILE CHECKSUM: 40e2652abd49702929f97ffd00b43cc4b5478c92
+PODFILE CHECKSUM: 87ad4590f588059d49ce8f60aa92fdf9adbee7a0
 
-COCOAPODS: 1.10.0
+COCOAPODS: 1.10.1

ios/RCTACPMedia.xcodeproj/project.pbxproj

@@ -3,14 +3,12 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 52;
+	objectVersion = 46;
 	objects = {
 
 /* Begin PBXBuildFile section */
-		21B629FD2590482F0039CE4D /* ACPMedia.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 21B629FB2590482F0039CE4D /* ACPMedia.xcframework */; };
-		21B62A02259048440039CE4D /* ACPMedia.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 21B62A01259048390039CE4D /* ACPMedia.h */; };
-		21B62A03259048440039CE4D /* ACPMediaConstants.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 21B62A00259048390039CE4D /* ACPMediaConstants.h */; };
 		21D0CC3B235F8F94002043A2 /* ACPMedia+ACPMediaEventConversion.m in Sources */ = {isa = PBXBuildFile; fileRef = 21D0CC3A235F8F94002043A2 /* ACPMedia+ACPMediaEventConversion.m */; };
+		27806D4094C56DFAA8E6D2D6 /* libPods-RCTACPMedia.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C5AC1BB6D9542D0CA53F615E /* libPods-RCTACPMedia.a */; };
 		B3E7B58A1CC2AC0600A0062D /* RCTACPMedia.m in Sources */ = {isa = PBXBuildFile; fileRef = B3E7B5891CC2AC0600A0062D /* RCTACPMedia.m */; };
 /* End PBXBuildFile section */
 
@@ -21,31 +19,28 @@
 			dstPath = "include/$(PRODUCT_NAME)";
 			dstSubfolderSpec = 16;
 			files = (
-				21B62A02259048440039CE4D /* ACPMedia.h in CopyFiles */,
-				21B62A03259048440039CE4D /* ACPMediaConstants.h in CopyFiles */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
 		134814201AA4EA6300B7C361 /* libRCTACPMedia.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRCTACPMedia.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		21B629FB2590482F0039CE4D /* ACPMedia.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; path = ACPMedia.xcframework; sourceTree = "<group>"; };
-		21B629FC2590482F0039CE4D /* ACPMediaTV.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; path = ACPMediaTV.xcframework; sourceTree = "<group>"; };
-		21B62A00259048390039CE4D /* ACPMediaConstants.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ACPMediaConstants.h; path = "ACPMedia.xcframework/ios-arm64_armv7_armv7s/Headers/ACPMediaConstants.h"; sourceTree = "<group>"; };
-		21B62A01259048390039CE4D /* ACPMedia.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ACPMedia.h; path = "ACPMedia.xcframework/ios-arm64_armv7_armv7s/Headers/ACPMedia.h"; sourceTree = "<group>"; };
 		21D0CC39235F8F94002043A2 /* ACPMedia+ACPMediaEventConversion.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "ACPMedia+ACPMediaEventConversion.h"; path = "src/ACPMedia+ACPMediaEventConversion.h"; sourceTree = "<group>"; };
 		21D0CC3A235F8F94002043A2 /* ACPMedia+ACPMediaEventConversion.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = "ACPMedia+ACPMediaEventConversion.m"; path = "src/ACPMedia+ACPMediaEventConversion.m"; sourceTree = "<group>"; };
+		A69E3A6B88D8914BB533944E /* Pods-RCTACPMedia.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RCTACPMedia.release.xcconfig"; path = "Target Support Files/Pods-RCTACPMedia/Pods-RCTACPMedia.release.xcconfig"; sourceTree = "<group>"; };
 		B3E7B5881CC2AC0600A0062D /* RCTACPMedia.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RCTACPMedia.h; path = src/RCTACPMedia.h; sourceTree = "<group>"; };
 		B3E7B5891CC2AC0600A0062D /* RCTACPMedia.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RCTACPMedia.m; path = src/RCTACPMedia.m; sourceTree = "<group>"; };
+		C3CE1379015D4DE99EAD9D38 /* Pods-RCTACPMedia.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RCTACPMedia.debug.xcconfig"; path = "Target Support Files/Pods-RCTACPMedia/Pods-RCTACPMedia.debug.xcconfig"; sourceTree = "<group>"; };
+		C5AC1BB6D9542D0CA53F615E /* libPods-RCTACPMedia.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RCTACPMedia.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
 		58B511D81A9E6C8500147676 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				21B629FD2590482F0039CE4D /* ACPMedia.xcframework in Frameworks */,
+				27806D4094C56DFAA8E6D2D6 /* libPods-RCTACPMedia.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -60,15 +55,14 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
-		211D500F235F51160067234A /* libs */ = {
+		2B632DD416224E334850ED87 /* Pods */ = {
 			isa = PBXGroup;
 			children = (
-				21B62A01259048390039CE4D /* ACPMedia.h */,
-				21B62A00259048390039CE4D /* ACPMediaConstants.h */,
-				21B629FB2590482F0039CE4D /* ACPMedia.xcframework */,
-				21B629FC2590482F0039CE4D /* ACPMediaTV.xcframework */,
+				C3CE1379015D4DE99EAD9D38 /* Pods-RCTACPMedia.debug.xcconfig */,
+				A69E3A6B88D8914BB533944E /* Pods-RCTACPMedia.release.xcconfig */,
 			);
-			path = libs;
+			name = Pods;
+			path = Pods;
 			sourceTree = "<group>";
 		};
 		58B511D21A9E6C8500147676 = {
@@ -78,18 +72,28 @@
 				B3E7B5891CC2AC0600A0062D /* RCTACPMedia.m */,
 				21D0CC39235F8F94002043A2 /* ACPMedia+ACPMediaEventConversion.h */,
 				21D0CC3A235F8F94002043A2 /* ACPMedia+ACPMediaEventConversion.m */,
-				211D500F235F51160067234A /* libs */,
 				134814211AA4EA7D00B7C361 /* Products */,
+				2B632DD416224E334850ED87 /* Pods */,
+				B2635C28CD6C3F2460EA6B4D /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
+		B2635C28CD6C3F2460EA6B4D /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				C5AC1BB6D9542D0CA53F615E /* libPods-RCTACPMedia.a */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
 		58B511DA1A9E6C8500147676 /* RCTACPMedia */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 58B511EF1A9E6C8500147676 /* Build configuration list for PBXNativeTarget "RCTACPMedia" */;
 			buildPhases = (
+				52434F35F072FA7B27A787AD /* [CP] Check Pods Manifest.lock */,
 				58B511D91A9E6C8500147676 /* CopyFiles */,
 				58B511D71A9E6C8500147676 /* Sources */,
 				58B511D81A9E6C8500147676 /* Frameworks */,
@@ -135,6 +139,31 @@
 		};
 /* End PBXProject section */
 
+/* Begin PBXShellScriptBuildPhase section */
+		52434F35F072FA7B27A787AD /* [CP] Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-RCTACPMedia-checkManifestLockResult.txt",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			showEnvVarsInLog = 0;
+		};
+/* End PBXShellScriptBuildPhase section */
+
 /* Begin PBXSourcesBuildPhase section */
 		58B511D71A9E6C8500147676 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
@@ -231,6 +260,7 @@
 		};
 		58B511F01A9E6C8500147676 /* Debug */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = C3CE1379015D4DE99EAD9D38 /* Pods-RCTACPMedia.debug.xcconfig */;
 			buildSettings = {
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
@@ -251,6 +281,7 @@
 		};
 		58B511F11A9E6C8500147676 /* Release */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = A69E3A6B88D8914BB533944E /* Pods-RCTACPMedia.release.xcconfig */;
 			buildSettings = {
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",