Release 2.3.0

* Update iOS lib to version 2.3.0 🚀

* Swap to XCFrameworks

* 2.3.0

Co-authored-by: amsdkci <amsdkci@amsdkci03.corp.adobe.com>
Co-authored-by: Nick Porter <nporter@adobe.com>

Author: 3 people

.circleci/config.yml

@@ -12,7 +12,7 @@ jobs:
 
   build-ios:
     macos:
-      xcode: "11.0"
+      xcode: "12.0"
 
     steps:
       - checkout
@@ -43,7 +43,7 @@ jobs:
 
   unit-test:
     macos:
-      xcode: "11.0"
+      xcode: "12.0"
 
     steps:
       - checkout
@@ -77,7 +77,7 @@ jobs:
 
   build-sample-app-ios:
     macos:
-      xcode: "11.0"
+      xcode: "12.0"
 
     steps:
       - checkout

RCTACPMedia.podspec

@@ -18,13 +18,13 @@ Pod::Spec.new do |s|
   s.requires_arc = true
 
   s.dependency "React"
-  
-  s.ios.vendored_libraries = 'ios/libs/libACPMedia_iOS.a'
+
+  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_libraries = 'ios/libs/tvos/libACPMedia_tvOS.a'
+
+  s.tvos.vendored_frameworks = 'ios/libs/ACPMediaTV.xcframework'
   s.tvos.frameworks = 'SystemConfiguration'
-  s.tvos.library = 'sqlite3.0', 'c++', 'z'  
+  s.tvos.library = 'sqlite3.0', 'c++', 'z'
 
 end

ios/Gemfile

@@ -1,3 +1,3 @@
 source 'https://rubygems.org'
 
-gem 'cocoapods', '= 1.6.0'
+gem 'cocoapods', '= 1.10.0'

ios/Gemfile.lock

@@ -1,76 +1,93 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.0)
-    activesupport (4.2.11.1)
-      i18n (~> 0.7)
+    CFPropertyList (3.0.3)
+    activesupport (5.2.4.4)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    algoliasearch (1.27.5)
+      httpclient (~> 2.8, >= 2.8.3)
+      json (>= 1.5.1)
     atomos (0.1.3)
-    claide (1.0.2)
-    cocoapods (1.6.0)
-      activesupport (>= 4.0.2, < 5)
+    claide (1.0.3)
+    cocoapods (1.10.0)
+      addressable (~> 2.6)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.6.0)
-      cocoapods-deintegrate (>= 1.0.2, < 2.0)
-      cocoapods-downloader (>= 1.2.2, < 2.0)
+      cocoapods-core (= 1.10.0)
+      cocoapods-deintegrate (>= 1.0.3, < 2.0)
+      cocoapods-downloader (>= 1.4.0, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
       cocoapods-search (>= 1.0.0, < 2.0)
-      cocoapods-stats (>= 1.0.0, < 2.0)
-      cocoapods-trunk (>= 1.3.1, < 2.0)
+      cocoapods-trunk (>= 1.4.0, < 2.0)
       cocoapods-try (>= 1.1.0, < 2.0)
       colored2 (~> 3.1)
       escape (~> 0.0.4)
-      fourflusher (>= 2.2.0, < 3.0)
+      fourflusher (>= 2.3.0, < 3.0)
       gh_inspector (~> 1.0)
       molinillo (~> 0.6.6)
       nap (~> 1.0)
-      ruby-macho (~> 1.3, >= 1.3.1)
-      xcodeproj (>= 1.8.0, < 2.0)
-    cocoapods-core (1.6.0)
-      activesupport (>= 4.0.2, < 6)
+      ruby-macho (~> 1.4)
+      xcodeproj (>= 1.19.0, < 2.0)
+    cocoapods-core (1.10.0)
+      activesupport (> 5.0, < 6)
+      addressable (~> 2.6)
+      algoliasearch (~> 1.0)
+      concurrent-ruby (~> 1.1)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
+      netrc (~> 0.11)
+      public_suffix
+      typhoeus (~> 1.0)
     cocoapods-deintegrate (1.0.4)
-    cocoapods-downloader (1.2.2)
+    cocoapods-downloader (1.4.0)
     cocoapods-plugins (1.0.0)
       nap
     cocoapods-search (1.0.0)
-    cocoapods-stats (1.1.0)
-    cocoapods-trunk (1.3.1)
+    cocoapods-trunk (1.5.0)
       nap (>= 0.8, < 2.0)
       netrc (~> 0.11)
-    cocoapods-try (1.1.0)
+    cocoapods-try (1.2.0)
     colored2 (3.1.2)
-    concurrent-ruby (1.1.5)
+    concurrent-ruby (1.1.7)
     escape (0.0.4)
-    fourflusher (2.2.0)
+    ethon (0.12.0)
+      ffi (>= 1.3.0)
+    ffi (1.14.1)
+    fourflusher (2.3.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
-    i18n (0.9.5)
+    httpclient (2.8.3)
+    i18n (1.8.5)
       concurrent-ruby (~> 1.0)
-    minitest (5.11.3)
+    json (2.4.1)
+    minitest (5.14.2)
     molinillo (0.6.6)
-    nanaimo (0.2.6)
+    nanaimo (0.3.0)
     nap (1.1.0)
     netrc (0.11.0)
+    public_suffix (4.0.6)
     ruby-macho (1.4.0)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    typhoeus (1.4.0)
+      ethon (>= 0.9.0)
+    tzinfo (1.2.9)
       thread_safe (~> 0.1)
-    xcodeproj (1.9.0)
+    xcodeproj (1.19.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
-      nanaimo (~> 0.2.6)
+      nanaimo (~> 0.3.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  cocoapods (= 1.6.0)
+  cocoapods (= 1.10.0)
 
 BUNDLED WITH
-   1.16.4
+   2.1.2

ios/Podfile.lock

@@ -53,7 +53,7 @@ DEPENDENCIES:
   - yoga (from `../node_modules/react-native/ReactCommon/yoga`)
 
 SPEC REPOS:
-  https://github.com/cocoapods/specs.git:
+  https://github.com/CocoaPods/Specs.git:
     - boost-for-react-native
     - glog
 
@@ -89,4 +89,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 40e2652abd49702929f97ffd00b43cc4b5478c92
 
-COCOAPODS: 1.7.5
+COCOAPODS: 1.10.0

ios/RCTACPMedia.xcodeproj/project.pbxproj

@@ -3,13 +3,13 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 46;
+	objectVersion = 52;
 	objects = {
 
 /* Begin PBXBuildFile section */
-		21D0CC28235F5BEA002043A2 /* libACPMedia_iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 211D5010235F51160067234A /* libACPMedia_iOS.a */; };
-		21D0CC29235F5BFE002043A2 /* ACPMediaConstants.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 211D5012235F51160067234A /* ACPMediaConstants.h */; };
-		21D0CC2A235F5BFE002043A2 /* ACPMedia.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 211D5013235F51160067234A /* ACPMedia.h */; };
+		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 */; };
 		B3E7B58A1CC2AC0600A0062D /* RCTACPMedia.m in Sources */ = {isa = PBXBuildFile; fileRef = B3E7B5891CC2AC0600A0062D /* RCTACPMedia.m */; };
 /* End PBXBuildFile section */
@@ -21,18 +21,19 @@
 			dstPath = "include/$(PRODUCT_NAME)";
 			dstSubfolderSpec = 16;
 			files = (
-				21D0CC29235F5BFE002043A2 /* ACPMediaConstants.h in CopyFiles */,
-				21D0CC2A235F5BFE002043A2 /* ACPMedia.h in CopyFiles */,
+				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; };
-		211D5010235F51160067234A /* libACPMedia_iOS.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libACPMedia_iOS.a; sourceTree = "<group>"; };
-		211D5012235F51160067234A /* ACPMediaConstants.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ACPMediaConstants.h; sourceTree = "<group>"; };
-		211D5013235F51160067234A /* ACPMedia.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ACPMedia.h; sourceTree = "<group>"; };
+		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>"; };
 		B3E7B5881CC2AC0600A0062D /* RCTACPMedia.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RCTACPMedia.h; path = src/RCTACPMedia.h; sourceTree = "<group>"; };
@@ -44,7 +45,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				21D0CC28235F5BEA002043A2 /* libACPMedia_iOS.a in Frameworks */,
+				21B629FD2590482F0039CE4D /* ACPMedia.xcframework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -62,21 +63,14 @@
 		211D500F235F51160067234A /* libs */ = {
 			isa = PBXGroup;
 			children = (
-				211D5010235F51160067234A /* libACPMedia_iOS.a */,
-				211D5011235F51160067234A /* include */,
+				21B62A01259048390039CE4D /* ACPMedia.h */,
+				21B62A00259048390039CE4D /* ACPMediaConstants.h */,
+				21B629FB2590482F0039CE4D /* ACPMedia.xcframework */,
+				21B629FC2590482F0039CE4D /* ACPMediaTV.xcframework */,
 			);
 			path = libs;
 			sourceTree = "<group>";
 		};
-		211D5011235F51160067234A /* include */ = {
-			isa = PBXGroup;
-			children = (
-				211D5012235F51160067234A /* ACPMediaConstants.h */,
-				211D5013235F51160067234A /* ACPMedia.h */,
-			);
-			path = include;
-			sourceTree = "<group>";
-		};
 		58B511D21A9E6C8500147676 = {
 			isa = PBXGroup;
 			children = (
@@ -96,9 +90,9 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 58B511EF1A9E6C8500147676 /* Build configuration list for PBXNativeTarget "RCTACPMedia" */;
 			buildPhases = (
+				58B511D91A9E6C8500147676 /* CopyFiles */,
 				58B511D71A9E6C8500147676 /* Sources */,
 				58B511D81A9E6C8500147676 /* Frameworks */,
-				58B511D91A9E6C8500147676 /* CopyFiles */,
 			);
 			buildRules = (
 			);

ios/libs/ACPMedia.xcframework/Info.plist

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>AvailableLibraries</key>
+	<array>
+		<dict>
+			<key>HeadersPath</key>
+			<string>Headers</string>
+			<key>LibraryIdentifier</key>
+			<string>ios-arm64_i386_x86_64-simulator</string>
+			<key>LibraryPath</key>
+			<string>libACPMedia_iOS.a</string>
+			<key>SupportedArchitectures</key>
+			<array>
+				<string>arm64</string>
+				<string>i386</string>
+				<string>x86_64</string>
+			</array>
+			<key>SupportedPlatform</key>
+			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
+		</dict>
+		<dict>
+			<key>HeadersPath</key>
+			<string>Headers</string>
+			<key>LibraryIdentifier</key>
+			<string>ios-arm64_armv7_armv7s</string>
+			<key>LibraryPath</key>
+			<string>libACPMedia_iOS.a</string>
+			<key>SupportedArchitectures</key>
+			<array>
+				<string>arm64</string>
+				<string>armv7</string>
+				<string>armv7s</string>
+			</array>
+			<key>SupportedPlatform</key>
+			<string>ios</string>
+		</dict>
+	</array>
+	<key>CFBundlePackageType</key>
+	<string>XFWK</string>
+	<key>XCFrameworkFormatVersion</key>
+	<string>1.0</string>
+</dict>
+</plist>

ios/libs/include/ACPMedia.h …os-arm64_armv7_armv7s/Headers/ACPMedia.hios/libs/include/ACPMedia.h renamed to ios/libs/ACPMedia.xcframework/ios-arm64_armv7_armv7s/Headers/ACPMedia.h ios/libs/include/ACPMedia.h renamed to ios/libs/ACPMedia.xcframework/ios-arm64_armv7_armv7s/Headers/ACPMedia.h

@@ -4,7 +4,7 @@
 //
 //  Copyright 1996-2020. Adobe, Inc. All Rights Reserved
 //
-//  Media Version: 2.2.0
+//  Media Version: 2.3.0
 
 #import <Foundation/Foundation.h>
 

ios/libs/include/ACPMediaConstants.h …armv7_armv7s/Headers/ACPMediaConstants.hios/libs/include/ACPMediaConstants.h renamed to ios/libs/ACPMedia.xcframework/ios-arm64_armv7_armv7s/Headers/ACPMediaConstants.h ios/libs/include/ACPMediaConstants.h renamed to ios/libs/ACPMedia.xcframework/ios-arm64_armv7_armv7s/Headers/ACPMediaConstants.h

@@ -4,7 +4,7 @@
 //
 //  Copyright 1996-2020. Adobe, Inc. All Rights Reserved
 //
-//  Media Version: 2.1.1
+//  Media Version: 2.3.0
 
 #import <Foundation/Foundation.h>