Xcode 10.2 and Swift 5 support (#55)

* Swift 4.2 Support * Xcode 10.2 and Swift 5 support
ChiliLabs · Jul 2, 2019 · f925a77 · f925a77
1 parent 8bde517
commit f925a77
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/CHIPageControl.podspec b/CHIPageControl.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'CHIPageControl'
-  s.version          = '0.1.7'
+  s.version          = '0.1.8'
   s.summary          = 'CHIPageControl is a set of cool animated page controls written in Swift to replace boring UIPageControl.'
 
   s.ios.deployment_target = '8.0'
@@ -10,7 +10,7 @@ Pod::Spec.new do |s|
   s.license          = { :type => 'MIT', :file => 'LICENSE' }
   s.author           = { 'Chili' => 'studio@chi.lv' }
   s.source           = { :git => 'https://github.com/ChiliLabs/CHIPageControl.git', :tag => s.version.to_s }
-  s.swift_version    = '4.2'
+  s.swift_version    = '5.0'
 
   s.source_files = 'CHIPageControl/*.swift', 'CHIPageControl/Core/*.swift'
 

diff --git a/CHIPageControl.xcodeproj/project.pbxproj b/CHIPageControl.xcodeproj/project.pbxproj
@@ -159,23 +159,24 @@
 		4313A7831E7A831E0015A568 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1000;
+				LastUpgradeCheck = 1020;
 				ORGANIZATIONNAME = chi.lv;
 				TargetAttributes = {
 					4313A78B1E7A831E0015A568 = {
 						CreatedOnToolsVersion = 8.2.1;
 						DevelopmentTeam = 4J5NY3YD66;
-						LastSwiftMigration = 0900;
+						LastSwiftMigration = 1020;
 						ProvisioningStyle = Automatic;
 					};
 				};
 			};
 			buildConfigurationList = 4313A7861E7A831E0015A568 /* Build configuration list for PBXProject "CHIPageControl" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
+				Base,
 			);
 			mainGroup = 4313A7821E7A831E0015A568;
 			productRefGroup = 4313A78D1E7A831E0015A568 /* Products */;
@@ -223,6 +224,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -284,6 +286,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -351,8 +354,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -372,8 +374,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = lv.chi.CHIPageControl;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};

diff --git a/CHIPageControl.xcodeproj/xcshareddata/xcschemes/CHIPageControl.xcscheme b/CHIPageControl.xcodeproj/xcshareddata/xcschemes/CHIPageControl.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1000"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"