Skip to content

Commit

Permalink
Merge branch 'release/1.0.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
pyby committed Jul 29, 2019
2 parents e7c9703 + 237690a commit 48883b2
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Cartfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
github "Mantle/Mantle" "2.1.0"
github "SRGSSR/FXReachability" "1.3.2_srg3"
github "SRGSSR/Masonry" "v1.1.0_srg1"
github "SRGSSR/srgnetwork-ios" "1.0.2"
github "SRGSSR/srgnetwork-ios" "1.0.3"
github "SRGSSR/UICKeyChainStore" "v2.1.2_srg1"
4 changes: 2 additions & 2 deletions Cartfile.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ github "SRGSSR/MAKVONotificationCenter" "1.0_srg3"
github "SRGSSR/Masonry" "v1.1.0_srg1"
github "SRGSSR/UICKeyChainStore" "v2.1.2_srg1"
github "SRGSSR/libextobjc" "0.6_srg1"
github "SRGSSR/srglogger-ios" "1.0.9"
github "SRGSSR/srgnetwork-ios" "1.0.2"
github "SRGSSR/srglogger-ios" "1.1"
github "SRGSSR/srgnetwork-ios" "1.0.3"
github "rckoenes/OHHTTPStubs" "6.1.1"
8 changes: 4 additions & 4 deletions SRGIdentity.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -902,7 +902,7 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
MARKETING_VERSION = 1.0.2;
MARKETING_VERSION = 1.0.3;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
Expand Down Expand Up @@ -1028,7 +1028,7 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
MARKETING_VERSION = 1.0.2;
MARKETING_VERSION = 1.0.3;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
Expand Down Expand Up @@ -1216,7 +1216,7 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
MARKETING_VERSION = 1.0.2;
MARKETING_VERSION = 1.0.3;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
Expand Down Expand Up @@ -1273,7 +1273,7 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
MARKETING_VERSION = 1.0.2;
MARKETING_VERSION = 1.0.3;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
Expand Down

0 comments on commit 48883b2

Please sign in to comment.