From 00cfdd6f897e978b5cb6cfb429b576d9c934cc86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20De=CC=81fago?= Date: Fri, 23 Oct 2020 20:06:41 +0200 Subject: [PATCH 1/5] Bump version number --- Demo/Demo.xcconfig | 2 +- Package.swift | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Demo/Demo.xcconfig b/Demo/Demo.xcconfig index be27dba..5b2c3bb 100644 --- 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/Package.swift b/Package.swift index 3ccd749..66a5d44 100644 --- 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( From 646ce08ba3b0ca1500ce7d5fad086024bd0ed6ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20De=CC=81fago?= Date: Mon, 23 Nov 2020 14:13:59 +0100 Subject: [PATCH 2/5] Update issue template for tvOS --- .github/ISSUE_TEMPLATE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 8d57f21..73da697 100644 --- 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 From 44e236537b17b4ccd8f4c61528500c4505e0b3c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20De=CC=81fago?= Date: Tue, 24 Nov 2020 18:47:09 +0100 Subject: [PATCH 3/5] Update with Xcode 12.2 --- Demo/SRGUserData-demo.xcodeproj/project.pbxproj | 2 +- .../xcshareddata/xcschemes/SRGUserData-demo.xcscheme | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Demo/SRGUserData-demo.xcodeproj/project.pbxproj b/Demo/SRGUserData-demo.xcodeproj/project.pbxproj index 1fdca3f..668be6c 100644 --- 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 = { diff --git a/Demo/SRGUserData-demo.xcodeproj/xcshareddata/xcschemes/SRGUserData-demo.xcscheme b/Demo/SRGUserData-demo.xcodeproj/xcshareddata/xcschemes/SRGUserData-demo.xcscheme index e8a569a..037a6dc 100644 --- a/Demo/SRGUserData-demo.xcodeproj/xcshareddata/xcschemes/SRGUserData-demo.xcscheme +++ b/Demo/SRGUserData-demo.xcodeproj/xcshareddata/xcschemes/SRGUserData-demo.xcscheme @@ -1,6 +1,6 @@ Date: Tue, 24 Nov 2020 18:50:08 +0100 Subject: [PATCH 4/5] Update Letterbox --- Demo/SRGUserData-demo.xcodeproj/project.pbxproj | 2 +- .../xcshareddata/swiftpm/Package.resolved | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Demo/SRGUserData-demo.xcodeproj/project.pbxproj b/Demo/SRGUserData-demo.xcodeproj/project.pbxproj index 668be6c..184ade1 100644 --- a/Demo/SRGUserData-demo.xcodeproj/project.pbxproj +++ b/Demo/SRGUserData-demo.xcodeproj/project.pbxproj @@ -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.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Demo/SRGUserData-demo.xcworkspace/xcshareddata/swiftpm/Package.resolved index de2b15f..0571a75 100644 --- 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" } }, { From ecfffd89926c16afae399b00f0ec8d911a14f3bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20De=CC=81fago?= Date: Fri, 11 Dec 2020 11:35:41 +0100 Subject: [PATCH 5/5] Remove assertions in release builds --- Package.swift | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index 66a5d44..e417533 100644 --- a/Package.swift +++ b/Package.swift @@ -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)) ] ) ]