Merge pull request #85 from corin8823/swift4

Support Swift4
corin8823 · Oct 8, 2017 · f479b06 · f479b06
2 parents 8639358 + 175f0c8
commit f479b06
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 10 deletions.
diff --git a/.swift-version b/.swift-version
@@ -1 +1 @@
-3.0
+4.0
diff --git a/.travis.yml b/.travis.yml
@@ -1,11 +1,11 @@
 osx_image: xcode9
 language: objective-c
 install:
-- gem install cocoapods -v 1.1.1 --no-document
+- gem install cocoapods -v 1.3.1 --no-document
 
 before_script:
 - cd Example
 - pod install
 
 script:
-- xcodebuild -workspace Popover.xcworkspace -scheme "PopoverExample" -destination 'platform=iOS Simulator,OS=10.0,name=iPhone 6s' build test | xcpretty
+- xcodebuild -workspace Popover.xcworkspace -scheme "PopoverExample" -destination 'platform=iOS Simulator,OS=11.0,name=iPhone 8' build test | xcpretty
diff --git a/Classes/Popover.swift b/Classes/Popover.swift
@@ -297,7 +297,7 @@ open class Popover: UIView {
     UIView.animate(withDuration: self.animationIn / 3,
       delay: 0,
       options: .curveLinear,
-      animations: { _ in
+      animations: {
         self.blackOverlay.alpha = 1
       }, completion: { _ in
     })
@@ -308,7 +308,7 @@ open class Popover: UIView {
     return true
   }
 
-  open func dismiss() {
+  @objc open func dismiss() {
     if self.superview != nil {
       self.willDismissHandler?()
       UIView.animate(withDuration: self.animationOut, delay: 0,

diff --git a/Example/Popover.xcodeproj/project.pbxproj b/Example/Popover.xcodeproj/project.pbxproj
@@ -196,12 +196,13 @@
 				TargetAttributes = {
 					01A491C91E222AFB007E15FA = {
 						CreatedOnToolsVersion = 8.2.1;
+						LastSwiftMigration = 0900;
 						ProvisioningStyle = Automatic;
 						TestTargetID = 607FACCF1AFB9204008FA782;
 					};
 					607FACCF1AFB9204008FA782 = {
 						CreatedOnToolsVersion = 6.3.1;
-						LastSwiftMigration = 0800;
+						LastSwiftMigration = 0900;
 					};
 				};
 			};
@@ -359,7 +360,8 @@
 				PRODUCT_BUNDLE_IDENTIFIER = corin8823.PopoverExampleTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 4.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/PopoverExample.app/PopoverExample";
 			};
 			name = Debug;
@@ -375,7 +377,8 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = corin8823.PopoverExampleTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 4.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/PopoverExample.app/PopoverExample";
 			};
 			name = Release;
@@ -495,7 +498,8 @@
 				MODULE_NAME = ExampleApp;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -515,7 +519,8 @@
 				MODULE_NAME = ExampleApp;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};