Merge pull request #18 from manjirimoghe/master

swift5 changes
gametimesf · Jun 6, 2019 · 03ac9f0 · 03ac9f0
2 parents c251fa9 + ee66eb5
commit 03ac9f0
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 8 deletions.
diff --git a/GTHalfSheet/GTSheet.xcodeproj/project.pbxproj b/GTHalfSheet/GTSheet.xcodeproj/project.pbxproj
@@ -163,7 +163,7 @@
 				TargetAttributes = {
 					6FB0B4D61F75845600A4F6D4 = {
 						CreatedOnToolsVersion = 9.0;
-						LastSwiftMigration = 0900;
+						LastSwiftMigration = 1020;
 						ProvisioningStyle = Manual;
 					};
 				};
@@ -351,7 +351,7 @@
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -375,7 +375,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;

diff --git a/GTHalfSheet/GTSheet.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/GTHalfSheet/GTSheet.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/GTHalfSheet/GTSheet/Presentation Logic/PresentationManager.swift b/GTHalfSheet/GTSheet/Presentation Logic/PresentationManager.swift
@@ -52,11 +52,11 @@ public class HalfSheetPresentationManager: NSObject, UIGestureRecognizerDelegate
     public override init() {
         super.init()
 
-        NotificationCenter.default.addObserver(forName: NSNotification.Name.UIApplicationWillResignActive, object: nil, queue: OperationQueue.main) { [weak self] _ in
+        NotificationCenter.default.addObserver(forName: UIApplication.willResignActiveNotification, object: nil, queue: OperationQueue.main) { [weak self] _ in
             self?.unlinkDisplay()
         }
 
-        NotificationCenter.default.addObserver(forName: NSNotification.Name.UIApplicationDidBecomeActive, object: nil, queue: OperationQueue.main) { [weak self] _ in
+        NotificationCenter.default.addObserver(forName: UIApplication.didBecomeActiveNotification, object: nil, queue: OperationQueue.main) { [weak self] _ in
             self?.linkDisplay()
         }
 
@@ -237,7 +237,7 @@ extension HalfSheetPresentationManager {
         copyPresentingViewToTransitionContext(afterScreenUpdate: true)
         displayLink?.invalidate()
         displayLink = UIScreen.main.displayLink(withTarget: self, selector: #selector(HalfSheetPresentationManager.displayDidRefresh(_:)))
-        displayLink?.add(to: .main, forMode: .defaultRunLoopMode)
+        displayLink?.add(to: .main, forMode: RunLoop.Mode.default)
     }
 
     @objc private func displayDidRefresh(_ displayLink: CADisplayLink) {

diff --git a/GTHalfSheet/GTSheet/Utilities/AnimatorConvenience.swift b/GTHalfSheet/GTSheet/Utilities/AnimatorConvenience.swift
@@ -9,7 +9,7 @@
 import Foundation
 
 protocol AnimatorConvenience {
-    weak var manager: HalfSheetPresentationManager? { get }
+    var manager: HalfSheetPresentationManager? { get }
 }
 
 extension AnimatorConvenience {

diff --git a/GTHalfSheet/GTSheet/Utilities/Protocols.swift b/GTHalfSheet/GTSheet/Utilities/Protocols.swift
@@ -37,7 +37,7 @@ internal extension Array where Element == DismissMethod {
 }
 
 public protocol HalfSheetPresentableProtocol: class {
-    weak var managedScrollView: UIScrollView? { get }
+    var managedScrollView: UIScrollView? { get }
     var dismissMethod: [DismissMethod] { get }
     var sheetHeight: CGFloat? { get }
 }