From 6df1a79c86ce24b126b8da84f810485c4722345f Mon Sep 17 00:00:00 2001
From: Martin Rehder <martin@Rehsco-MacPro.local>
Date: Mon, 25 Dec 2017 15:05:22 +0100
Subject: [PATCH] Swift 4 changes

---
 .swift-version                           |  1 +
 MaterialColors.podspec                   |  6 +++---
 MaterialColors.xcodeproj/project.pbxproj | 26 ++++++++++++++++++------
 3 files changed, 24 insertions(+), 9 deletions(-)
 create mode 100644 .swift-version

diff --git a/.swift-version b/.swift-version
new file mode 100644
index 0000000..5186d07
--- /dev/null
+++ b/.swift-version
@@ -0,0 +1 @@
+4.0
diff --git a/MaterialColors.podspec b/MaterialColors.podspec
index ceee85e..d3ead01 100644
--- a/MaterialColors.podspec
+++ b/MaterialColors.podspec
@@ -9,8 +9,8 @@
 Pod::Spec.new do |s|
 
   s.name         	= "MaterialColors"
-  s.version      	= "1.0.0"
-  s.summary      	= "Implementation of Material Design Colors in Swift 2.1."
+  s.version      	= "2.0.0"
+  s.summary      	= "Implementation of Material Design Colors in Swift 4."
   s.description  	= <<-DESC
   						Everything you need to use the Google Material Design Colors.
   						Includes the various colors in groupings and both 
@@ -26,5 +26,5 @@ Pod::Spec.new do |s|
   s.source       	= { :git => "https://github.com/dpyro/MaterialColors.git", :tag => "#{s.version}" }
   s.source_files  	= "MaterialColors/*.{h,swift}"
   s.requires_arc 	= true
-
+  s.pod_target_xcconfig = { 'SWIFT_VERSION' => '4.0' }
 end
diff --git a/MaterialColors.xcodeproj/project.pbxproj b/MaterialColors.xcodeproj/project.pbxproj
index fda79ca..780a169 100644
--- a/MaterialColors.xcodeproj/project.pbxproj
+++ b/MaterialColors.xcodeproj/project.pbxproj
@@ -151,13 +151,13 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0720;
-				LastUpgradeCheck = 0830;
+				LastUpgradeCheck = 0920;
 				ORGANIZATIONNAME = "Sumant Manne";
 				TargetAttributes = {
 					E965AFFF1C4D7EF400115A13 = {
 						CreatedOnToolsVersion = 7.2;
 						DevelopmentTeam = XY2JRE5NJH;
-						LastSwiftMigration = 0830;
+						LastSwiftMigration = 0920;
 					};
 					E965B0101C4D7F7C00115A13 = {
 						CreatedOnToolsVersion = 7.2;
@@ -253,14 +253,20 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -303,14 +309,20 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -356,7 +368,8 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -376,7 +389,8 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.sumantmanne.lib.MaterialColors;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};
@@ -389,7 +403,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.sumantmanne.lib.MaterialColorsExample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -402,7 +416,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.sumantmanne.lib.MaterialColorsExample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};