Merge branch 'release/1.2.3'

SRGSSR · Jul 29, 2019 · 4f6f35e · 4f6f35e
2 parents b55d670 + 1ea12aa
commit 4f6f35e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/Cartfile b/Cartfile
@@ -1,2 +1,2 @@
 github "SRGSSR/srgdiagnostics-ios" "1.0.1"
-github "SRGSSR/srgnetwork-ios" "1.0.2"
+github "SRGSSR/srgnetwork-ios" "1.0.3"
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,5 +1,5 @@
 github "SRGSSR/MAKVONotificationCenter" "1.0_srg3"
 github "SRGSSR/libextobjc" "0.6_srg1"
 github "SRGSSR/srgdiagnostics-ios" "1.0.1"
-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"
diff --git a/SRGContentProtection.xcodeproj/project.pbxproj b/SRGContentProtection.xcodeproj/project.pbxproj
@@ -700,7 +700,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
-				MARKETING_VERSION = 1.2.2;
+				MARKETING_VERSION = 1.2.3;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -827,7 +827,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
-				MARKETING_VERSION = 1.2.2;
+				MARKETING_VERSION = 1.2.3;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -1016,7 +1016,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
-				MARKETING_VERSION = 1.2.2;
+				MARKETING_VERSION = 1.2.3;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -1074,7 +1074,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
-				MARKETING_VERSION = 1.2.2;
+				MARKETING_VERSION = 1.2.3;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";