Merge pull request #6 from flowplayer/feat/core-152-alpha

chore: upgrade fp dep to 1.5.2-alpha0
flowplayer · May 18, 2021 · 5cbb44b · 5cbb44b
2 parents 7b6a5db + 055838d
commit 5cbb44b
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 38 deletions.
diff --git a/Podfile b/Podfile
@@ -9,7 +9,7 @@ project 'flowplayer-demo.xcodeproj'
 project 'flowplayer-objc-demo/flowplayer-objc-demo.xcodeproj'
 
 def common_pods
-  pod 'FlowplayerCore', '~> 1.5.0'
+  pod 'FlowplayerCore', '= 1.5.2'
   pod 'Rollbar', '~> 1.8.1'
   pod 'GoogleAds-IMA-iOS-SDK', '~> 3.9'
 end

diff --git a/Podfile.lock b/Podfile.lock
@@ -1,10 +1,10 @@
 PODS:
-  - FlowplayerCore (1.5.0)
-  - GoogleAds-IMA-iOS-SDK (3.12.1)
+  - FlowplayerCore (1.5.2)
+  - GoogleAds-IMA-iOS-SDK (3.14.3)
   - Rollbar (1.8.4)
 
 DEPENDENCIES:
-  - FlowplayerCore (~> 1.5.0)
+  - FlowplayerCore (= 1.5.2)
   - GoogleAds-IMA-iOS-SDK (~> 3.9)
   - Rollbar (~> 1.8.1)
 
@@ -15,10 +15,10 @@ SPEC REPOS:
     - Rollbar
 
 SPEC CHECKSUMS:
-  FlowplayerCore: 515fa818da19928322c1f82808e5d1a3b3e05b46
-  GoogleAds-IMA-iOS-SDK: 3c01b8db7d01de6b4a3b1d58744d4bc426a2d821
+  FlowplayerCore: dcbd59a9993e83da70be5a32e8a09b357b928b45
+  GoogleAds-IMA-iOS-SDK: 2a9b7b14bda4993306f05287f952dce41b5be4ad
   Rollbar: 1b7918ecf1e92b143b71da329fbd8ff981ed30e5
 
-PODFILE CHECKSUM: 6c769d2d4a7a84c91696ddef204a600955fcf53f
+PODFILE CHECKSUM: 943a9bbc6d938742141bd2085d6271b5812ad14e
 
 COCOAPODS: 1.10.1
diff --git a/flowplayer-demo.xcodeproj/project.pbxproj b/flowplayer-demo.xcodeproj/project.pbxproj
@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		34629762B6C7D709A73DAB16 /* Pods_flowplayer_demo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 857652F0D1F4F009945C72FF /* Pods_flowplayer_demo.framework */; };
 		4F2FD2A6231BE7D100E525AB /* MainViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F2FD2A5231BE7D100E525AB /* MainViewController.swift */; };
 		4F2FD2A8231BE81A00E525AB /* TableItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F2FD2A7231BE81A00E525AB /* TableItem.swift */; };
 		4F2FD2AA231BE85000E525AB /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F2FD2A9231BE85000E525AB /* Constants.swift */; };
@@ -15,11 +16,10 @@
 		4F5869A5231BAE01000885CA /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 4F5869A3231BAE01000885CA /* Main.storyboard */; };
 		4F5869A7231BAE03000885CA /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 4F5869A6231BAE03000885CA /* Assets.xcassets */; };
 		4F5869AA231BAE03000885CA /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 4F5869A8231BAE03000885CA /* LaunchScreen.storyboard */; };
-		EDEDC2D899AE623949F15C05 /* Pods_flowplayer_demo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34CD45C8BE9C23155F541A31 /* Pods_flowplayer_demo.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
-		34CD45C8BE9C23155F541A31 /* Pods_flowplayer_demo.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_flowplayer_demo.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		45FF0F38F282908AF8CEEC95 /* Pods-flowplayer-demo.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-flowplayer-demo.release.xcconfig"; path = "Target Support Files/Pods-flowplayer-demo/Pods-flowplayer-demo.release.xcconfig"; sourceTree = "<group>"; };
 		4F2FD2A5231BE7D100E525AB /* MainViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainViewController.swift; sourceTree = "<group>"; };
 		4F2FD2A7231BE81A00E525AB /* TableItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TableItem.swift; sourceTree = "<group>"; };
 		4F2FD2A9231BE85000E525AB /* Constants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Constants.swift; sourceTree = "<group>"; };
@@ -30,16 +30,16 @@
 		4F5869A6231BAE03000885CA /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		4F5869A9231BAE03000885CA /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		4F5869AB231BAE03000885CA /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		7F665C4D7F08435C35F2580C /* Pods-flowplayer-demo.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-flowplayer-demo.debug.xcconfig"; path = "Target Support Files/Pods-flowplayer-demo/Pods-flowplayer-demo.debug.xcconfig"; sourceTree = "<group>"; };
-		C9BBDE1F9674D2983632BA94 /* Pods-flowplayer-demo.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-flowplayer-demo.release.xcconfig"; path = "Target Support Files/Pods-flowplayer-demo/Pods-flowplayer-demo.release.xcconfig"; sourceTree = "<group>"; };
+		857652F0D1F4F009945C72FF /* Pods_flowplayer_demo.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_flowplayer_demo.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		9F8724A387DA17C6857CEE62 /* Pods-flowplayer-demo.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-flowplayer-demo.debug.xcconfig"; path = "Target Support Files/Pods-flowplayer-demo/Pods-flowplayer-demo.debug.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
 		4F586999231BAE01000885CA /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				EDEDC2D899AE623949F15C05 /* Pods_flowplayer_demo.framework in Frameworks */,
+				34629762B6C7D709A73DAB16 /* Pods_flowplayer_demo.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -52,7 +52,7 @@
 				4F58699E231BAE01000885CA /* flowplayer-demo */,
 				4F58699D231BAE01000885CA /* Products */,
 				5BB8E0CBD0E24EF9027D09AD /* Pods */,
-				AC0D10ACD794BF497F9F56C0 /* Frameworks */,
+				626F7A7E2F64BB647CB87797 /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
@@ -83,16 +83,16 @@
 		5BB8E0CBD0E24EF9027D09AD /* Pods */ = {
 			isa = PBXGroup;
 			children = (
-				7F665C4D7F08435C35F2580C /* Pods-flowplayer-demo.debug.xcconfig */,
-				C9BBDE1F9674D2983632BA94 /* Pods-flowplayer-demo.release.xcconfig */,
+				9F8724A387DA17C6857CEE62 /* Pods-flowplayer-demo.debug.xcconfig */,
+				45FF0F38F282908AF8CEEC95 /* Pods-flowplayer-demo.release.xcconfig */,
 			);
 			path = Pods;
 			sourceTree = "<group>";
 		};
-		AC0D10ACD794BF497F9F56C0 /* Frameworks */ = {
+		626F7A7E2F64BB647CB87797 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				34CD45C8BE9C23155F541A31 /* Pods_flowplayer_demo.framework */,
+				857652F0D1F4F009945C72FF /* Pods_flowplayer_demo.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -104,11 +104,11 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 4F5869AE231BAE03000885CA /* Build configuration list for PBXNativeTarget "flowplayer-demo" */;
 			buildPhases = (
-				83325DDCBAA0E609A30304CD /* [CP] Check Pods Manifest.lock */,
+				720783D11F6F73E5811A8241 /* [CP] Check Pods Manifest.lock */,
 				4F586998231BAE01000885CA /* Sources */,
 				4F586999231BAE01000885CA /* Frameworks */,
 				4F58699A231BAE01000885CA /* Resources */,
-				05172A6F9AB0C1B8987584D7 /* [CP] Embed Pods Frameworks */,
+				D0C8F5027320766F6AA2D86A /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -166,43 +166,43 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		05172A6F9AB0C1B8987584D7 /* [CP] Embed Pods Frameworks */ = {
+		720783D11F6F73E5811A8241 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-flowplayer-demo/Pods-flowplayer-demo-frameworks-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			name = "[CP] Embed Pods Frameworks";
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
 			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-flowplayer-demo/Pods-flowplayer-demo-frameworks-${CONFIGURATION}-output-files.xcfilelist",
+			);
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-flowplayer-demo-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-flowplayer-demo/Pods-flowplayer-demo-frameworks.sh\"\n";
+			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;
 		};
-		83325DDCBAA0E609A30304CD /* [CP] Check Pods Manifest.lock */ = {
+		D0C8F5027320766F6AA2D86A /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-flowplayer-demo/Pods-flowplayer-demo-frameworks-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			inputPaths = (
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
-			);
-			name = "[CP] Check Pods Manifest.lock";
+			name = "[CP] Embed Pods Frameworks";
 			outputFileListPaths = (
-			);
-			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-flowplayer-demo-checkManifestLockResult.txt",
+				"${PODS_ROOT}/Target Support Files/Pods-flowplayer-demo/Pods-flowplayer-demo-frameworks-${CONFIGURATION}-output-files.xcfilelist",
 			);
 			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";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-flowplayer-demo/Pods-flowplayer-demo-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */
@@ -360,11 +360,11 @@
 		};
 		4F5869AF231BAE03000885CA /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 7F665C4D7F08435C35F2580C /* Pods-flowplayer-demo.debug.xcconfig */;
+			baseConfigurationReference = 9F8724A387DA17C6857CEE62 /* Pods-flowplayer-demo.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = 3ZN56BC5WP;
+				DEVELOPMENT_TEAM = 95CBXA4LAJ;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)",
@@ -384,11 +384,11 @@
 		};
 		4F5869B0231BAE03000885CA /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = C9BBDE1F9674D2983632BA94 /* Pods-flowplayer-demo.release.xcconfig */;
+			baseConfigurationReference = 45FF0F38F282908AF8CEEC95 /* Pods-flowplayer-demo.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = 3ZN56BC5WP;
+				DEVELOPMENT_TEAM = 95CBXA4LAJ;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)",