Merge pull request #37 from nodes-ios/swift-3.0

Updating master to swift 3

Author: mariusc

.travis.yml

@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode7.3
+osx_image: xcode8.1
 branches:
   only:
     - master
@@ -9,12 +9,12 @@ env:
   - PROJECT_NAME="Codemine.xcodeproj"
   - IOS_FRAMEWORK_SCHEME="Codemine"
 
-  - IOS_SDK=iphonesimulator9.3
-  - OSX_SDK=macosx10.11
-  - TVOS_SDK=appletvsimulator9.2
-  - WATCHOS_SDK=watchsimulator2.2
+  - IOS_SDK=iphonesimulator10.1
+  - OSX_SDK=macosx10.12
+  - TVOS_SDK=appletvsimulator10.0
+  - WATCHOS_SDK=watchsimulator3.1
   matrix:
-  - DESTINATION="OS=9.3,name=iPhone 6S Plus"     SCHEME="$IOS_FRAMEWORK_SCHEME"     SDK="$IOS_SDK"     RUN_TESTS="YES"
+  - DESTINATION="OS=10.1,name=iPhone 6S Plus"     SCHEME="$IOS_FRAMEWORK_SCHEME"     SDK="$IOS_SDK"     RUN_TESTS="YES"
 
 script:
   - set -o pipefail

Codemine.xcodeproj/project.pbxproj

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0730"
+   LastUpgradeVersion = "0800"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Codemine.xcodeproj/xcshareddata/xcschemes/Codemine-Mac.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0730"
+   LastUpgradeVersion = "0800"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Codemine.xcodeproj/xcshareddata/xcschemes/Codemine-tvOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0730"
+   LastUpgradeVersion = "0800"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Codemine.xcodeproj/xcshareddata/xcschemes/Codemine-watchOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0710"
+   LastUpgradeVersion = "0800"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Codemine.xcodeproj/xcshareddata/xcschemes/Codemine.xcscheme

@@ -23,9 +23,9 @@ import Foundation
 
 public struct Application {
 
-    private static func getString(key: String) -> String {
-        guard let infoDictionary = NSBundle.mainBundle().infoDictionary,
-            value = infoDictionary[key] as? String
+    fileprivate static func getString(_ key: String) -> String {
+        guard let infoDictionary = Bundle.main.infoDictionary,
+            let value = infoDictionary[key] as? String
             else { return "" }
 
         return value
@@ -52,10 +52,10 @@ public struct Application {
     }()
 
     public static var schemes: [String] = {
-        guard let infoDictionary = NSBundle.mainBundle().infoDictionary,
-            urlTypes = infoDictionary["CFBundleURLTypes"] as? [AnyObject],
-            urlType = urlTypes.first as? [String : AnyObject],
-            urlSchemes = urlType["CFBundleURLSchemes"] as? [String]
+        guard let infoDictionary = Bundle.main.infoDictionary,
+            let urlTypes = infoDictionary["CFBundleURLTypes"] as? [AnyObject],
+            let urlType = urlTypes.first as? [String : AnyObject],
+            let urlSchemes = urlType["CFBundleURLSchemes"] as? [String]
             else { return [] }
 
         return urlSchemes
@@ -65,4 +65,4 @@ public struct Application {
         return schemes.first
     }()
 
-}
+}

Codemine/Application.swift

@@ -21,7 +21,7 @@ public extension CGPoint {
 
      - Returns: `Boolean` - if close to return true, else false.
      */
-    func isCloseTo(point: CGPoint, tolerance: CGFloat) -> Bool {
+    func isCloseTo(_ point: CGPoint, tolerance: CGFloat) -> Bool {
         let xIsClose = self.x <= point.x + tolerance && self.x >= point.x - tolerance
         let yIsClose = self.y <= point.y + tolerance && self.y >= point.y - tolerance
         return xIsClose && yIsClose

Codemine/Extensions/CGPoint+Utilities.swift

@@ -13,7 +13,7 @@ public extension CGRect {
     /// Getter & Setter for a `CGRect`'s  `origin.y`
     public var y: CGFloat {
         set {
-            self = CGRect(origin: CGPointMake(origin.x, newValue), size: size)
+            self = CGRect(origin: CGPoint(x: origin.x, y: newValue), size: size)
         }
         get {
             return self.origin.y
@@ -23,7 +23,7 @@ public extension CGRect {
     /// Getter & Setter for a `CGRect`s `origin.x`
     public var x: CGFloat {
         set {
-            self = CGRect(origin: CGPointMake(newValue, origin.y), size: size)
+            self = CGRect(origin: CGPoint(x: newValue, y: origin.y), size: size)
         }
         get {
             return self.origin.x
@@ -35,7 +35,7 @@ public extension CGRect {
 
      - returns: a new CGRect with the width and height reversed to those of the current one
      */
-    public func rectByReversingSize() -> CGRect {
-        return CGRect(origin: self.origin, size: CGSizeMake(self.height, self.width))
+	public var reversingSize: CGRect {
+        return CGRect(origin: origin, size: CGSize(width: height, height: width))
     }
-}
+}

Codemine/Extensions/CGRect+Utilities.swift

@@ -0,0 +1,23 @@
+//
+//  DispatchTime+Utilities.swift
+//  Codemine
+//
+//  Created by Marius Constantinescu on 11/11/2016.
+//  Copyright © 2016 Nodes. All rights reserved.
+//
+
+import Foundation
+
+// Credits for this go to Russ Bishop http://www.russbishop.net/quick-easy-dispatchtime
+
+extension DispatchTime: ExpressibleByIntegerLiteral {
+    public init(integerLiteral value: Int) {
+        self = DispatchTime.now() + .seconds(value)
+    }
+}
+
+extension DispatchTime: ExpressibleByFloatLiteral {
+    public init(floatLiteral value: Double) {
+        self = DispatchTime.now() + .milliseconds(Int(value * 1000))
+    }
+}