Merge branch 'release/1.1.5'

SRGSSR · Jun 5, 2018 · 1605f1a · 1605f1a
2 parents a6d7cd8 + 0932f61
commit 1605f1a
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/Framework/Sources/UIColor+SRGAppearance.m b/Framework/Sources/UIColor+SRGAppearance.m
@@ -51,7 +51,7 @@ - (id)transformedValue:(id)value
 
     NSScanner *scanner = [NSScanner scannerWithString:value];
     if ([value hasPrefix:@"#"]) {
-        [scanner setScanLocation:1];
+        scanner.scanLocation = 1;
     }
 
     unsigned rgbValue = 0;

diff --git a/SRGAppearance.xcodeproj/project.pbxproj b/SRGAppearance.xcodeproj/project.pbxproj
@@ -361,7 +361,7 @@
 			isa = PBXProject;
 			attributes = {
 				CLASSPREFIX = SRG;
-				LastUpgradeCheck = 0930;
+				LastUpgradeCheck = 0940;
 				ORGANIZATIONNAME = "SRG SSR";
 				TargetAttributes = {
 					6FA09D351D9E6F8900EDCA64 = {
@@ -535,7 +535,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
-				MARKETING_VERSION = 1.1.4;
+				MARKETING_VERSION = 1.1.5;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -590,7 +590,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
-				MARKETING_VERSION = 1.1.4;
+				MARKETING_VERSION = 1.1.5;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";

diff --git a/SRGAppearance.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/SRGAppearance.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict/>
+</plist>
diff --git a/SRGAppearance.xcodeproj/xcshareddata/xcschemes/SRGAppearance.xcscheme b/SRGAppearance.xcodeproj/xcshareddata/xcschemes/SRGAppearance.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0930"
+   LastUpgradeVersion = "0940"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"