fixed merge conflicts

Motion.podspec

@@ -1,6 +1,7 @@
 Pod::Spec.new do |s|
   s.name = 'Motion'
-  s.version = '1.3.5'
+  s.version = '1.4.0'
+  s.swift_version = '4.0'
   s.license = 'MIT'
   s.summary = 'A library used to create beautiful animations and transitions for Apple devices.'
   s.homepage = 'http://cosmicmind.com'

Motion.xcodeproj/project.pbxproj

@@ -317,7 +317,7 @@
 		96C98DC81E424AB000B22906 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0900;
+				LastUpgradeCheck = 0930;
 				ORGANIZATIONNAME = "CosmicMind, Inc.";
 				TargetAttributes = {
 					96C98DD01E424AB000B22906 = {
@@ -411,13 +411,15 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				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_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -471,13 +473,15 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				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_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;

Motion.xcodeproj/xcshareddata/xcschemes/Motion iOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0920"
+   LastUpgradeVersion = "0930"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
@@ -37,7 +36,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

Sources/Animator/MotionAnimator.swift

@@ -30,7 +30,7 @@ import UIKit
 
 public protocol MotionAnimator: class {
   /// A reference to Motion.
-  weak var motion: MotionTransition! { get set }
+  var motion: MotionTransition! { get set }
 
   /// Cleans the contexts.
   func clean()

Sources/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.5</string>
+	<string>1.4.0</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>

Sources/MotionContext.swift

@@ -234,7 +234,7 @@ public extension MotionContext {
     case .optimized:
       #if os(tvOS)
         snapshot = view.snapshotView(afterScreenUpdates: true)!
-        
+
       #else
         if #available(iOS 9.0, *), let stackView = view as? UIStackView {
           snapshot = stackView.slowSnapshotView()
@@ -272,15 +272,13 @@ public extension MotionContext {
         } else {
           snapshot = view.snapshotView() ?? UIView()
         }
-
       #endif
     }
 
     #if os(tvOS)
       if let imageView = view as? UIImageView, imageView.adjustsImageWhenAncestorFocused {
         snapshot.frame = imageView.focusedFrameGuide.layoutFrame
       }
-
     #endif
 
     view.layer.cornerRadius = oldCornerRadius

Sources/Preprocessors/MotionPreprocessor.swift

@@ -30,7 +30,7 @@ import UIKit
 
 public protocol MotionPreprocessor: class {
   /// A reference to Motion.
-  weak var motion: MotionTransition! { get set }
+  var motion: MotionTransition! { get set }
 
   /**
    Processes the transitionary views.

Sources/Preprocessors/TransitionPreprocessor.swift

@@ -329,11 +329,11 @@ class TransitionPreprocessor: MotionCorePreprocessor {
       }
 
       #if os(tvOS)
-        context[fromView] = [.fade]
+      context[fromView] = [.fade]
       #else
-        if (!isPresenting && toOverFullScreen) || !fv.isOpaque || (fv.backgroundColor?.alphaComponent ?? 1) < 1 {
-          context[fv] = [.fadeOut]
-        }
+      if (!isPresenting && toOverFullScreen) || !fv.isOpaque || (fv.backgroundColor?.alphaComponent ?? 1) < 1 {
+        context[fv] = [.fadeOut]
+      }
       #endif
 
       context[tv]!.append(.durationMatchLongest)

Sources/Transition/MotionTransition+Start.swift

@@ -238,19 +238,19 @@ fileprivate extension MotionTransition {
   func processAnimation() {
     #if os(tvOS)
       animate()
-      
+
     #else
-      if isNavigationController {
-        // When animating within navigationController, we have to dispatch later into the main queue.
-        // otherwise snapshots will be pure white. Possibly a bug with UIKit
-        Motion.async { [weak self] in
-          self?.animate()
-        }
-
-      } else {
-        animate()
+    if isNavigationController {
+      // When animating within navigationController, we have to dispatch later into the main queue.
+      // otherwise snapshots will be pure white. Possibly a bug with UIKit
+      Motion.async { [weak self] in
+        self?.animate()
       }
 
+    } else {
+      animate()
+    }
+
     #endif
   }
 }