Merge branch 'release/3.0.1'

SRGSSR · Dec 11, 2020 · 8797a4e · 8797a4e
2 parents 46c8b53 + ecfffd8
commit 8797a4e
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 15 deletions.
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -29,7 +29,7 @@ Stack trace or log information
 > The simulator is a valid device as well. If all versions or devices seem to be affected, simply enter 'Any'
 
 * Library version: _version_
-* iOS version: _version_
+* iOS / tvOS version: _version_
 * Device: _model_
 
 ### Reproducibility

diff --git a/Demo/Demo.xcconfig b/Demo/Demo.xcconfig
@@ -1,5 +1,5 @@
 // Version information
-MARKETING_VERSION = 3.0.0
+MARKETING_VERSION = 3.0.1
 
 // Deployment targets
 IPHONEOS_DEPLOYMENT_TARGET = 9.0

diff --git a/Demo/SRGUserData-demo.xcodeproj/project.pbxproj b/Demo/SRGUserData-demo.xcodeproj/project.pbxproj
@@ -262,7 +262,7 @@
 		6F0EB52820FC7F58009C02CF /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1210;
+				LastUpgradeCheck = 1220;
 				ORGANIZATIONNAME = "SRG SSR";
 				TargetAttributes = {
 					6F8A93D720FDCA0800AA6434 = {
@@ -549,7 +549,7 @@
 			repositoryURL = "https://github.com/SRGSSR/srgletterbox-apple.git";
 			requirement = {
 				kind = upToNextMajorVersion;
-				minimumVersion = 6.0.0;
+				minimumVersion = 6.1.0;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */

diff --git a/Demo/SRGUserData-demo.xcodeproj/xcshareddata/xcschemes/SRGUserData-demo.xcscheme b/Demo/SRGUserData-demo.xcodeproj/xcshareddata/xcschemes/SRGUserData-demo.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1210"
+   LastUpgradeVersion = "1220"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Demo/SRGUserData-demo.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Demo/SRGUserData-demo.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -60,8 +60,8 @@
         "repositoryURL": "https://github.com/SRGSSR/srganalytics-apple.git",
         "state": {
           "branch": null,
-          "revision": "3d9304541fb3b1b0f5767360a887258b26053ca5",
-          "version": "5.0.0"
+          "revision": "0778abbb37b5d5410fdebce8317e937db53cdbc6",
+          "version": "6.0.0"
         }
       },
       {
@@ -78,8 +78,8 @@
         "repositoryURL": "https://github.com/SRGSSR/srgcontentprotection-apple.git",
         "state": {
           "branch": null,
-          "revision": "e85f920a9e3f34af2e605d55b0509223eb4bf5e8",
-          "version": "3.0.0"
+          "revision": "596f4161b4460fc648d30d5d3ca2c16f249863ef",
+          "version": "3.0.1"
         }
       },
       {
@@ -114,8 +114,8 @@
         "repositoryURL": "https://github.com/SRGSSR/srgletterbox-apple.git",
         "state": {
           "branch": null,
-          "revision": "ee3223f55e9a72fabdaea56b9e28c3c9e760f281",
-          "version": "6.0.0"
+          "revision": "fbd233c69993c6b2d31da8302ec2a70db0b6baf6",
+          "version": "6.1.0"
         }
       },
       {
@@ -132,8 +132,8 @@
         "repositoryURL": "https://github.com/SRGSSR/srgmediaplayer-apple.git",
         "state": {
           "branch": null,
-          "revision": "7a89c2d7ade084c31e9b0271ad7d0b9fcd85b743",
-          "version": "6.0.0"
+          "revision": "a0f192296817d471fbe48dc8623ab851a9266369",
+          "version": "6.1.0"
         }
       },
       {

diff --git a/Package.swift b/Package.swift
@@ -3,7 +3,7 @@
 import PackageDescription
 
 struct ProjectSettings {
-    static let marketingVersion: String = "3.0.0"
+    static let marketingVersion: String = "3.0.1"
 }
 
 let package = Package(
@@ -31,7 +31,8 @@ let package = Package(
                 .process("Resources"),
             ],
             cSettings: [
-                .define("MARKETING_VERSION", to: "\"\(ProjectSettings.marketingVersion)\"")
+                .define("MARKETING_VERSION", to: "\"\(ProjectSettings.marketingVersion)\""),
+                .define("NS_BLOCK_ASSERTIONS", to: "1", .when(configuration: .release))
             ]
         )
     ]