Merge branch 'release/2.0.0'

.gitignore

@@ -10,6 +10,7 @@ xcuserdata
 /Cartfile.private
 /Cartfile.resolved
 
+/fastlane/*.xcresult
 /fastlane/*.xml
 
 /vendor

Cartfile

@@ -1 +1 @@
-github "SRGSSR/srgidentity-ios" "1.0.5"
+github "SRGSSR/srgidentity-apple" "2.0.0"

Cartfile.private.common

@@ -1,3 +1,6 @@
 github "AliSoftware/OHHTTPStubs" ~> 8.0.0
-github "onmyway133/DeepDiff" "2.2.0" 
-github "SRGSSR/srgletterbox-ios" "1.14.5"
+github "SRGSSR/srgletterbox-apple" "2.0.0"
+
+# Fix to have a common framework name for all platforms; should be submitted as pull request
+github "SRGSSR/DeepDiff" "2.3.1_srg1"
+# github "onmyway133/DeepDiff" "2.3.1" 

Cartfile.private.proprietary

@@ -1 +1 @@
-github "SRGSSR/srgcontentprotection-ios" "1.2.3"
+github "SRGSSR/srgcontentprotection-apple" "2.0.0"

Cartfile.private.public

@@ -1 +1 @@
-github "SRGSSR/srgcontentprotection-fake-ios" "1.2.3"
+github "SRGSSR/srgcontentprotection-fake-apple" "2.0.0"

Cartfile.resolved.proprietary

@@ -1,21 +1,20 @@
 github "AliSoftware/OHHTTPStubs" "8.0.0"
 github "Mantle/Mantle" "2.1.0"
-github "SRGSSR/ComScore-iOS-watchOS-tvOS" "5.8.4"
-github "SRGSSR/FXReachability" "1.3.2_srg3"
-github "SRGSSR/MAKVONotificationCenter" "1.0_srg3"
-github "SRGSSR/Masonry" "v1.1.0_srg1"
+github "SRGSSR/ComScore-iOS-watchOS-tvOS" "6.0.0"
+github "SRGSSR/DeepDiff" "2.3.1_srg1"
+github "SRGSSR/FXReachability" "1.3.2_srg4"
+github "SRGSSR/MAKVONotificationCenter" "1.0_srg4"
 github "SRGSSR/UICKeyChainStore" "v2.1.2_srg1"
-github "SRGSSR/YYWebImage" "1.0.5_srg1"
-github "SRGSSR/libextobjc" "0.6_srg1"
-github "SRGSSR/srganalytics-ios" "3.7.5"
-github "SRGSSR/srgappearance-ios" "1.1.10"
-github "SRGSSR/srgcontentprotection-ios" "1.2.3"
-github "SRGSSR/srgdataprovider-ios" "6.8"
-github "SRGSSR/srgdiagnostics-ios" "1.0.1"
-github "SRGSSR/srgidentity-ios" "1.0.5"
-github "SRGSSR/srgletterbox-ios" "1.14.5"
-github "SRGSSR/srglogger-ios" "1.1"
-github "SRGSSR/srgmediaplayer-ios" "2.8"
-github "SRGSSR/srgnetwork-ios" "1.0.3"
-github "SRGSSR/tagcommander-ios" "4.3.3_4.3.1"
-github "onmyway133/DeepDiff" "2.2.0"
+github "SRGSSR/YYWebImage" "1.0.5_srg2"
+github "SRGSSR/libextobjc" "0.6_srg2"
+github "SRGSSR/srganalytics-apple" "4.0.0"
+github "SRGSSR/srgappearance-apple" "2.0.0"
+github "SRGSSR/srgcontentprotection-apple" "2.0.0"
+github "SRGSSR/srgdataprovider-apple" "7.0.0"
+github "SRGSSR/srgdiagnostics-apple" "2.0.0"
+github "SRGSSR/srgidentity-apple" "2.0.0"
+github "SRGSSR/srgletterbox-apple" "2.0.0"
+github "SRGSSR/srglogger-apple" "2.0.0"
+github "SRGSSR/srgmediaplayer-apple" "3.0.0"
+github "SRGSSR/srgnetwork-apple" "2.0.0"
+github "SRGSSR/tagcommander-apple" "4.5.4_4.4.1_srg1"

Cartfile.resolved.public

@@ -1,21 +1,20 @@
 github "AliSoftware/OHHTTPStubs" "8.0.0"
 github "Mantle/Mantle" "2.1.0"
-github "SRGSSR/ComScore-iOS-watchOS-tvOS" "5.8.4"
-github "SRGSSR/FXReachability" "1.3.2_srg3"
-github "SRGSSR/MAKVONotificationCenter" "1.0_srg3"
-github "SRGSSR/Masonry" "v1.1.0_srg1"
+github "SRGSSR/ComScore-iOS-watchOS-tvOS" "6.0.0"
+github "SRGSSR/DeepDiff" "2.3.1_srg1"
+github "SRGSSR/FXReachability" "1.3.2_srg4"
+github "SRGSSR/MAKVONotificationCenter" "1.0_srg4"
 github "SRGSSR/UICKeyChainStore" "v2.1.2_srg1"
-github "SRGSSR/YYWebImage" "1.0.5_srg1"
-github "SRGSSR/libextobjc" "0.6_srg1"
-github "SRGSSR/srganalytics-ios" "3.7.5"
-github "SRGSSR/srgappearance-ios" "1.1.10"
-github "SRGSSR/srgcontentprotection-fake-ios" "1.2.3"
-github "SRGSSR/srgdataprovider-ios" "6.8"
-github "SRGSSR/srgdiagnostics-ios" "1.0.1"
-github "SRGSSR/srgidentity-ios" "1.0.5"
-github "SRGSSR/srgletterbox-ios" "1.14.5"
-github "SRGSSR/srglogger-ios" "1.1"
-github "SRGSSR/srgmediaplayer-ios" "2.8"
-github "SRGSSR/srgnetwork-ios" "1.0.3"
-github "SRGSSR/tagcommander-ios" "4.3.3_4.3.1"
-github "onmyway133/DeepDiff" "2.2.0"
+github "SRGSSR/YYWebImage" "1.0.5_srg2"
+github "SRGSSR/libextobjc" "0.6_srg2"
+github "SRGSSR/srganalytics-apple" "4.0.0"
+github "SRGSSR/srgappearance-apple" "2.0.0"
+github "SRGSSR/srgcontentprotection-fake-apple" "2.0.0"
+github "SRGSSR/srgdataprovider-apple" "7.0.0"
+github "SRGSSR/srgdiagnostics-apple" "2.0.0"
+github "SRGSSR/srgidentity-apple" "2.0.0"
+github "SRGSSR/srgletterbox-apple" "2.0.0"
+github "SRGSSR/srglogger-apple" "2.0.0"
+github "SRGSSR/srgmediaplayer-apple" "3.0.0"
+github "SRGSSR/srgnetwork-apple" "2.0.0"
+github "SRGSSR/tagcommander-apple" "4.5.4_4.4.1_srg1"

Common.xcconfig

@@ -0,0 +1,25 @@
+// Version information
+MARKETING_VERSION = 2.0.0
+
+// Deployment targets
+IPHONEOS_DEPLOYMENT_TARGET = 9.0
+TVOS_DEPLOYMENT_TARGET = 12.0
+
+// Configuration to have a single target built for all platforms
+// See https://davedelong.com/blog/2018/11/15/building-a-crossplatform-framework/
+SUPPORTED_PLATFORMS = iphoneos iphonesimulator appletvos appletvsimulator
+TARGETED_DEVICE_FAMILY = 1,2,3
+
+CARTHAGE_PLATFORM[sdk=iphone*] = iOS
+CARTHAGE_PLATFORM[sdk=appletv*] = tvOS
+
+// Setup to enable plaform suffixes to enable sources or resources for a specific platform only
+// See https://davedelong.com/blog/2018/07/25/conditional-compilation-in-swift-part-2/
+IOS_FILES = *~ios.*
+TVOS_FILES = *~tvos.*
+
+EXCLUDED_SOURCE_FILE_NAMES = $(IOS_FILES) $(TVOS_FILES)
+
+INCLUDED_SOURCE_FILE_NAMES =
+INCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = $(IOS_FILES)
+INCLUDED_SOURCE_FILE_NAMES[sdk=appletv*] = $(TVOS_FILES)

Demo/Demo.xcconfig

@@ -0,0 +1,7 @@
+#include "../Common.xcconfig"
+
+LAUNCH_SCREEN[sdk=iphone*] = LaunchScreen~ios
+LAUNCH_SCREEN[sdk=appletv*] =
+
+APP_ICONS_SOURCE[sdk=iphone*] = AppIcon
+APP_ICONS_SOURCE[sdk=appletv*] = App Icon & Top Shelf Image

Demo/Info.plist

@@ -4,6 +4,8 @@
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleDisplayName</key>
+	<string>User Data</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
@@ -12,8 +14,6 @@
 	<string>6.0</string>
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundleDisplayName</key>
-	<string>User Data</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
@@ -39,7 +39,7 @@
 		<true/>
 	</dict>
 	<key>UILaunchStoryboardName</key>
-	<string>LaunchScreen</string>
+	<string>$(LAUNCH_SCREEN)</string>
 	<key>UIRequiredDeviceCapabilities</key>
 	<array>
 		<string>armv7</string>
@@ -57,5 +57,7 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
+	<key>UIUserInterfaceStyle</key>
+	<string>Automatic</string>
 </dict>
 </plist>

Demo/Resources/Images.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - App Store.imagestack/Back.imagestacklayer/Content.imageset/Contents.json

@@ -0,0 +1,11 @@
+{
+  "images" : [
+    {
+      "idiom" : "tv"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Demo/Resources/Images.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - App Store.imagestack/Back.imagestacklayer/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Demo/Resources/Images.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - App Store.imagestack/Contents.json

@@ -0,0 +1,17 @@
+{
+  "layers" : [
+    {
+      "filename" : "Front.imagestacklayer"
+    },
+    {
+      "filename" : "Middle.imagestacklayer"
+    },
+    {
+      "filename" : "Back.imagestacklayer"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Demo/Resources/Images.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - App Store.imagestack/Front.imagestacklayer/Content.imageset/Contents.json

@@ -0,0 +1,11 @@
+{
+  "images" : [
+    {
+      "idiom" : "tv"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Demo/Resources/Images.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - App Store.imagestack/Front.imagestacklayer/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Demo/Resources/Images.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - App Store.imagestack/Middle.imagestacklayer/Content.imageset/Contents.json

@@ -0,0 +1,11 @@
+{
+  "images" : [
+    {
+      "idiom" : "tv"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Demo/Resources/Images.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - App Store.imagestack/Middle.imagestacklayer/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Demo/Resources/Images.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Back.imagestacklayer/Content.imageset/Contents.json

@@ -0,0 +1,18 @@
+{
+  "images" : [
+    {
+      "idiom" : "tv",
+      "filename" : "[email protected]",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "tv",
+      "filename" : "[email protected]",
+      "scale" : "2x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Demo/Resources/Images.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Back.imagestacklayer/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Demo/Resources/Images.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Contents.json

@@ -0,0 +1,17 @@
+{
+  "layers" : [
+    {
+      "filename" : "Front.imagestacklayer"
+    },
+    {
+      "filename" : "Middle.imagestacklayer"
+    },
+    {
+      "filename" : "Back.imagestacklayer"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Demo/Resources/Images.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Front.imagestacklayer/Content.imageset/Contents.json

@@ -0,0 +1,18 @@
+{
+  "images" : [
+    {
+      "idiom" : "tv",
+      "filename" : "[email protected]",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "tv",
+      "filename" : "[email protected]",
+      "scale" : "2x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Demo/Resources/Images.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Front.imagestacklayer/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Demo/Resources/Images.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Middle.imagestacklayer/Content.imageset/Contents.json

@@ -0,0 +1,18 @@
+{
+  "images" : [
+    {
+      "idiom" : "tv",
+      "filename" : "[email protected]",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "tv",
+      "filename" : "[email protected]",
+      "scale" : "2x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Demo/Resources/Images.xcassets/App Icon & Top Shelf Image.brandassets/App Icon.imagestack/Middle.imagestacklayer/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Demo/Resources/Images.xcassets/App Icon & Top Shelf Image.brandassets/Contents.json

@@ -0,0 +1,32 @@
+{
+  "assets" : [
+    {
+      "size" : "1280x768",
+      "idiom" : "tv",
+      "filename" : "App Icon - App Store.imagestack",
+      "role" : "primary-app-icon"
+    },
+    {
+      "size" : "400x240",
+      "idiom" : "tv",
+      "filename" : "App Icon.imagestack",
+      "role" : "primary-app-icon"
+    },
+    {
+      "size" : "2320x720",
+      "idiom" : "tv",
+      "filename" : "Top Shelf Image Wide.imageset",
+      "role" : "top-shelf-image-wide"
+    },
+    {
+      "size" : "1920x720",
+      "idiom" : "tv",
+      "filename" : "Top Shelf Image.imageset",
+      "role" : "top-shelf-image"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}