From 6239656493fba609a11bef46efd495fca2379090 Mon Sep 17 00:00:00 2001 From: Alsey Coleman Miller Date: Wed, 22 Nov 2017 18:47:12 -0500 Subject: [PATCH] Removed Swift 3 NSGeometry support Should use https://github.com/PureSwift/Silica/releases/tag/1.3.1@swift-3 --- Sources/Silica/CGPoint.swift | 19 ------------------- Sources/Silica/CGRect.swift | 21 --------------------- Sources/Silica/CGSize.swift | 19 ------------------- 3 files changed, 59 deletions(-) delete mode 100755 Sources/Silica/CGPoint.swift delete mode 100755 Sources/Silica/CGSize.swift diff --git a/Sources/Silica/CGPoint.swift b/Sources/Silica/CGPoint.swift deleted file mode 100755 index 83cb2b5..0000000 --- a/Sources/Silica/CGPoint.swift +++ /dev/null @@ -1,19 +0,0 @@ -// -// CGPoint.swift -// Silica -// -// Created by Alsey Coleman Miller on 6/16/17. -// - -import struct Foundation.CGFloat -import struct Foundation.CGPoint - -#if os(Linux) -public extension CGPoint { - - #if swift(>=4) - #elseif swift(>=3.0.2) - public static var zero: CGPoint { return CGPoint() } - #endif -} -#endif diff --git a/Sources/Silica/CGRect.swift b/Sources/Silica/CGRect.swift index d8ff7d6..b5cc67f 100755 --- a/Sources/Silica/CGRect.swift +++ b/Sources/Silica/CGRect.swift @@ -214,25 +214,4 @@ public extension CGRect { } -// MARK: - Swift 3 compatibility - -#if swift(>=4) - -#elseif swift(>=3.0.2) - -public extension CGRect { - - public init(x: CGFloat, y: CGFloat, width: CGFloat, height: CGFloat) { - - self.origin = CGPoint(x: x, y: y) - self.size = CGSize(width: width, height: height) - } - - public static var zero: CGRect { return CGRect() } - - public static var null: CGRect { return CGRect(x: CGFloat.nan, y: CGFloat.nan, width: CGFloat.nan, height: CGFloat.nan) } -} - -#endif - #endif diff --git a/Sources/Silica/CGSize.swift b/Sources/Silica/CGSize.swift deleted file mode 100755 index c89b4b8..0000000 --- a/Sources/Silica/CGSize.swift +++ /dev/null @@ -1,19 +0,0 @@ -// -// CGSize.swift -// Silica -// -// Created by Alsey Coleman Miller on 6/16/17. -// - -import struct Foundation.CGFloat -import struct Foundation.CGSize - -#if os(Linux) - public extension CGSize { - - #if swift(>=4) - #elseif swift(>=3.0.2) - public static var zero: CGSize { return CGSize() } - #endif - } -#endif