Skip to content

Commit

Permalink
Merge branch 'release/2.0.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
@defagos
defagos committed Jul 8, 2020
2 parents b1d2d14 + 484b247 commit 89181c8
Show file tree
Hide file tree
Showing 11 changed files with 82 additions and 77 deletions.
2 changes: 1 addition & 1 deletion Cartfile
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "SRGSSR/srgidentity-apple" "2.0.2"
github "SRGSSR/srgidentity-apple" "2.0.3"
2 changes: 1 addition & 1 deletion Cartfile.private.common
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
github "AliSoftware/OHHTTPStubs" ~> 8.0.0
github "SRGSSR/srgletterbox-apple" "4.0.0"
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"
Expand Down
2 changes: 1 addition & 1 deletion Cartfile.private.proprietary
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "SRGSSR/srgcontentprotection-apple" "2.0.1"
github "SRGSSR/srgcontentprotection-apple" "2.0.2"
2 changes: 1 addition & 1 deletion Cartfile.private.public
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "SRGSSR/srgcontentprotection-fake-apple" "2.0.1"
github "SRGSSR/srgcontentprotection-fake-apple" "2.0.2"
20 changes: 10 additions & 10 deletions Cartfile.resolved.proprietary
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
github "AliSoftware/OHHTTPStubs" "8.0.0"
github "Mantle/Mantle" "2.1.0"
github "SRGSSR/ComScore-iOS-watchOS-tvOS" "6.2.0"
github "Mantle/Mantle" "2.1.1"
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" "4.1.1"
github "SRGSSR/srganalytics-apple" "4.2.0"
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" "2.0.2"
github "SRGSSR/srgdataprovider-apple" "8.0.0"
github "SRGSSR/srgdiagnostics-apple" "2.0.1"
github "SRGSSR/srgidentity-apple" "2.0.2"
github "SRGSSR/srgletterbox-apple" "4.0.0"
github "SRGSSR/srglogger-apple" "2.0.0"
github "SRGSSR/srgmediaplayer-apple" "4.0.0"
github "SRGSSR/srgnetwork-apple" "2.0.1"
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"
20 changes: 10 additions & 10 deletions Cartfile.resolved.public
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
github "AliSoftware/OHHTTPStubs" "8.0.0"
github "Mantle/Mantle" "2.1.0"
github "SRGSSR/ComScore-iOS-watchOS-tvOS" "6.2.0"
github "Mantle/Mantle" "2.1.1"
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" "4.1.1"
github "SRGSSR/srganalytics-apple" "4.2.0"
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" "2.0.2"
github "SRGSSR/srgdataprovider-apple" "8.0.0"
github "SRGSSR/srgdiagnostics-apple" "2.0.1"
github "SRGSSR/srgidentity-apple" "2.0.2"
github "SRGSSR/srgletterbox-apple" "4.0.0"
github "SRGSSR/srglogger-apple" "2.0.0"
github "SRGSSR/srgmediaplayer-apple" "4.0.0"
github "SRGSSR/srgnetwork-apple" "2.0.1"
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"
2 changes: 1 addition & 1 deletion Common.xcconfig
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Version information
MARKETING_VERSION = 2.0.2
MARKETING_VERSION = 2.0.3

// Deployment targets
IPHONEOS_DEPLOYMENT_TARGET = 9.0
Expand Down
2 changes: 1 addition & 1 deletion Demo/Sources/Player/PlayerViewController~ios.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions Framework/Framework.xcconfig
View file
Original file line number Diff line number Diff line change
@@ -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
90 changes: 55 additions & 35 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -24,36 +40,37 @@ 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)
http-cookie (~> 1.0.0)
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)
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -170,4 +190,4 @@ DEPENDENCIES
fastlane-plugin-xcconfig

BUNDLED WITH
1.16.5
1.17.2
16 changes: 0 additions & 16 deletions SRGUserData.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 */; };
Expand All @@ -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, ); }; };
Expand Down Expand Up @@ -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 */; };
Expand Down Expand Up @@ -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;
};
Expand Down

0 comments on commit 89181c8

Please sign in to comment.