Merge pull request #118 from devxoul/swift-4.0

devxoul · web-flow · commit 42630c95ee38 · 2017-09-22T16:32:36.000+09:00
Let's Swift 4.0
diff --git a/.travis.yml b/.travis.yml
@@ -1,13 +1,13 @@
 os: osx
-osx_image: xcode8
+osx_image: xcode9
 sudo: false
 language: objective-c
 
 env:
-  - SDK="iphoneos10.0"
+  - SDK="iphoneos11.0"
 
 script:
-  - xcodebuild clean build -sdk $SDK -configuration Debug CODE_SIGN_IDENTITY=\"\" CODE_SIGNING_REQUIRED=NO
+  - xcodebuild clean build -sdk $SDK -configuration Debug CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO
   
 before_install:
   - xcodebuild -showsdks
diff --git a/Demo/RootViewController.swift b/Demo/RootViewController.swift
@@ -64,7 +64,7 @@ final class RootViewController: UIViewController {
     appearance.cornerRadius = 20
   }
 
-  dynamic func showButtonTouchUpInside() {
+  @objc dynamic func showButtonTouchUpInside() {
     Toast(text: "Basic Toast").show()
     Toast(text: "You can set duration. `Delay.short` means 2 seconds.\n" +
       "`Delay.long` means 3.5 seconds.",
diff --git a/Sources/ToastCenter.swift b/Sources/ToastCenter.swift
@@ -66,7 +66,7 @@ open class ToastCenter {
 
   // MARK: Notifications
 
-  dynamic func deviceOrientationDidChange() {
+  @objc dynamic func deviceOrientationDidChange() {
     if let lastToast = self.queue.operations.first as? Toast {
       lastToast.view.setNeedsLayout()
     }
diff --git a/Sources/ToastView.swift b/Sources/ToastView.swift
@@ -38,28 +38,28 @@ open class ToastView: UIView {
   }
 
   /// The background view's corner radius.
-  open dynamic var cornerRadius: CGFloat {
+  @objc open dynamic var cornerRadius: CGFloat {
     get { return self.backgroundView.layer.cornerRadius }
     set { self.backgroundView.layer.cornerRadius = newValue }
   }
 
   /// The inset of the text label.
-  open dynamic var textInsets = UIEdgeInsets(top: 6, left: 10, bottom: 6, right: 10)
+  @objc open dynamic var textInsets = UIEdgeInsets(top: 6, left: 10, bottom: 6, right: 10)
 
   /// The color of the text label's text.
-  open dynamic var textColor: UIColor? {
+  @objc open dynamic var textColor: UIColor? {
     get { return self.textLabel.textColor }
     set { self.textLabel.textColor = newValue }
   }
 
   /// The font of the text label.
-  open dynamic var font: UIFont? {
+  @objc open dynamic var font: UIFont? {
     get { return self.textLabel.font }
     set { self.textLabel.font = newValue }
   }
 
   /// The bottom offset from the screen's bottom in portrait mode.
-  open dynamic var bottomOffsetPortrait: CGFloat = {
+  @objc open dynamic var bottomOffsetPortrait: CGFloat = {
     switch UIDevice.current.userInterfaceIdiom {
     case .unspecified: return 30
     case .phone: return 30
@@ -70,7 +70,7 @@ open class ToastView: UIView {
   }()
 
   /// The bottom offset from the screen's bottom in landscape mode.
-  open dynamic var bottomOffsetLandscape: CGFloat = {
+  @objc open dynamic var bottomOffsetLandscape: CGFloat = {
     switch UIDevice.current.userInterfaceIdiom {
     case .unspecified: return 20
     case .phone: return 20
diff --git a/Sources/ToastWindow.swift b/Sources/ToastWindow.swift
@@ -98,24 +98,24 @@ open class ToastWindow: UIWindow {
   }
 
   /// Bring ToastWindow to top when another window is being shown.
-  func bringWindowToTop(_ notification: Notification) {
+  @objc func bringWindowToTop(_ notification: Notification) {
     if !(notification.object is ToastWindow) {
       ToastWindow.shared.isHidden = true
       ToastWindow.shared.isHidden = false
     }
   }
 
-  dynamic func statusBarOrientationWillChange() {
+  @objc dynamic func statusBarOrientationWillChange() {
     self.isStatusBarOrientationChanging = true
   }
 
-  dynamic func statusBarOrientationDidChange() {
+  @objc dynamic func statusBarOrientationDidChange() {
     let orientation = UIApplication.shared.statusBarOrientation
     self.handleRotate(orientation)
     self.isStatusBarOrientationChanging = false
   }
 
-  func applicationDidBecomeActive() {
+  @objc func applicationDidBecomeActive() {
     let orientation = UIApplication.shared.statusBarOrientation
     self.handleRotate(orientation)
   }
diff --git a/Toaster.xcodeproj/project.pbxproj b/Toaster.xcodeproj/project.pbxproj
@@ -172,16 +172,16 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0700;
-				LastUpgradeCheck = 0800;
+				LastUpgradeCheck = 0900;
 				ORGANIZATIONNAME = "Suyeol Jeon";
 				TargetAttributes = {
 					03A75E2A1BCF2066002E46C4 = {
 						CreatedOnToolsVersion = 7.0.1;
-						LastSwiftMigration = 0800;
+						LastSwiftMigration = 0900;
 					};
 					03A75E4E1BCF20D4002E46C4 = {
 						CreatedOnToolsVersion = 7.0.1;
-						LastSwiftMigration = 0800;
+						LastSwiftMigration = 0900;
 					};
 				};
 			};
@@ -274,14 +274,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;
@@ -324,14 +330,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;
@@ -363,6 +375,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_ENABLE_MODULES = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
@@ -375,14 +388,15 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
 		03A75E411BCF2066002E46C4 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_ENABLE_MODULES = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
@@ -395,7 +409,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};
@@ -408,7 +422,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = kr.xoul.ToasterDemo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -422,7 +436,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = kr.xoul.ToasterDemo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};
diff --git a/Toaster.xcodeproj/xcshareddata/xcschemes/Toaster.xcscheme b/Toaster.xcodeproj/xcshareddata/xcschemes/Toaster.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0800"
+   LastUpgradeVersion = "0900"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
@@ -36,6 +37,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ final class RootViewController: UIViewController {`
`64`	`64`	`appearance.cornerRadius = 20`
`65`	`65`	`}`
`66`	`66`
`67`		`- dynamic func showButtonTouchUpInside() {`
	`67`	`+ @objc dynamic func showButtonTouchUpInside() {`
`68`	`68`	`Toast(text: "Basic Toast").show()`
`69`	`69`	Toast(text: "You can set duration. `Delay.short` means 2 seconds.\n" +
`70`	`70`	"`Delay.long` means 3.5 seconds.",
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ open class ToastCenter {`
`66`	`66`
`67`	`67`	`// MARK: Notifications`
`68`	`68`
`69`		`- dynamic func deviceOrientationDidChange() {`
	`69`	`+ @objc dynamic func deviceOrientationDidChange() {`
`70`	`70`	`if let lastToast = self.queue.operations.first as? Toast {`
`71`	`71`	`lastToast.view.setNeedsLayout()`
`72`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -98,24 +98,24 @@ open class ToastWindow: UIWindow {`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`/// Bring ToastWindow to top when another window is being shown.`
`101`		`- func bringWindowToTop(_ notification: Notification) {`
	`101`	`+ @objc func bringWindowToTop(_ notification: Notification) {`
`102`	`102`	`if !(notification.object is ToastWindow) {`
`103`	`103`	`ToastWindow.shared.isHidden = true`
`104`	`104`	`ToastWindow.shared.isHidden = false`
`105`	`105`	`}`
`106`	`106`	`}`
`107`	`107`
`108`		`- dynamic func statusBarOrientationWillChange() {`
	`108`	`+ @objc dynamic func statusBarOrientationWillChange() {`
`109`	`109`	`self.isStatusBarOrientationChanging = true`
`110`	`110`	`}`
`111`	`111`
`112`		`- dynamic func statusBarOrientationDidChange() {`
	`112`	`+ @objc dynamic func statusBarOrientationDidChange() {`
`113`	`113`	`let orientation = UIApplication.shared.statusBarOrientation`
`114`	`114`	`self.handleRotate(orientation)`
`115`	`115`	`self.isStatusBarOrientationChanging = false`
`116`	`116`	`}`
`117`	`117`
`118`		`- func applicationDidBecomeActive() {`
	`118`	`+ @objc func applicationDidBecomeActive() {`
`119`	`119`	`let orientation = UIApplication.shared.statusBarOrientation`
`120`	`120`	`self.handleRotate(orientation)`
`121`	`121`	`}`