Merge pull request gmarm#86 from gmarm/xcode10

Xcode 10 - Swift 4.2 support
Idomo · Sep 24, 2018 · 5d84656 · 5d84656
2 parents e55d53c + 57bccd3
commit 5d84656
Show file tree

Hide file tree

Showing 13 changed files with 35 additions and 29 deletions.
diff --git a/.swift-version b/.swift-version
@@ -1 +1 @@
-4.0
+4.2
diff --git a/BetterSegmentedControl.podspec b/BetterSegmentedControl.podspec
@@ -1,17 +1,18 @@
 Pod::Spec.new do |s|
 s.name             = "BetterSegmentedControl"
-s.version          = "1.0"
+s.version          = "1.0.1"
+s.swift_version    = "4.2"
 s.summary          = "An easy to use, customizable replacement for UISegmentedControl & UISwitch."
 s.description      = <<-DESC
 BetterSegmentedControl is an easy to use, customizable replacement for UISegmentedControl and UISwitch written in Swift.
 DESC
 s.homepage         = "https://github.com/gmarm/BetterSegmentedControl"
 s.license          = 'MIT'
 s.author           = { "George Marmaridis" => "[email protected]" }
-s.source           = { :git => "https://github.com/gmarm/BetterSegmentedControl.git", :tag => "1.0" }
+s.source           = { :git => "https://github.com/gmarm/BetterSegmentedControl.git", :tag => "1.0.1" }
 s.social_media_url = 'https://twitter.com/gmarmas'
-s.platform     = :ios, '8.0'
-s.requires_arc = true
-s.source_files = 'Pod/Classes/**/*'
-s.frameworks = 'UIKit'
+s.platform         = :ios, '8.0'
+s.requires_arc     = true
+s.source_files     = 'Pod/Classes/**/*'
+s.frameworks       = 'UIKit'
 end
diff --git a/Example/BetterSegmentedControl.xcodeproj/project.pbxproj b/Example/BetterSegmentedControl.xcodeproj/project.pbxproj
@@ -221,11 +221,11 @@
 				TargetAttributes = {
 					607FACCF1AFB9204008FA782 = {
 						CreatedOnToolsVersion = 6.3.1;
-						LastSwiftMigration = 0900;
+						LastSwiftMigration = 1000;
 					};
 					607FACE41AFB9204008FA782 = {
 						CreatedOnToolsVersion = 6.3.1;
-						LastSwiftMigration = 0900;
+						LastSwiftMigration = 1000;
 						TestTargetID = 607FACCF1AFB9204008FA782;
 					};
 				};
@@ -547,6 +547,7 @@
 				MODULE_NAME = ExampleApp;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -560,6 +561,7 @@
 				MODULE_NAME = ExampleApp;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};
@@ -577,6 +579,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 4.2;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/BetterSegmentedControl_Example.app/BetterSegmentedControl_Example";
 			};
 			name = Debug;
@@ -591,6 +594,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 4.2;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/BetterSegmentedControl_Example.app/BetterSegmentedControl_Example";
 			};
 			name = Release;

diff --git a/Example/BetterSegmentedControl/AppDelegate.swift b/Example/BetterSegmentedControl/AppDelegate.swift
@@ -13,7 +13,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
     var window: UIWindow?
 
-    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         // Override point for customization after application launch.
         return true
     }

diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/...etterSegmentedControl__when_initialized__as_example_2__renders_correctly@3x.png b/...etterSegmentedControl__when_initialized__as_example_2__renders_correctly@3x.png
diff --git a/...etterSegmentedControl__when_initialized__as_example_3__renders_correctly@3x.png b/...etterSegmentedControl__when_initialized__as_example_3__renders_correctly@3x.png
diff --git a/...etterSegmentedControl__when_initialized__as_example_4__renders_correctly@3x.png b/...etterSegmentedControl__when_initialized__as_example_4__renders_correctly@3x.png
diff --git a/...etterSegmentedControl__when_initialized__as_example_5__renders_correctly@3x.png b/...etterSegmentedControl__when_initialized__as_example_5__renders_correctly@3x.png
diff --git a/...etterSegmentedControl__when_initialized__as_example_6__renders_correctly@3x.png b/...etterSegmentedControl__when_initialized__as_example_6__renders_correctly@3x.png
diff --git a/...terSegmentedControl__when_initialized__as_example_6__renders_correctly_2@3x.png b/...terSegmentedControl__when_initialized__as_example_6__renders_correctly_2@3x.png
diff --git a/...etterSegmentedControl__when_initialized__as_example_8__renders_correctly@3x.png b/...etterSegmentedControl__when_initialized__as_example_8__renders_correctly@3x.png
diff --git a/Pod/Classes/BetterSegmentedControl.swift b/Pod/Classes/BetterSegmentedControl.swift
@@ -301,7 +301,7 @@ import Foundation
                            delay: 0.0,
                            usingSpringWithDamping: bouncesOnChange ? Animation.springDamping : 1.0,
                            initialSpringVelocity: 0.0,
-                           options: [UIViewAnimationOptions.beginFromCurrentState, UIViewAnimationOptions.curveEaseOut],
+                           options: [UIView.AnimationOptions.beginFromCurrentState, UIView.AnimationOptions.curveEaseOut],
                            animations: {
                             () -> Void in
                             self.moveIndicatorView()