Skip to content

Commit

Permalink
Merge branch 'release/4.2.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
defagos committed Sep 19, 2020
2 parents bebe797 + 9896775 commit c172255
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
6 changes: 3 additions & 3 deletions Cartfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
github "SRGSSR/ComScore-iOS-watchOS-tvOS" "6.3.1"
github "SRGSSR/srgdataprovider-apple" "8.0.0"
github "SRGSSR/srgidentity-apple" "2.0.3"
github "SRGSSR/srgmediaplayer-apple" "5.0.2"
github "SRGSSR/srgdataprovider-apple" "8.0.1"
github "SRGSSR/srgidentity-apple" "2.0.4"
github "SRGSSR/srgmediaplayer-apple" "5.0.3"
github "SRGSSR/tagcommander-apple" "4.5.4_4.4.1_srg3"
8 changes: 4 additions & 4 deletions Cartfile.resolved.proprietary
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
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/FXReachability" "1.3.2_srg4"
github "SRGSSR/MAKVONotificationCenter" "1.0_srg4"
github "SRGSSR/UICKeyChainStore" "v2.1.2_srg1"
github "SRGSSR/libextobjc" "0.6_srg2"
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/srgidentity-apple" "2.0.4"
github "SRGSSR/srglogger-apple" "2.0.1"
github "SRGSSR/srgmediaplayer-apple" "5.0.2"
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"
8 changes: 4 additions & 4 deletions Cartfile.resolved.public
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
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/FXReachability" "1.3.2_srg4"
github "SRGSSR/MAKVONotificationCenter" "1.0_srg4"
github "SRGSSR/UICKeyChainStore" "v2.1.2_srg1"
github "SRGSSR/libextobjc" "0.6_srg2"
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/srgidentity-apple" "2.0.4"
github "SRGSSR/srglogger-apple" "2.0.1"
github "SRGSSR/srgmediaplayer-apple" "5.0.2"
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 = 4.2.1
MARKETING_VERSION = 4.2.2

// Deployment targets
IPHONEOS_DEPLOYMENT_TARGET = 9.0
Expand Down

0 comments on commit c172255

Please sign in to comment.