From 2f6da61c9c30bb3c7b1d40f3c24db76accc2df54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20De=CC=81fago?= Date: Mon, 9 Mar 2020 13:51:30 +0100 Subject: [PATCH 1/4] Bump verison number --- Common.xcconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Common.xcconfig b/Common.xcconfig index a2e6205..1791667 100644 --- a/Common.xcconfig +++ b/Common.xcconfig @@ -1,5 +1,5 @@ // Version information -MARKETING_VERSION = 2.0.1 +MARKETING_VERSION = 2.0.2 // Deployment targets IPHONEOS_DEPLOYMENT_TARGET = 9.0 From c08d0fb97596eee7b8df30bc0bceab7c7eaead3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20De=CC=81fago?= Date: Thu, 2 Apr 2020 09:29:02 +0200 Subject: [PATCH 2/4] Fix framework tvOS archiving issue with Xcode 11.4 --- Cartfile | 2 +- Cartfile.resolved | 2 +- Framework/Framework.xcconfig | 1 + .../project.pbxproj | 20 ------------------- 4 files changed, 3 insertions(+), 22 deletions(-) diff --git a/Cartfile b/Cartfile index db74ca0..ce32afc 100644 --- a/Cartfile +++ b/Cartfile @@ -1,2 +1,2 @@ github "SRGSSR/srgdiagnostics-apple" "2.0.1" -github "SRGSSR/srgnetwork-apple" "2.0.1" \ No newline at end of file +github "SRGSSR/srgnetwork-apple" "4138001f842b3dac4ca248c768cf48898fcb115d" \ No newline at end of file diff --git a/Cartfile.resolved b/Cartfile.resolved index 55abef3..3c52d2b 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -2,4 +2,4 @@ github "SRGSSR/MAKVONotificationCenter" "1.0_srg4" github "SRGSSR/libextobjc" "0.6_srg2" github "SRGSSR/srgdiagnostics-apple" "2.0.1" github "SRGSSR/srglogger-apple" "2.0.0" -github "SRGSSR/srgnetwork-apple" "2.0.1" +github "SRGSSR/srgnetwork-apple" "4138001f842b3dac4ca248c768cf48898fcb115d" diff --git a/Framework/Framework.xcconfig b/Framework/Framework.xcconfig index 128e811..e7cd65d 100644 --- a/Framework/Framework.xcconfig +++ b/Framework/Framework.xcconfig @@ -1,2 +1,3 @@ #include "../Common.xcconfig" +OTHER_LDFLAGS = -framework libextobjc -framework MAKVONotificationCenter -framework SRGDiagnostics -framework SRGLogger -framework SRGNetwork diff --git a/SRGContentProtection.xcodeproj/project.pbxproj b/SRGContentProtection.xcodeproj/project.pbxproj index 32ce9c7..7382c3f 100644 --- a/SRGContentProtection.xcodeproj/project.pbxproj +++ b/SRGContentProtection.xcodeproj/project.pbxproj @@ -7,16 +7,8 @@ objects = { /* Begin PBXBuildFile section */ - 0858B69822010C9E000F00CF /* SRGLogger.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0858B69522010C9E000F00CF /* SRGLogger.framework */; }; - 0858B69B22010C9E000F00CF /* libextobjc.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0858B69622010C9E000F00CF /* libextobjc.framework */; }; - 0858B69C22010C9E000F00CF /* libextobjc.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0858B69622010C9E000F00CF /* libextobjc.framework */; }; - 0858B69E22010C9E000F00CF /* MAKVONotificationCenter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0858B69722010C9E000F00CF /* MAKVONotificationCenter.framework */; }; - 0858B6A322010CD6000F00CF /* MAKVONotificationCenter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0858B69722010C9E000F00CF /* MAKVONotificationCenter.framework */; }; - 0858B6A522010CD6000F00CF /* SRGLogger.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0858B69522010C9E000F00CF /* SRGLogger.framework */; }; 08E2AF6423108D8F00DCCE74 /* MediaDemoConfiguration.plist in Resources */ = {isa = PBXBuildFile; fileRef = 08E2AF6323108D8F00DCCE74 /* MediaDemoConfiguration.plist */; }; 08E2AF6923108EBA00DCCE74 /* Media.m in Sources */ = {isa = PBXBuildFile; fileRef = 08E2AF6823108EBA00DCCE74 /* Media.m */; }; - 6F0432BD21006E7A002B090A /* SRGNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6F0432BC21006E7A002B090A /* SRGNetwork.framework */; }; - 6F0432BE21007340002B090A /* SRGNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6F0432BC21006E7A002B090A /* SRGNetwork.framework */; }; 6F0C98EE2121E1D600073AB6 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 6FCBFEF7210B578B006BC355 /* Localizable.strings */; }; 6F0C98F12121E26A00073AB6 /* SRGContentProtection.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 6F0C98E62121E1C200073AB6 /* SRGContentProtection.bundle */; }; 6F0EB54020FC7FA9009C02CF /* SRGContentProtection.h in Headers */ = {isa = PBXBuildFile; fileRef = 6F0EB53E20FC7FA9009C02CF /* SRGContentProtection.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -36,8 +28,6 @@ 6FB74D772101D5D600E2D365 /* AkamaiResourceLoaderTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = 6FB74D742101D5D600E2D365 /* AkamaiResourceLoaderTestCase.m */; }; 6FB74D782101D5D600E2D365 /* FairPlayResourceLoaderTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = 6FB74D752101D5D600E2D365 /* FairPlayResourceLoaderTestCase.m */; }; 6FBCA7412109A9F4004CD02D /* AkamaiTokenTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = 6FBCA7402109A9F4004CD02D /* AkamaiTokenTestCase.m */; }; - 6FBF24312147F3ED00E576A2 /* SRGDiagnostics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6FBF24302147F3ED00E576A2 /* SRGDiagnostics.framework */; }; - 6FBF24342147F4C900E576A2 /* SRGDiagnostics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6FBF24302147F3ED00E576A2 /* SRGDiagnostics.framework */; }; 6FBF24372147FE2E00E576A2 /* SRGAssetResourceLoaderDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 6FBF24362147FE2E00E576A2 /* SRGAssetResourceLoaderDelegate.m */; }; 6FBF243A21480DB300E576A2 /* SRGContentProtectionConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = 6FBF243821480DB300E576A2 /* SRGContentProtectionConstants.h */; settings = {ATTRIBUTES = (Public, ); }; }; 6FBF243B21480DB300E576A2 /* SRGContentProtectionConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = 6FBF243921480DB300E576A2 /* SRGContentProtectionConstants.m */; }; @@ -158,11 +148,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 6FBF24312147F3ED00E576A2 /* SRGDiagnostics.framework in Frameworks */, - 0858B69E22010C9E000F00CF /* MAKVONotificationCenter.framework in Frameworks */, - 6F0432BD21006E7A002B090A /* SRGNetwork.framework in Frameworks */, - 0858B69B22010C9E000F00CF /* libextobjc.framework in Frameworks */, - 0858B69822010C9E000F00CF /* SRGLogger.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -170,12 +155,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 6F0432BE21007340002B090A /* SRGNetwork.framework in Frameworks */, - 0858B6A322010CD6000F00CF /* MAKVONotificationCenter.framework in Frameworks */, - 0858B6A522010CD6000F00CF /* SRGLogger.framework in Frameworks */, 6FCAB6CE231673B00043432E /* SRGContentProtection.framework in Frameworks */, - 0858B69C22010C9E000F00CF /* libextobjc.framework in Frameworks */, - 6FBF24342147F4C900E576A2 /* SRGDiagnostics.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; From 742ab790fd2549ebf2f6a4de97431ad544a6e017 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Bertholon Date: Sun, 19 Apr 2020 01:38:29 +0200 Subject: [PATCH 3/4] Update fastlane --- Gemfile.lock | 90 ++++++++++++++++++++++++++++++++-------------------- 1 file changed, 55 insertions(+), 35 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index f29951a..206ead3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -16,6 +16,22 @@ GEM addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) atomos (0.1.3) + aws-eventstream (1.1.0) + aws-partitions (1.298.0) + aws-sdk-core (3.94.0) + aws-eventstream (~> 1, >= 1.0.2) + aws-partitions (~> 1, >= 1.239.0) + aws-sigv4 (~> 1.1) + jmespath (~> 1.0) + aws-sdk-kms (1.30.0) + aws-sdk-core (~> 3, >= 3.71.0) + aws-sigv4 (~> 1.1) + aws-sdk-s3 (1.61.2) + aws-sdk-core (~> 3, >= 3.83.0) + aws-sdk-kms (~> 1) + aws-sigv4 (~> 1.1) + aws-sigv4 (1.1.2) + aws-eventstream (~> 1.0, >= 1.0.2) babosa (1.0.3) claide (1.0.3) colored (1.2) @@ -24,13 +40,13 @@ GEM highline (~> 1.7.2) declarative (0.0.10) declarative-option (0.1.0) - digest-crc (0.4.1) + digest-crc (0.5.1) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) dotenv (2.7.5) emoji_regex (1.0.1) - excon (0.71.0) - faraday (0.17.1) + excon (0.73.0) + faraday (0.17.3) multipart-post (>= 1.2, < 3) faraday-cookie_jar (0.0.6) faraday (>= 0.7.4) @@ -38,22 +54,23 @@ GEM faraday_middleware (0.13.1) faraday (>= 0.7.4, < 1.0) fastimage (2.1.7) - fastlane (2.137.0) + fastlane (2.145.0) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.3, < 3.0.0) + aws-sdk-s3 (~> 1.0) babosa (>= 1.0.2, < 2.0.0) bundler (>= 1.12.0, < 3.0.0) colored commander-fastlane (>= 4.4.6, < 5.0.0) dotenv (>= 2.1.1, < 3.0.0) emoji_regex (>= 0.1, < 2.0) - excon (>= 0.45.0, < 1.0.0) + excon (>= 0.71.0, < 1.0.0) faraday (~> 0.17) faraday-cookie_jar (~> 0.0.6) faraday_middleware (~> 0.13.1) fastimage (>= 2.1.0, < 3.0.0) gh_inspector (>= 1.1.2, < 2.0.0) - google-api-client (>= 0.21.2, < 0.24.0) + google-api-client (>= 0.29.2, < 0.37.0) google-cloud-storage (>= 1.15.0, < 2.0.0) highline (>= 1.7.2, < 2.0.0) json (< 3.0.0) @@ -72,52 +89,55 @@ GEM tty-screen (>= 0.6.3, < 1.0.0) tty-spinner (>= 0.8.0, < 1.0.0) word_wrap (~> 1.0.0) - xcodeproj (>= 1.8.1, < 2.0.0) + xcodeproj (>= 1.13.0, < 2.0.0) xcpretty (~> 0.3.0) xcpretty-travis-formatter (>= 0.0.3) fastlane-plugin-xcconfig (2.0.0) gh_inspector (1.1.3) - google-api-client (0.23.9) + google-api-client (0.36.4) addressable (~> 2.5, >= 2.5.1) - googleauth (>= 0.5, < 0.7.0) + googleauth (~> 0.9) httpclient (>= 2.8.1, < 3.0) - mime-types (~> 3.0) + mini_mime (~> 1.0) representable (~> 3.0) retriable (>= 2.0, < 4.0) - signet (~> 0.9) - google-cloud-core (1.3.2) + signet (~> 0.12) + google-cloud-core (1.5.0) google-cloud-env (~> 1.0) - google-cloud-env (1.2.1) - faraday (~> 0.11) - google-cloud-storage (1.16.0) + google-cloud-errors (~> 1.0) + google-cloud-env (1.3.1) + faraday (>= 0.17.3, < 2.0) + google-cloud-errors (1.0.0) + google-cloud-storage (1.26.0) + addressable (~> 2.5) digest-crc (~> 0.4) - google-api-client (~> 0.23) + google-api-client (~> 0.33) google-cloud-core (~> 1.2) - googleauth (>= 0.6.2, < 0.10.0) - googleauth (0.6.7) - faraday (~> 0.12) + googleauth (~> 0.9) + mini_mime (~> 1.0) + googleauth (0.12.0) + faraday (>= 0.17.3, < 2.0) jwt (>= 1.4, < 3.0) memoist (~> 0.16) multi_json (~> 1.11) os (>= 0.9, < 2.0) - signet (~> 0.7) + signet (~> 0.14) highline (1.7.10) http-cookie (1.0.3) domain_name (~> 0.5) httpclient (2.8.3) + jmespath (1.4.0) json (2.3.0) jwt (2.1.0) memoist (0.16.2) - mime-types (3.3) - mime-types-data (~> 3.2015) - mime-types-data (3.2019.1009) - mini_magick (4.9.5) + mini_magick (4.10.1) + mini_mime (1.0.2) multi_json (1.14.1) multi_xml (0.6.0) multipart-post (2.0.0) nanaimo (0.2.6) naturally (2.2.0) - os (1.0.1) + os (1.1.0) plist (3.5.0) public_suffix (2.0.5) representable (3.0.4) @@ -128,29 +148,29 @@ GEM rouge (2.0.7) rubyzip (1.3.0) security (0.1.3) - signet (0.11.0) + signet (0.14.0) addressable (~> 2.3) - faraday (~> 0.9) + faraday (>= 0.17.3, < 2.0) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) - simctl (1.6.6) + simctl (1.6.8) CFPropertyList naturally slack-notifier (2.3.2) terminal-notifier (2.0.0) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) - tty-cursor (0.7.0) - tty-screen (0.7.0) - tty-spinner (0.9.2) + tty-cursor (0.7.1) + tty-screen (0.7.1) + tty-spinner (0.9.3) tty-cursor (~> 0.7) uber (0.1.0) unf (0.1.4) unf_ext - unf_ext (0.0.7.6) - unicode-display_width (1.6.0) + unf_ext (0.0.7.7) + unicode-display_width (1.7.0) word_wrap (1.0.0) - xcodeproj (1.14.0) + xcodeproj (1.16.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) @@ -170,4 +190,4 @@ DEPENDENCIES fastlane-plugin-xcconfig BUNDLED WITH - 1.16.5 + 1.17.2 From 66229b01cca6dd1e4adde17c269a7e682fe6b138 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20De=CC=81fago?= Date: Wed, 8 Jul 2020 17:30:27 +0200 Subject: [PATCH 4/4] Update dependencies with official tagged versions --- Cartfile | 2 +- Cartfile.resolved | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cartfile b/Cartfile index ce32afc..70e57f7 100644 --- a/Cartfile +++ b/Cartfile @@ -1,2 +1,2 @@ github "SRGSSR/srgdiagnostics-apple" "2.0.1" -github "SRGSSR/srgnetwork-apple" "4138001f842b3dac4ca248c768cf48898fcb115d" \ No newline at end of file +github "SRGSSR/srgnetwork-apple" "2.0.2" \ No newline at end of file diff --git a/Cartfile.resolved b/Cartfile.resolved index 3c52d2b..e54fe20 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,5 +1,5 @@ github "SRGSSR/MAKVONotificationCenter" "1.0_srg4" github "SRGSSR/libextobjc" "0.6_srg2" github "SRGSSR/srgdiagnostics-apple" "2.0.1" -github "SRGSSR/srglogger-apple" "2.0.0" -github "SRGSSR/srgnetwork-apple" "4138001f842b3dac4ca248c768cf48898fcb115d" +github "SRGSSR/srglogger-apple" "2.0.1" +github "SRGSSR/srgnetwork-apple" "2.0.2"