From 2d4ac53032f5466055baa4b867d90b451c8f3ddb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20De=CC=81fago?= Date: Thu, 2 Apr 2020 22:57:25 +0200 Subject: [PATCH 1/4] Fix framework tvOS archiving issue with Xcode 11.4 --- Cartfile | 2 +- Cartfile.private.common | 2 +- Cartfile.private.proprietary | 2 +- Cartfile.private.public | 2 +- Cartfile.resolved.proprietary | 16 ++++++++-------- Cartfile.resolved.public | 16 ++++++++-------- Demo/Sources/Player/PlayerViewController~ios.m | 2 +- Framework/Framework.xcconfig | 1 + SRGUserData.xcodeproj/project.pbxproj | 16 ---------------- 9 files changed, 22 insertions(+), 37 deletions(-) diff --git a/Cartfile b/Cartfile index 849b944..fa66af8 100644 --- a/Cartfile +++ b/Cartfile @@ -1 +1 @@ -github "SRGSSR/srgidentity-apple" "2.0.2" \ No newline at end of file +github "SRGSSR/srgidentity-apple" "4854ef4adffb941b98369af9cdb0fea7497c2fb2" \ No newline at end of file diff --git a/Cartfile.private.common b/Cartfile.private.common index b5f06ba..48eded1 100644 --- a/Cartfile.private.common +++ b/Cartfile.private.common @@ -1,5 +1,5 @@ github "AliSoftware/OHHTTPStubs" ~> 8.0.0 -github "SRGSSR/srgletterbox-apple" "4.0.0" +github "SRGSSR/srgletterbox-apple" "de0a2d4b3a74eca684bf2f293a939a1b74cb2bce" # Fix to have a common framework name for all platforms; should be submitted as pull request github "SRGSSR/DeepDiff" "2.3.1_srg1" diff --git a/Cartfile.private.proprietary b/Cartfile.private.proprietary index c6064d4..959fd5d 100644 --- a/Cartfile.private.proprietary +++ b/Cartfile.private.proprietary @@ -1 +1 @@ -github "SRGSSR/srgcontentprotection-apple" "2.0.1" \ No newline at end of file +github "SRGSSR/srgcontentprotection-apple" "c08d0fb97596eee7b8df30bc0bceab7c7eaead3c" \ No newline at end of file diff --git a/Cartfile.private.public b/Cartfile.private.public index 77283ac..845adc1 100644 --- a/Cartfile.private.public +++ b/Cartfile.private.public @@ -1 +1 @@ -github "SRGSSR/srgcontentprotection-fake-apple" "2.0.1" \ No newline at end of file +github "SRGSSR/srgcontentprotection-fake-apple" "e405332dd450cc21cdb4f01c0e6a7ce17e72fcc2" \ No newline at end of file diff --git a/Cartfile.resolved.proprietary b/Cartfile.resolved.proprietary index d7ca1de..759672d 100644 --- a/Cartfile.resolved.proprietary +++ b/Cartfile.resolved.proprietary @@ -1,5 +1,5 @@ github "AliSoftware/OHHTTPStubs" "8.0.0" -github "Mantle/Mantle" "2.1.0" +github "Mantle/Mantle" "2.1.1" github "SRGSSR/ComScore-iOS-watchOS-tvOS" "6.2.0" github "SRGSSR/DeepDiff" "2.3.1_srg1" github "SRGSSR/FXReachability" "1.3.2_srg4" @@ -7,14 +7,14 @@ github "SRGSSR/MAKVONotificationCenter" "1.0_srg4" github "SRGSSR/UICKeyChainStore" "v2.1.2_srg1" github "SRGSSR/YYWebImage" "1.0.5_srg2" github "SRGSSR/libextobjc" "0.6_srg2" -github "SRGSSR/srganalytics-apple" "4.1.1" +github "SRGSSR/srganalytics-apple" "be541a8458a544c5140be8af49dd17590d14f111" github "SRGSSR/srgappearance-apple" "2.1.0" -github "SRGSSR/srgcontentprotection-apple" "2.0.1" -github "SRGSSR/srgdataprovider-apple" "7.1.0" +github "SRGSSR/srgcontentprotection-apple" "c08d0fb97596eee7b8df30bc0bceab7c7eaead3c" +github "SRGSSR/srgdataprovider-apple" "9771e1937c4fb67c270d6a7dc5592f083c39f3c7" github "SRGSSR/srgdiagnostics-apple" "2.0.1" -github "SRGSSR/srgidentity-apple" "2.0.2" -github "SRGSSR/srgletterbox-apple" "4.0.0" +github "SRGSSR/srgidentity-apple" "4854ef4adffb941b98369af9cdb0fea7497c2fb2" +github "SRGSSR/srgletterbox-apple" "de0a2d4b3a74eca684bf2f293a939a1b74cb2bce" github "SRGSSR/srglogger-apple" "2.0.0" -github "SRGSSR/srgmediaplayer-apple" "4.0.0" -github "SRGSSR/srgnetwork-apple" "2.0.1" +github "SRGSSR/srgmediaplayer-apple" "fc7d7e25432a6191b1d596b3b1fbfc93c7aed876" +github "SRGSSR/srgnetwork-apple" "4138001f842b3dac4ca248c768cf48898fcb115d" github "SRGSSR/tagcommander-apple" "4.5.4_4.4.1_srg3" diff --git a/Cartfile.resolved.public b/Cartfile.resolved.public index 6e17591..135c654 100644 --- a/Cartfile.resolved.public +++ b/Cartfile.resolved.public @@ -1,5 +1,5 @@ github "AliSoftware/OHHTTPStubs" "8.0.0" -github "Mantle/Mantle" "2.1.0" +github "Mantle/Mantle" "2.1.1" github "SRGSSR/ComScore-iOS-watchOS-tvOS" "6.2.0" github "SRGSSR/DeepDiff" "2.3.1_srg1" github "SRGSSR/FXReachability" "1.3.2_srg4" @@ -7,14 +7,14 @@ github "SRGSSR/MAKVONotificationCenter" "1.0_srg4" github "SRGSSR/UICKeyChainStore" "v2.1.2_srg1" github "SRGSSR/YYWebImage" "1.0.5_srg2" github "SRGSSR/libextobjc" "0.6_srg2" -github "SRGSSR/srganalytics-apple" "4.1.1" +github "SRGSSR/srganalytics-apple" "be541a8458a544c5140be8af49dd17590d14f111" github "SRGSSR/srgappearance-apple" "2.1.0" -github "SRGSSR/srgcontentprotection-fake-apple" "2.0.1" -github "SRGSSR/srgdataprovider-apple" "7.1.0" +github "SRGSSR/srgcontentprotection-fake-apple" "e405332dd450cc21cdb4f01c0e6a7ce17e72fcc2" +github "SRGSSR/srgdataprovider-apple" "9771e1937c4fb67c270d6a7dc5592f083c39f3c7" github "SRGSSR/srgdiagnostics-apple" "2.0.1" -github "SRGSSR/srgidentity-apple" "2.0.2" -github "SRGSSR/srgletterbox-apple" "4.0.0" +github "SRGSSR/srgidentity-apple" "4854ef4adffb941b98369af9cdb0fea7497c2fb2" +github "SRGSSR/srgletterbox-apple" "de0a2d4b3a74eca684bf2f293a939a1b74cb2bce" github "SRGSSR/srglogger-apple" "2.0.0" -github "SRGSSR/srgmediaplayer-apple" "4.0.0" -github "SRGSSR/srgnetwork-apple" "2.0.1" +github "SRGSSR/srgmediaplayer-apple" "fc7d7e25432a6191b1d596b3b1fbfc93c7aed876" +github "SRGSSR/srgnetwork-apple" "4138001f842b3dac4ca248c768cf48898fcb115d" github "SRGSSR/tagcommander-apple" "4.5.4_4.4.1_srg3" diff --git a/Demo/Sources/Player/PlayerViewController~ios.m b/Demo/Sources/Player/PlayerViewController~ios.m index a9fff23..247fdf7 100644 --- a/Demo/Sources/Player/PlayerViewController~ios.m +++ b/Demo/Sources/Player/PlayerViewController~ios.m @@ -105,7 +105,7 @@ - (void)reloadData - (void)letterboxViewWillAnimateUserInterface:(SRGLetterboxView *)letterboxView { [self.view layoutIfNeeded]; - [letterboxView animateAlongsideUserInterfaceWithAnimations:^(BOOL hidden, BOOL minimal, CGFloat heightOffset) { + [letterboxView animateAlongsideUserInterfaceWithAnimations:^(BOOL hidden, BOOL minimal, CGFloat aspectRatio, CGFloat heightOffset) { CGFloat alpha = (minimal || ! hidden) ? 1.f : 0.f; self.closeButton.alpha = alpha; self.playlistsButton.alpha = alpha; diff --git a/Framework/Framework.xcconfig b/Framework/Framework.xcconfig index 128e811..10cec33 100644 --- a/Framework/Framework.xcconfig +++ b/Framework/Framework.xcconfig @@ -1,2 +1,3 @@ #include "../Common.xcconfig" +OTHER_LDFLAGS = -framework FXReachability -framework libextobjc -framework MAKVONotificationCenter -framework Mantle -framework SRGIdentity -framework SRGLogger -framework SRGNetwork -framework UICKeyChainStore diff --git a/SRGUserData.xcodeproj/project.pbxproj b/SRGUserData.xcodeproj/project.pbxproj index a96df96..545d9d7 100644 --- a/SRGUserData.xcodeproj/project.pbxproj +++ b/SRGUserData.xcodeproj/project.pbxproj @@ -20,9 +20,6 @@ 084ACC2E22535F48008ACBD0 /* SRGPlaylist.h in Headers */ = {isa = PBXBuildFile; fileRef = 084ACC2C22535F48008ACBD0 /* SRGPlaylist.h */; settings = {ATTRIBUTES = (Public, ); }; }; 0850E2C5223043C4003BDCB8 /* UserData_DB_v1 in Resources */ = {isa = PBXBuildFile; fileRef = 0850E2C4223043C4003BDCB8 /* UserData_DB_v1 */; }; 0850E2C92230499A003BDCB8 /* UserDataTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = 0850E2C822304999003BDCB8 /* UserDataTestCase.m */; }; - 0858B69822010C9E000F00CF /* SRGLogger.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0858B69522010C9E000F00CF /* SRGLogger.framework */; }; - 0858B69B22010C9E000F00CF /* libextobjc.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0858B69622010C9E000F00CF /* libextobjc.framework */; }; - 0858B69E22010C9E000F00CF /* MAKVONotificationCenter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0858B69722010C9E000F00CF /* MAKVONotificationCenter.framework */; }; 08624E63223B0C50007D919A /* SRGUserData_v3_v4.xcmappingmodel in Sources */ = {isa = PBXBuildFile; fileRef = 08624E62223B0C50007D919A /* SRGUserData_v3_v4.xcmappingmodel */; }; 08624E65223B0CB9007D919A /* SRGUserData_v4_v5.xcmappingmodel in Sources */ = {isa = PBXBuildFile; fileRef = 08624E64223B0CB9007D919A /* SRGUserData_v4_v5.xcmappingmodel */; }; 08624E67223B114D007D919A /* UserData_DB_v5 in Resources */ = {isa = PBXBuildFile; fileRef = 08624E66223B114D007D919A /* UserData_DB_v5 */; }; @@ -47,7 +44,6 @@ 6F0178D02208199800B4BCD9 /* SRGUserDataTimerTarget.h in Headers */ = {isa = PBXBuildFile; fileRef = 6F0178CE2208199800B4BCD9 /* SRGUserDataTimerTarget.h */; }; 6F0178D12208199800B4BCD9 /* SRGUserDataTimerTarget.m in Sources */ = {isa = PBXBuildFile; fileRef = 6F0178CF2208199800B4BCD9 /* SRGUserDataTimerTarget.m */; }; 6F0178D822086F6D00B4BCD9 /* SRGUser+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 6F0178D722086F6D00B4BCD9 /* SRGUser+Private.h */; }; - 6F0432BD21006E7A002B090A /* SRGNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6F0432BC21006E7A002B090A /* SRGNetwork.framework */; }; 6F0C98EE2121E1D600073AB6 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 6FCBFEF7210B578B006BC355 /* Localizable.strings */; }; 6F0C98F12121E26A00073AB6 /* SRGUserData.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 6F0C98E62121E1C200073AB6 /* SRGUserData.bundle */; }; 6F0EB54020FC7FA9009C02CF /* SRGUserData.h in Headers */ = {isa = PBXBuildFile; fileRef = 6F0EB53E20FC7FA9009C02CF /* SRGUserData.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -98,10 +94,6 @@ 6FA3931723A41C4200D22C56 /* SettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6FA3931523A41C4200D22C56 /* SettingsViewController.m */; }; 6FA3931B23A4E42300D22C56 /* NSPersistentContainer+SRGUserData.h in Headers */ = {isa = PBXBuildFile; fileRef = 6FA3931923A4E42300D22C56 /* NSPersistentContainer+SRGUserData.h */; }; 6FA3931C23A4E42300D22C56 /* NSPersistentContainer+SRGUserData.m in Sources */ = {isa = PBXBuildFile; fileRef = 6FA3931A23A4E42300D22C56 /* NSPersistentContainer+SRGUserData.m */; }; - 6FA62D5F2204389A008569DC /* FXReachability.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6FA62D5C2204389A008569DC /* FXReachability.framework */; }; - 6FA62D602204389A008569DC /* SRGIdentity.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6FA62D5D2204389A008569DC /* SRGIdentity.framework */; }; - 6FA62D612204389A008569DC /* UICKeyChainStore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6FA62D5E2204389A008569DC /* UICKeyChainStore.framework */; }; - 6FA62D692204394B008569DC /* Mantle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6FA62D682204394B008569DC /* Mantle.framework */; }; 6FA9ADFF222C4944007446BD /* SRGUserDataError.h in Headers */ = {isa = PBXBuildFile; fileRef = 6FA9ADFD222C4944007446BD /* SRGUserDataError.h */; settings = {ATTRIBUTES = (Public, ); }; }; 6FA9AE00222C4944007446BD /* SRGUserDataError.m in Sources */ = {isa = PBXBuildFile; fileRef = 6FA9ADFE222C4944007446BD /* SRGUserDataError.m */; }; 6FB19597221442BF00D3BF88 /* UserObjectTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = 6FB19596221442BF00D3BF88 /* UserObjectTestCase.m */; }; @@ -368,14 +360,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 6FA62D692204394B008569DC /* Mantle.framework in Frameworks */, - 6FA62D5F2204389A008569DC /* FXReachability.framework in Frameworks */, - 6FA62D602204389A008569DC /* SRGIdentity.framework in Frameworks */, - 6FA62D612204389A008569DC /* UICKeyChainStore.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; }; From 46b3606dfbd7bd9ef29e4ca33c94c6b402030312 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Bertholon Date: Sun, 19 Apr 2020 01:57:37 +0200 Subject: [PATCH 2/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 ce4c2f228c7936d5f5c9270a29a9f6b4e0096e68 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Bertholon Date: Mon, 20 Apr 2020 15:31:05 +0200 Subject: [PATCH 3/4] Bump version number --- Common.xcconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Common.xcconfig b/Common.xcconfig index 1791667..e97a6ca 100644 --- a/Common.xcconfig +++ b/Common.xcconfig @@ -1,5 +1,5 @@ // Version information -MARKETING_VERSION = 2.0.2 +MARKETING_VERSION = 2.0.3 // Deployment targets IPHONEOS_DEPLOYMENT_TARGET = 9.0 From 484b2478f056eb06e049f190d43a186ffe908d8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20De=CC=81fago?= Date: Wed, 8 Jul 2020 20:33:39 +0200 Subject: [PATCH 4/4] Update dependencies with official releases --- Cartfile | 2 +- Cartfile.private.common | 2 +- Cartfile.private.proprietary | 2 +- Cartfile.private.public | 2 +- Cartfile.resolved.proprietary | 18 +++++++++--------- Cartfile.resolved.public | 18 +++++++++--------- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Cartfile b/Cartfile index fa66af8..42a02ad 100644 --- a/Cartfile +++ b/Cartfile @@ -1 +1 @@ -github "SRGSSR/srgidentity-apple" "4854ef4adffb941b98369af9cdb0fea7497c2fb2" \ No newline at end of file +github "SRGSSR/srgidentity-apple" "2.0.3" \ No newline at end of file diff --git a/Cartfile.private.common b/Cartfile.private.common index 48eded1..5a92143 100644 --- a/Cartfile.private.common +++ b/Cartfile.private.common @@ -1,5 +1,5 @@ github "AliSoftware/OHHTTPStubs" ~> 8.0.0 -github "SRGSSR/srgletterbox-apple" "de0a2d4b3a74eca684bf2f293a939a1b74cb2bce" +github "SRGSSR/srgletterbox-apple" "5.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" diff --git a/Cartfile.private.proprietary b/Cartfile.private.proprietary index 959fd5d..68e8dc7 100644 --- a/Cartfile.private.proprietary +++ b/Cartfile.private.proprietary @@ -1 +1 @@ -github "SRGSSR/srgcontentprotection-apple" "c08d0fb97596eee7b8df30bc0bceab7c7eaead3c" \ No newline at end of file +github "SRGSSR/srgcontentprotection-apple" "2.0.2" \ No newline at end of file diff --git a/Cartfile.private.public b/Cartfile.private.public index 845adc1..7ad1159 100644 --- a/Cartfile.private.public +++ b/Cartfile.private.public @@ -1 +1 @@ -github "SRGSSR/srgcontentprotection-fake-apple" "e405332dd450cc21cdb4f01c0e6a7ce17e72fcc2" \ No newline at end of file +github "SRGSSR/srgcontentprotection-fake-apple" "2.0.2" \ No newline at end of file diff --git a/Cartfile.resolved.proprietary b/Cartfile.resolved.proprietary index 759672d..ec75a48 100644 --- a/Cartfile.resolved.proprietary +++ b/Cartfile.resolved.proprietary @@ -1,20 +1,20 @@ github "AliSoftware/OHHTTPStubs" "8.0.0" github "Mantle/Mantle" "2.1.1" -github "SRGSSR/ComScore-iOS-watchOS-tvOS" "6.2.0" +github "SRGSSR/ComScore-iOS-watchOS-tvOS" "6.3.1" 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_srg2" github "SRGSSR/libextobjc" "0.6_srg2" -github "SRGSSR/srganalytics-apple" "be541a8458a544c5140be8af49dd17590d14f111" +github "SRGSSR/srganalytics-apple" "4.2.0" github "SRGSSR/srgappearance-apple" "2.1.0" -github "SRGSSR/srgcontentprotection-apple" "c08d0fb97596eee7b8df30bc0bceab7c7eaead3c" -github "SRGSSR/srgdataprovider-apple" "9771e1937c4fb67c270d6a7dc5592f083c39f3c7" +github "SRGSSR/srgcontentprotection-apple" "2.0.2" +github "SRGSSR/srgdataprovider-apple" "8.0.0" github "SRGSSR/srgdiagnostics-apple" "2.0.1" -github "SRGSSR/srgidentity-apple" "4854ef4adffb941b98369af9cdb0fea7497c2fb2" -github "SRGSSR/srgletterbox-apple" "de0a2d4b3a74eca684bf2f293a939a1b74cb2bce" -github "SRGSSR/srglogger-apple" "2.0.0" -github "SRGSSR/srgmediaplayer-apple" "fc7d7e25432a6191b1d596b3b1fbfc93c7aed876" -github "SRGSSR/srgnetwork-apple" "4138001f842b3dac4ca248c768cf48898fcb115d" +github "SRGSSR/srgidentity-apple" "2.0.3" +github "SRGSSR/srgletterbox-apple" "5.0.0" +github "SRGSSR/srglogger-apple" "2.0.1" +github "SRGSSR/srgmediaplayer-apple" "5.0.0" +github "SRGSSR/srgnetwork-apple" "2.0.2" github "SRGSSR/tagcommander-apple" "4.5.4_4.4.1_srg3" diff --git a/Cartfile.resolved.public b/Cartfile.resolved.public index 135c654..7c815e9 100644 --- a/Cartfile.resolved.public +++ b/Cartfile.resolved.public @@ -1,20 +1,20 @@ github "AliSoftware/OHHTTPStubs" "8.0.0" github "Mantle/Mantle" "2.1.1" -github "SRGSSR/ComScore-iOS-watchOS-tvOS" "6.2.0" +github "SRGSSR/ComScore-iOS-watchOS-tvOS" "6.3.1" 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_srg2" github "SRGSSR/libextobjc" "0.6_srg2" -github "SRGSSR/srganalytics-apple" "be541a8458a544c5140be8af49dd17590d14f111" +github "SRGSSR/srganalytics-apple" "4.2.0" github "SRGSSR/srgappearance-apple" "2.1.0" -github "SRGSSR/srgcontentprotection-fake-apple" "e405332dd450cc21cdb4f01c0e6a7ce17e72fcc2" -github "SRGSSR/srgdataprovider-apple" "9771e1937c4fb67c270d6a7dc5592f083c39f3c7" +github "SRGSSR/srgcontentprotection-fake-apple" "2.0.2" +github "SRGSSR/srgdataprovider-apple" "8.0.0" github "SRGSSR/srgdiagnostics-apple" "2.0.1" -github "SRGSSR/srgidentity-apple" "4854ef4adffb941b98369af9cdb0fea7497c2fb2" -github "SRGSSR/srgletterbox-apple" "de0a2d4b3a74eca684bf2f293a939a1b74cb2bce" -github "SRGSSR/srglogger-apple" "2.0.0" -github "SRGSSR/srgmediaplayer-apple" "fc7d7e25432a6191b1d596b3b1fbfc93c7aed876" -github "SRGSSR/srgnetwork-apple" "4138001f842b3dac4ca248c768cf48898fcb115d" +github "SRGSSR/srgidentity-apple" "2.0.3" +github "SRGSSR/srgletterbox-apple" "5.0.0" +github "SRGSSR/srglogger-apple" "2.0.1" +github "SRGSSR/srgmediaplayer-apple" "5.0.0" +github "SRGSSR/srgnetwork-apple" "2.0.2" github "SRGSSR/tagcommander-apple" "4.5.4_4.4.1_srg3"