Supports swift4

shoheiyokoyama · Oct 9, 2017 · a7eda4f · a7eda4f
1 parent ede7a65
commit a7eda4f
Show file tree

Hide file tree

Showing 12 changed files with 37 additions and 21 deletions.
diff --git a/Example/Gemini.xcodeproj/project.pbxproj b/Example/Gemini.xcodeproj/project.pbxproj
@@ -296,11 +296,11 @@
 				TargetAttributes = {
 					607FACCF1AFB9204008FA782 = {
 						CreatedOnToolsVersion = 6.3.1;
-						LastSwiftMigration = 0820;
+						LastSwiftMigration = 0900;
 					};
 					607FACE41AFB9204008FA782 = {
 						CreatedOnToolsVersion = 6.3.1;
-						LastSwiftMigration = 0820;
+						LastSwiftMigration = 0900;
 						ProvisioningStyle = Automatic;
 						TestTargetID = 607FACCF1AFB9204008FA782;
 					};
@@ -573,7 +573,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 = On;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -588,7 +589,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 = On;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};
@@ -610,7 +612,8 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -628,7 +631,8 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};

diff --git a/Example/Gemini/AppDelegate.swift b/Example/Gemini/AppDelegate.swift
@@ -22,7 +22,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         window?.makeKeyAndVisible()
 
         UINavigationBar.appearance().tintColor = .white
-        UINavigationBar.appearance().titleTextAttributes = [NSForegroundColorAttributeName : UIColor.white]
+        UINavigationBar.appearance().titleTextAttributes = [NSAttributedStringKey.foregroundColor : UIColor.white]
         UINavigationBar.appearance().setBackgroundImage(image(of: UIColor.black.withAlphaComponent(0.75)), for: .default)
         UINavigationBar.appearance().shadowImage = UIImage()
 

diff --git a/Example/Gemini/ViewControllers/CircleRotationViewController.swift b/Example/Gemini/ViewControllers/CircleRotationViewController.swift
@@ -57,7 +57,7 @@ final class CircleRotationViewController: UIViewController {
         view.addGestureRecognizer(gesture)
     }
 
-    func toggleNavigationBarHidden(_ gestureRecognizer: UITapGestureRecognizer) {
+    @objc func toggleNavigationBarHidden(_ gestureRecognizer: UITapGestureRecognizer) {
         let isNavigationBarHidden = navigationController?.isNavigationBarHidden ?? true
         navigationController?.setNavigationBarHidden(!isNavigationBarHidden, animated: true)
     }

diff --git a/Example/Gemini/ViewControllers/CubeViewController.swift b/Example/Gemini/ViewControllers/CubeViewController.swift
@@ -52,7 +52,7 @@ final class CubeViewController: UIViewController {
         view.addGestureRecognizer(gesture)
     }
 
-    func toggleNavigationBarHidden(_ gestureRecognizer: UITapGestureRecognizer) {
+    @objc func toggleNavigationBarHidden(_ gestureRecognizer: UITapGestureRecognizer) {
         let isNavigationBarHidden = navigationController?.isNavigationBarHidden ?? true
         navigationController?.setNavigationBarHidden(!isNavigationBarHidden, animated: true)
     }

diff --git a/Example/Gemini/ViewControllers/CustomAnimationViewController.swift b/Example/Gemini/ViewControllers/CustomAnimationViewController.swift
@@ -95,7 +95,7 @@ final class CustomAnimationViewController: UIViewController {
         }
     }
 
-    func toggleNavigationBarHidden(_ gestureRecognizer: UITapGestureRecognizer) {
+    @objc func toggleNavigationBarHidden(_ gestureRecognizer: UITapGestureRecognizer) {
         let isNavigationBarHidden = navigationController?.isNavigationBarHidden ?? true
         navigationController?.setNavigationBarHidden(!isNavigationBarHidden, animated: true)
     }

diff --git a/Example/Gemini/ViewControllers/PitchRotationViewController.swift b/Example/Gemini/ViewControllers/PitchRotationViewController.swift
@@ -68,7 +68,7 @@ final class PitchRotationViewController: UIViewController {
         view.layer.insertSublayer(gradientLayer, at: 0)
     }
 
-    func toggleNavigationBarHidden(_ gestureRecognizer: UITapGestureRecognizer) {
+    @objc func toggleNavigationBarHidden(_ gestureRecognizer: UITapGestureRecognizer) {
         let isNavigationBarHidden = navigationController?.isNavigationBarHidden ?? true
         navigationController?.setNavigationBarHidden(!isNavigationBarHidden, animated: true)
     }

diff --git a/Example/Gemini/ViewControllers/RollRotationViewController.swift b/Example/Gemini/ViewControllers/RollRotationViewController.swift
@@ -72,7 +72,7 @@ final class RollRotationViewController: UIViewController {
         super.viewDidAppear(animated)
     }
 
-    func toggleNavigationBarHidden(_ gestureRecognizer: UITapGestureRecognizer) {
+    @objc func toggleNavigationBarHidden(_ gestureRecognizer: UITapGestureRecognizer) {
         let isNavigationBarHidden = navigationController?.isNavigationBarHidden ?? true
         navigationController?.setNavigationBarHidden(!isNavigationBarHidden, animated: true)
     }

diff --git a/Example/Gemini/ViewControllers/ScaleAnimationViewController.swift b/Example/Gemini/ViewControllers/ScaleAnimationViewController.swift
@@ -59,7 +59,7 @@ final class ScaleAnimationViewController: UIViewController {
         collectionView.decelerationRate = UIScrollViewDecelerationRateFast
     }
 
-    func toggleNavigationBarHidden(_ gestureRecognizer: UITapGestureRecognizer) {
+    @objc func toggleNavigationBarHidden(_ gestureRecognizer: UITapGestureRecognizer) {
         let isNavigationBarHidden = navigationController?.isNavigationBarHidden ?? true
         navigationController?.setNavigationBarHidden(!isNavigationBarHidden, animated: true)
     }

diff --git a/Example/Gemini/ViewControllers/YawRotationViewController.swift b/Example/Gemini/ViewControllers/YawRotationViewController.swift
@@ -60,7 +60,7 @@ final class YawRotationViewController: UIViewController {
         collectionView.decelerationRate = UIScrollViewDecelerationRateFast
     }
 
-    func toggleNavigationBarHidden(_ gestureRecognizer: UITapGestureRecognizer) {
+    @objc func toggleNavigationBarHidden(_ gestureRecognizer: UITapGestureRecognizer) {
         let isNavigationBarHidden = navigationController?.isNavigationBarHidden ?? true
         navigationController?.setNavigationBarHidden(!isNavigationBarHidden, animated: true)
     }

diff --git a/Example/Gemini/Views/PlayerView.swift b/Example/Gemini/Views/PlayerView.swift
@@ -24,12 +24,12 @@ final class PlayerView: UIView {
 
     override init(frame: CGRect) {
         super.init(frame: frame)
-        playerLayer.videoGravity = AVLayerVideoGravityResizeAspectFill
+        playerLayer.videoGravity = AVLayerVideoGravity.resizeAspectFill
     }
 
     required init?(coder aDecoder: NSCoder) {
         super.init(coder: aDecoder)
-        playerLayer.videoGravity = AVLayerVideoGravityResizeAspectFill
+        playerLayer.videoGravity = AVLayerVideoGravity.resizeAspectFill
     }
 
     func setVideoURL(_ url: URL) {

diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/README.md b/README.md
@@ -316,7 +316,7 @@ To run the example project, clone the repo, and run `pod install` from the Examp
 ## <a name="requirements"> Requirements
 
 - Xcode 9.0+
-- Swift 3.2
+- Swift 4.0
 
 ## <a name="installation"> Installation