Releases/v3.3.3 (#206)

* fix: use AVPlayerLayer bounds and AVPlayerViewController view bounds to set player width and height dimensions (#205) * test: add XCUITest integration tests for Swift Package Manager example application * ci: xcode-select guardrails
muxinc · Oct 9, 2023 · 1049abf · 1049abf
1 parent cc97961
commit 1049abf
Show file tree

Hide file tree

Showing 16 changed files with 620 additions and 40 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -34,8 +34,10 @@ jobs:
         uses: actions/download-artifact@v3
         with:
           name: "MUXSDKStats.xcframework.zip"
-      - name: Run tests
+      - name: Run cocoapods example application tests
         run: "scripts/run-tests-cocoapods-ventura.sh"
+      - name: Run Swift package manager example application tests
+        run: "scripts/run-tests-swift-package-manager-ventura.sh"
   build-static:
     name: Build static SDK binary
     runs-on: macos-13

diff --git a/MUXSDKStats.json b/MUXSDKStats.json
@@ -11,5 +11,6 @@
     "3.2.1": "https://github.com/muxinc/mux-stats-sdk-avplayer/releases/download/v3.2.1/MUXSDKStats.xcframework.zip",
     "3.3.0": "https://github.com/muxinc/mux-stats-sdk-avplayer/releases/download/v3.3.0/MUXSDKStats.xcframework.zip",
     "3.3.1": "https://github.com/muxinc/mux-stats-sdk-avplayer/releases/download/v3.3.1/MUXSDKStats.xcframework.zip",
-    "3.3.2": "https://github.com/muxinc/mux-stats-sdk-avplayer/releases/download/v3.3.2/MUXSDKStats.xcframework.zip"
+    "3.3.2": "https://github.com/muxinc/mux-stats-sdk-avplayer/releases/download/v3.3.2/MUXSDKStats.xcframework.zip",
+    "3.3.3": "https://github.com/muxinc/mux-stats-sdk-avplayer/releases/download/v3.3.3/MUXSDKStats.xcframework.zip"
 }
diff --git a/MUXSDKStats/MUXSDKStats.xcodeproj/project.pbxproj b/MUXSDKStats/MUXSDKStats.xcodeproj/project.pbxproj
@@ -511,7 +511,6 @@
 				GCC_C_LANGUAGE_STANDARD = gnu17;
 				GENERATE_INFOPLIST_FILE = YES;
 				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
-				MARKETING_VERSION = 1.0;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.mux.stats.tvos.MUXSDKStatsTvTests;
@@ -539,7 +538,6 @@
 				GCC_C_LANGUAGE_STANDARD = gnu17;
 				GENERATE_INFOPLIST_FILE = YES;
 				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
-				MARKETING_VERSION = 1.0;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.mux.stats.tvos.MUXSDKStatsTvTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -571,7 +569,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.3.2;
+				MARKETING_VERSION = 3.3.3;
 				MODULEMAP_FILE = "$(SRCROOT)/MUXSDKStatsTv/module.modulemap";
 				ONLY_ACTIVE_ARCH = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = com.mux.stats.tvos.MUXSDKStatsTv;
@@ -600,7 +598,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.3.2;
+				MARKETING_VERSION = 3.3.3;
 				MODULEMAP_FILE = "$(SRCROOT)/MUXSDKStatsTv/module.modulemap";
 				PRODUCT_BUNDLE_IDENTIFIER = com.mux.stats.tvos.MUXSDKStatsTv;
 				PRODUCT_NAME = MUXSDKStats;
@@ -782,7 +780,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.3.2;
+				MARKETING_VERSION = 3.3.3;
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.mux.stats.ios.MUXSDKStats;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -810,7 +808,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.3.2;
+				MARKETING_VERSION = 3.3.3;
 				ONLY_ACTIVE_ARCH = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = com.mux.stats.ios.MUXSDKStats;
 				PRODUCT_NAME = "$(TARGET_NAME)";

diff --git a/MUXSDKStats/MUXSDKStats/MUXSDKPlayerBinding.m b/MUXSDKStats/MUXSDKStats/MUXSDKPlayerBinding.m
@@ -12,7 +12,7 @@
 
 // SDK constants.
 NSString *const MUXSDKPluginName = @"apple-mux";
-NSString *const MUXSDKPluginVersion = @"3.3.2";
+NSString *const MUXSDKPluginVersion = @"3.3.3";
 NSString *const MUXSessionDataPrefix = @"io.litix.data.";
 
 // Min number of seconds between timeupdate events. (100ms)
@@ -597,11 +597,10 @@ - (MUXSDKPlayerData *)getPlayerData {
         [playerData setPlayerLanguageCode:language];
     }
 
-    CGRect bounds = [self getVideoBounds];
-    [playerData setPlayerWidth:[NSNumber numberWithInt:bounds.size.width]];
-    [playerData setPlayerHeight:[NSNumber numberWithInt:bounds.size.height]];
-
     CGRect viewBounds = [self getViewBounds];
+    [playerData setPlayerWidth:[NSNumber numberWithInt:viewBounds.size.width]];
+    [playerData setPlayerHeight:[NSNumber numberWithInt:viewBounds.size.height]];
+
     CGRect screenBounds = [[UIScreen mainScreen] bounds];
     // TODO: setPlayerIsFullscreen - should be a boolean.
     if ((viewBounds.size.width == screenBounds.size.width && viewBounds.size.height == screenBounds.size.height) ||

diff --git a/Mux-Stats-AVPlayer.podspec b/Mux-Stats-AVPlayer.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
   s.name             = 'Mux-Stats-AVPlayer'
 
-  s.version          = '3.3.2'
+  s.version          = '3.3.3'
   s.source           = { :git => 'https://github.com/muxinc/mux-stats-sdk-avplayer.git',
                          :tag => "v#{s.version}" }
 

diff --git a/apps/MUXSDKStatsExampleSPM/MUXSDKStatsExampleSPM.xcodeproj/project.pbxproj b/apps/MUXSDKStatsExampleSPM/MUXSDKStatsExampleSPM.xcodeproj/project.pbxproj
@@ -7,6 +7,8 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		19C386A82AD12344009AB018 /* MultiplePlayerItemPlaybackExampleViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19C386A72AD12343009AB018 /* MultiplePlayerItemPlaybackExampleViewController.swift */; };
+		19C386AA2AD3194F009AB018 /* PlayerLayerScalingExampleViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19C386A92AD3194F009AB018 /* PlayerLayerScalingExampleViewController.swift */; };
 		19CB35D02ABD2B5C002DF48C /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19CB35CF2ABD2B5C002DF48C /* AppDelegate.swift */; };
 		19CB35D22ABD2B5C002DF48C /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19CB35D12ABD2B5C002DF48C /* SceneDelegate.swift */; };
 		19CB35D42ABD2B5C002DF48C /* BasicPlaybackExampleViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19CB35D32ABD2B5C002DF48C /* BasicPlaybackExampleViewController.swift */; };
@@ -40,6 +42,8 @@
 
 /* Begin PBXFileReference section */
 		194C6D432ABD518A003F965E /* mux-stats-sdk-avplayer */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = "mux-stats-sdk-avplayer"; path = ../..; sourceTree = "<group>"; };
+		19C386A72AD12343009AB018 /* MultiplePlayerItemPlaybackExampleViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MultiplePlayerItemPlaybackExampleViewController.swift; sourceTree = "<group>"; };
+		19C386A92AD3194F009AB018 /* PlayerLayerScalingExampleViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlayerLayerScalingExampleViewController.swift; sourceTree = "<group>"; };
 		19CB35CC2ABD2B5C002DF48C /* MUXSDKStatsExampleSPM.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MUXSDKStatsExampleSPM.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		19CB35CF2ABD2B5C002DF48C /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		19CB35D12ABD2B5C002DF48C /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
@@ -119,6 +123,8 @@
 				19CB35D12ABD2B5C002DF48C /* SceneDelegate.swift */,
 				19CB35D32ABD2B5C002DF48C /* BasicPlaybackExampleViewController.swift */,
 				19CB36022ABD2D39002DF48C /* PlayerLayerExampleViewController.swift */,
+				19C386A72AD12343009AB018 /* MultiplePlayerItemPlaybackExampleViewController.swift */,
+				19C386A92AD3194F009AB018 /* PlayerLayerScalingExampleViewController.swift */,
 				19CB36042ABD2D63002DF48C /* ProcessInfo+Mux.swift */,
 				19CB35D52ABD2B5C002DF48C /* Main.storyboard */,
 				19CB35D82ABD2B5D002DF48C /* Assets.xcassets */,
@@ -282,6 +288,8 @@
 			buildActionMask = 2147483647;
 			files = (
 				19CB36052ABD2D63002DF48C /* ProcessInfo+Mux.swift in Sources */,
+				19C386AA2AD3194F009AB018 /* PlayerLayerScalingExampleViewController.swift in Sources */,
+				19C386A82AD12344009AB018 /* MultiplePlayerItemPlaybackExampleViewController.swift in Sources */,
 				19CB35D42ABD2B5C002DF48C /* BasicPlaybackExampleViewController.swift in Sources */,
 				19CB35D02ABD2B5C002DF48C /* AppDelegate.swift in Sources */,
 				19CB36032ABD2D39002DF48C /* PlayerLayerExampleViewController.swift in Sources */,
@@ -395,7 +403,7 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
-				MARKETING_VERSION = 3.3.2;
+				MARKETING_VERSION = 3.3.3;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -453,7 +461,7 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
-				MARKETING_VERSION = 3.3.2;
+				MARKETING_VERSION = 3.3.3;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				SDKROOT = iphoneos;
@@ -482,7 +490,6 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.3.2;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.mux.stats.example-project.MUXSDKStatsExampleSPM";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -511,7 +518,6 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.3.2;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.mux.stats.example-project.MUXSDKStatsExampleSPM";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -530,7 +536,6 @@
 				DEVELOPMENT_TEAM = XX95P4Y787;
 				GENERATE_INFOPLIST_FILE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
-				MARKETING_VERSION = 3.3.2;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.mux.stats.example-project.MUXSDKStatsExampleSPMTests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = NO;
@@ -550,7 +555,6 @@
 				DEVELOPMENT_TEAM = XX95P4Y787;
 				GENERATE_INFOPLIST_FILE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
-				MARKETING_VERSION = 3.3.2;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.mux.stats.example-project.MUXSDKStatsExampleSPMTests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = NO;

diff --git a/...SPM/MUXSDKStatsExampleSPM.xcodeproj/xcshareddata/xcschemes/MUXSDKStatsExampleSPM.xcscheme b/...SPM/MUXSDKStatsExampleSPM.xcodeproj/xcshareddata/xcschemes/MUXSDKStatsExampleSPM.xcscheme
@@ -30,8 +30,7 @@
       shouldAutocreateTestPlan = "YES">
       <Testables>
          <TestableReference
-            skipped = "NO"
-            parallelizable = "YES">
+            skipped = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "19CB35E12ABD2B5D002DF48C"