Commit 5112af96 authored by Aral Balkan's avatar Aral Balkan

Update for Xcode 8 Beta 6

parent 4e103ed3
git "git@source.ind.ie:project/handle.git" "058e2b8b33bc2295d95a2aab8cb8a79ecd823041"
git "git@source.ind.ie:project/handle.git" "17f597747b1773149641836e8f35cd430f159134"
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0720"
LastUpgradeVersion = "0800"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
......
......@@ -46,9 +46,9 @@ public func delay(_ delay:Double, block:Block) -> CancellableDelayedCommand
// MARK: - Class
public class CancellableDelayedCommand
open class CancellableDelayedCommand
{
public var executed:Bool
open var executed:Bool
var originalBlock:Block
var delayedBlock:Block?
......@@ -105,14 +105,14 @@ public class CancellableDelayedCommand
}
public func cancel()
open func cancel()
{
// println("\(self): Cancelling.")
cancelled = true
}
public func reset() -> CancellableDelayedCommand?
open func reset() -> CancellableDelayedCommand?
{
//
// Cancels this command and creates and returns a new one
......
......@@ -7,7 +7,6 @@
objects = {
/* Begin PBXBuildFile section */
A7394BDD1CA435C70096FF28 /* Delay.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A7394BDC1CA435C70096FF28 /* Delay.framework */; };
A787D4771C24867500CDBF66 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = A787D4761C24867500CDBF66 /* AppDelegate.swift */; };
A787D4791C24867500CDBF66 /* IOSViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A787D4781C24867500CDBF66 /* IOSViewController.swift */; };
A787D47C1C24867500CDBF66 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A787D47A1C24867500CDBF66 /* Main.storyboard */; };
......@@ -61,7 +60,6 @@
buildActionMask = 2147483647;
files = (
A7E2C25F1CA43ACB00CD92AE /* Delay.framework in Frameworks */,
A7394BDD1CA435C70096FF28 /* Delay.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
......@@ -130,7 +128,7 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0720;
LastUpgradeCheck = 0720;
LastUpgradeCheck = 0800;
ORGANIZATIONNAME = "Aral Balkan";
TargetAttributes = {
A787D4721C24867500CDBF66 = {
......@@ -232,8 +230,10 @@
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_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
......@@ -277,8 +277,10 @@
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_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
......@@ -297,6 +299,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 9.2;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = YES;
};
......@@ -306,10 +309,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
FRAMEWORK_SEARCH_PATHS = (
"$(SRCROOT)/../Carthage/Build/iOS",
"$(PROJECT_DIR)/$(CONFIGURATION_BUILD_DIR)",
);
FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../Carthage/Build/iOS";
INFOPLIST_FILE = "DelayDemo-iOS/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "ind.ie.DelayDemo-iOS";
......@@ -322,10 +322,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
FRAMEWORK_SEARCH_PATHS = (
"$(SRCROOT)/../Carthage/Build/iOS",
"$(PROJECT_DIR)/$(CONFIGURATION_BUILD_DIR)",
);
FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../Carthage/Build/iOS";
INFOPLIST_FILE = "DelayDemo-iOS/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "ind.ie.DelayDemo-iOS";
......
......@@ -14,7 +14,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
var window: UIWindow?
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
private func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: Any]?) -> Bool {
// Override point for customization after application launch.
return true
}
......
......@@ -45,7 +45,7 @@ class IOSViewController: UIViewController, UITextFieldDelegate
override func viewWillAppear(_ animated:Bool)
{
super.viewWillAppear(animated)
textDidChangeNotificationHandler = handle(NSNotification.Name.UITextFieldTextDidChange.rawValue, from:throttledTextField)
textDidChangeNotificationHandler = handle(Notification.Name.UITextFieldTextDidChange.rawValue, from:throttledTextField)
{
/* with */ notification in
......@@ -108,8 +108,8 @@ class IOSViewController: UIViewController, UITextFieldDelegate
}
}
keyboardWillShowHandler = keyboardWillShowHandler ?? handle(NSNotification.Name.UIKeyboardWillShow.rawValue, with: keyboardVisibilityWillChangeHandler)
keyboardWillHideHandler = keyboardWillHideHandler ?? handle(NSNotification.Name.UIKeyboardWillHide.rawValue, with: keyboardVisibilityWillChangeHandler)
keyboardWillShowHandler = keyboardWillShowHandler ?? handle(Notification.Name.UIKeyboardWillShow.rawValue, with: keyboardVisibilityWillChangeHandler)
keyboardWillHideHandler = keyboardWillHideHandler ?? handle(Notification.Name.UIKeyboardWillHide.rawValue, with: keyboardVisibilityWillChangeHandler)
}
override func viewWillDisappear(_ animated:Bool)
......
......@@ -4,6 +4,8 @@ Delay is an easy-to-use micro-library for delaying code execution in a cancellab
**This is the Swift 3 branch.** Also available: [Master (Swift 2.2.1)](https://source.ind.ie/project/delay/tree/master) and [Swift 2.3](https://source.ind.ie/project/delay/tree/swift-2.3) branches.
**Supported on:** Xcode 8 Beta 6
## Installation
[![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment