Merge branch 'swift4'

Touchwonders · Jan 24, 2018 · 8f614f3 · 8f614f3
2 parents 289915c + a22f930
commit 8f614f3
Show file tree

Hide file tree

Showing 25 changed files with 238 additions and 205 deletions.
diff --git a/.swift-version b/.swift-version
@@ -1 +1 @@
-3.0
+4.0
diff --git a/Examples/BuiltInTransitionsCatalog/BuiltInTransitionsCatalog.xcodeproj/project.pbxproj b/Examples/BuiltInTransitionsCatalog/BuiltInTransitionsCatalog.xcodeproj/project.pbxproj
@@ -141,6 +141,7 @@
 					BA7592D91E5CC79B00B021BF = {
 						CreatedOnToolsVersion = 8.2.1;
 						DevelopmentTeam = LQ449R4NTB;
+						LastSwiftMigration = 0900;
 						ProvisioningStyle = Automatic;
 					};
 				};
@@ -363,7 +364,8 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.touchwonders.BuiltInTransitionsCatalog;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -376,7 +378,8 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.touchwonders.BuiltInTransitionsCatalog;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};

diff --git a/Examples/BuiltInTransitionsCatalog/BuiltInTransitionsCatalog/AppDelegate.swift b/Examples/BuiltInTransitionsCatalog/BuiltInTransitionsCatalog/AppDelegate.swift
@@ -31,7 +31,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
         if let navigationController = window?.rootViewController as? UINavigationController, let font = UIFont(name: transitionFontName, size: 20.0) {
-            navigationController.navigationBar.titleTextAttributes = [NSFontAttributeName: font, NSForegroundColorAttributeName: UIColor.white]
+            navigationController.navigationBar.titleTextAttributes = [NSAttributedStringKey.font: font, NSAttributedStringKey.foregroundColor: UIColor.white]
         }
         return true
     }

diff --git a/Examples/BuiltInTransitionsCatalog/Podfile.lock b/Examples/BuiltInTransitionsCatalog/Podfile.lock
@@ -1,5 +1,5 @@
 PODS:
-  - Transition (1.0.1)
+  - Transition (1.1.0)
 
 DEPENDENCIES:
   - Transition (from `../../`)
@@ -9,7 +9,7 @@ EXTERNAL SOURCES:
     :path: ../../
 
 SPEC CHECKSUMS:
-  Transition: ab1a745e3b93150eb50c15dd3238995fbf36c503
+  Transition: 1f9b5445a034df95edcb243f81952b3fda317d72
 
 PODFILE CHECKSUM: b59c970b89cb4702c2022cf9dcbc7f1aa68e099a
 

diff --git a/Examples/ModalTransitionsExample/ModalTransitionsExample.xcodeproj/project.pbxproj b/Examples/ModalTransitionsExample/ModalTransitionsExample.xcodeproj/project.pbxproj
@@ -174,6 +174,7 @@
 					BA3912A61E433FFA00F737D3 = {
 						CreatedOnToolsVersion = 8.2.1;
 						DevelopmentTeam = LQ449R4NTB;
+						LastSwiftMigration = 0900;
 						ProvisioningStyle = Automatic;
 					};
 				};
@@ -404,7 +405,8 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.touchwonders.ModalTransitionsExample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -418,7 +420,8 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.touchwonders.ModalTransitionsExample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};

diff --git a/...TransitionsExample/ModalTransitionsExample/Transitioning/ShapeInteractionController.swift b/...TransitionsExample/ModalTransitionsExample/Transitioning/ShapeInteractionController.swift
@@ -78,7 +78,7 @@ class ShapeInteractionController : NSObject, TransitionInteractionController {
 
     /// We register for the gesture to set the touch offset on the selected shape every time 
     /// that shapeView is touched (might be multiple times during transition).
-    func gestureStateChanged(_ gestureRecognizer: UIPanGestureRecognizer) {
+    @objc func gestureStateChanged(_ gestureRecognizer: UIPanGestureRecognizer) {
         if gestureRecognizer.state == .began, let transitioningShapeView = transitioningShapeView, let view = gestureRecognizer.view {
             let gestureLocationInView = gestureRecognizer.location(in: view)
             transitioningShapeView.touchOffset = gestureLocationInView - view.convert(transitioningShapeView.transitioningView.center, from: transitioningShapeView.transitioningView.superview)

diff --git a/Examples/ModalTransitionsExample/Podfile.lock b/Examples/ModalTransitionsExample/Podfile.lock
@@ -1,5 +1,5 @@
 PODS:
-  - Transition (1.0.1)
+  - Transition (1.1.0)
 
 DEPENDENCIES:
   - Transition (from `../../`)
@@ -9,7 +9,7 @@ EXTERNAL SOURCES:
     :path: ../../
 
 SPEC CHECKSUMS:
-  Transition: ab1a745e3b93150eb50c15dd3238995fbf36c503
+  Transition: 1f9b5445a034df95edcb243f81952b3fda317d72
 
 PODFILE CHECKSUM: bfe56d75f5bc5e03864425b1530d0fa17f87a5e0
 

diff --git a/Examples/NavigationTransitionsExample/Podfile.lock b/Examples/NavigationTransitionsExample/Podfile.lock
@@ -1,5 +1,5 @@
 PODS:
-  - Transition (1.0.1)
+  - Transition (1.1.0)
 
 DEPENDENCIES:
   - Transition (from `../../`)
@@ -9,7 +9,7 @@ EXTERNAL SOURCES:
     :path: ../../
 
 SPEC CHECKSUMS:
-  Transition: ab1a745e3b93150eb50c15dd3238995fbf36c503
+  Transition: 1f9b5445a034df95edcb243f81952b3fda317d72
 
 PODFILE CHECKSUM: c86542053e17e87eda5dccfd5d5a1fff31276cd2
 

diff --git a/Examples/NavigationTransitionsExample/Pods/Local Podspecs/Transition.podspec.json b/Examples/NavigationTransitionsExample/Pods/Local Podspecs/Transition.podspec.json
diff --git a/Examples/NavigationTransitionsExample/Pods/Manifest.lock b/Examples/NavigationTransitionsExample/Pods/Manifest.lock