Skip to content

Commit

Permalink
Merge branch 'release/2.0.4'
Browse files Browse the repository at this point in the history
  • Loading branch information
defagos committed Sep 19, 2020
2 parents 89181c8 + d18d55f commit dc497a5
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion Cartfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "SRGSSR/srgidentity-apple" "2.0.3"
github "SRGSSR/srgidentity-apple" "2.0.4"
2 changes: 1 addition & 1 deletion Cartfile.private.common
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
github "AliSoftware/OHHTTPStubs" ~> 8.0.0
github "SRGSSR/srgletterbox-apple" "5.0.0"
github "SRGSSR/srgletterbox-apple" "5.0.2"

# 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
12 changes: 6 additions & 6 deletions Cartfile.resolved.proprietary
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.1"
github "Mantle/Mantle" "2.1.2"
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.2.0"
github "SRGSSR/srganalytics-apple" "4.2.2"
github "SRGSSR/srgappearance-apple" "2.1.0"
github "SRGSSR/srgcontentprotection-apple" "2.0.2"
github "SRGSSR/srgdataprovider-apple" "8.0.0"
github "SRGSSR/srgdataprovider-apple" "8.0.1"
github "SRGSSR/srgdiagnostics-apple" "2.0.1"
github "SRGSSR/srgidentity-apple" "2.0.3"
github "SRGSSR/srgletterbox-apple" "5.0.0"
github "SRGSSR/srgidentity-apple" "2.0.4"
github "SRGSSR/srgletterbox-apple" "5.0.2"
github "SRGSSR/srglogger-apple" "2.0.1"
github "SRGSSR/srgmediaplayer-apple" "5.0.0"
github "SRGSSR/srgmediaplayer-apple" "5.0.3"
github "SRGSSR/srgnetwork-apple" "2.0.2"
github "SRGSSR/tagcommander-apple" "4.5.4_4.4.1_srg3"
12 changes: 6 additions & 6 deletions Cartfile.resolved.public
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.1"
github "Mantle/Mantle" "2.1.2"
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.2.0"
github "SRGSSR/srganalytics-apple" "4.2.2"
github "SRGSSR/srgappearance-apple" "2.1.0"
github "SRGSSR/srgcontentprotection-fake-apple" "2.0.2"
github "SRGSSR/srgdataprovider-apple" "8.0.0"
github "SRGSSR/srgdataprovider-apple" "8.0.1"
github "SRGSSR/srgdiagnostics-apple" "2.0.1"
github "SRGSSR/srgidentity-apple" "2.0.3"
github "SRGSSR/srgletterbox-apple" "5.0.0"
github "SRGSSR/srgidentity-apple" "2.0.4"
github "SRGSSR/srgletterbox-apple" "5.0.2"
github "SRGSSR/srglogger-apple" "2.0.1"
github "SRGSSR/srgmediaplayer-apple" "5.0.0"
github "SRGSSR/srgmediaplayer-apple" "5.0.3"
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
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Version information
MARKETING_VERSION = 2.0.3
MARKETING_VERSION = 2.0.4

// Deployment targets
IPHONEOS_DEPLOYMENT_TARGET = 9.0
Expand Down

0 comments on commit dc497a5

Please sign in to comment.