Merge pull request #77 from natmark/natmark/fix-import-setting

Fix import setting
natmark · Jan 4, 2018 · fb3e74e · fb3e74e
2 parents 1e32f9b + 963090c
commit fb3e74e
Show file tree

Hide file tree

Showing 19 changed files with 99 additions and 40 deletions.
diff --git a/ProcessingKit.podspec b/ProcessingKit.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "ProcessingKit"
-  s.version      = "0.5.1"
+  s.version      = "0.6.0"
   s.summary      = "Visual Designing library for iOS."
   s.description  = <<-DESC
   ProcessingKit is a Visual Designing library for iOS.
@@ -12,9 +12,9 @@ Pod::Spec.new do |s|
   s.author             = { "Atsuya Sato" => "[email protected]" }
   s.osx.deployment_target = "10.11"
   s.ios.deployment_target = "10.0"
-  s.platforms = { :ios => "10.0", :osx => "10.11" }
   s.source       = { :git => "https://github.com/natmark/ProcessingKit.git", :tag => "#{s.version}" }
   s.source_files  = "ProcessingKit/**/*.swift"
   s.exclude_files = "ProcessingKit/Demo.playground/*"
+  s.ios.exclude_files = "ProcessingKit/Extensions/NSImage.swift", "ProcessingKit/Extensions/NSView.swift"
   s.requires_arc = true
 end
diff --git a/ProcessingKit.xcodeproj/project.pbxproj b/ProcessingKit.xcodeproj/project.pbxproj
@@ -535,6 +535,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				MACOSX_DEPLOYMENT_TARGET = 10.11;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -583,6 +584,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				MACOSX_DEPLOYMENT_TARGET = 10.11;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";

diff --git a/ProcessingKit/Color/Color.swift b/ProcessingKit/Color/Color.swift
@@ -8,6 +8,12 @@
 
 import Foundation
 
+#if os(iOS)
+import UIKit
+#elseif os(OSX)
+import Cocoa
+#endif
+
 class ColorComponents {
     var fill: UIColor = UIColor.white
     var stroke: UIColor = UIColor.clear

diff --git a/ProcessingKit/Constants/Constants.swift b/ProcessingKit/Constants/Constants.swift
@@ -8,6 +8,12 @@
 
 import Foundation
 
+#if os(iOS)
+import UIKit
+#elseif os(OSX)
+import Cocoa
+#endif
+
 public protocol Constants {
     var HALF_PI: CGFloat { get }
     var PI: CGFloat { get }

diff --git a/ProcessingKit/Environment/Frame.swift b/ProcessingKit/Environment/Frame.swift
@@ -8,6 +8,12 @@
 
 import Foundation
 
+#if os(iOS)
+import UIKit
+#elseif os(OSX)
+import Cocoa
+#endif
+
 class FrameComponents {
     var bounds: CGRect = CGRect.zero
     var frame: CGRect = CGRect.zero

diff --git a/ProcessingKit/Extensions/CGPoint.swift b/ProcessingKit/Extensions/CGPoint.swift
@@ -6,9 +6,11 @@
 //  Copyright © 2017年 Atsuya Sato. All rights reserved.
 //
 
-#if !os(iOS)
-    import Cocoa
-    typealias CGPoint = NSPoint
+#if os(iOS)
+import UIKit
+#elseif os(OSX)
+import Cocoa
+typealias CGPoint = NSPoint
 #endif
 
 extension CGPoint {

diff --git a/ProcessingKit/Extensions/NSImage.swift b/ProcessingKit/Extensions/NSImage.swift
@@ -7,7 +7,10 @@
 //
 
 import Foundation
+
+#if os(OSX)
 import Cocoa
+#endif
 
 extension NSImage {
     var cgImage: CGImage? {

diff --git a/ProcessingKit/Extensions/NSView.swift b/ProcessingKit/Extensions/NSView.swift
@@ -6,7 +6,9 @@
 //  Copyright © 2017年 Atsuya Sato. All rights reserved.
 //
 
+#if os(OSX)
 import Cocoa
+#endif
 
 extension NSView {
     var backgroundColor: NSColor? {

diff --git a/ProcessingKit/Extensions/String.swift b/ProcessingKit/Extensions/String.swift
@@ -6,16 +6,18 @@
 //  Copyright © 2017年 Atsuya Sato. All rights reserved.
 //
 
-#if !os(iOS)
-    import Cocoa
+#if os(iOS)
+import UIKit
+#else
+import Cocoa
 #endif
 
 extension String {
     func height(withConstrainedWidth width: CGFloat, font: UIFont) -> CGFloat {
         let constraintRect = CGSize(width: width, height: .greatestFiniteMagnitude)
         #if os(iOS)
             let boundingBox = self.boundingRect(with: constraintRect, options: .usesLineFragmentOrigin, attributes: [NSFontAttributeName: font], context: nil)
-        #else
+        #elseif os(OSX)
             let boundingBox = self.boundingRect(with: constraintRect, options: .usesLineFragmentOrigin, attributes: [NSFontAttributeName: font], context: nil)
         #endif
 

diff --git a/ProcessingKit/Extensions/UIColor.swift b/ProcessingKit/Extensions/UIColor.swift
@@ -6,8 +6,10 @@
 //  Copyright © 2017年 Atsuya Sato. All rights reserved.
 //
 
-#if !os(iOS)
-    import Cocoa
+#if os(iOS)
+import UIKit
+#elseif os(OSX)
+import Cocoa
 #endif
 
 extension UIColor {

diff --git a/ProcessingKit/Image/Image.swift b/ProcessingKit/Image/Image.swift
@@ -6,15 +6,17 @@
 //  Copyright © 2017年 Atsuya Sato. All rights reserved.
 //
 
-#if !os(iOS)
+#if os(iOS)
+import UIKit
+#elseif os(OSX)
 import Cocoa
 #endif
 
 public protocol ImageModelContract {
     #if os(iOS)
     func image(_ img: UIImage, _ x: CGFloat, _ y: CGFloat)
     func image(_ img: UIImage, _ x: CGFloat, _ y: CGFloat, _ width: CGFloat, _ height: CGFloat)
-    #else
+    #elseif os(OSX)
     func drawImage(_ img: NSImage, _ x: CGFloat, _ y: CGFloat)
     func drawImage(_ img: NSImage, _ x: CGFloat, _ y: CGFloat, _ width: CGFloat, _ height: CGFloat)
     #endif
@@ -43,7 +45,7 @@ struct ImageModel: ImageModelContract {
         }
         g?.restoreGState()
     }
-    #else
+    #elseif os(OSX)
     func drawImage(_ img: NSImage, _ x: CGFloat, _ y: CGFloat) {
         let g = MultiplatformCommon.getCurrentContext()
         g?.saveGState()
@@ -78,7 +80,7 @@ extension ProcessingView: ImageModelContract {
     public func image(_ img: UIImage, _ x: CGFloat, _ y: CGFloat, _ width: CGFloat, _ height: CGFloat) {
         self.imageModel.image(img, x, y, width, height)
     }
-    #else
+    #elseif os(OSX)
     public func drawImage(_ img: NSImage, _ x: CGFloat, _ y: CGFloat) {
         self.imageModel.drawImage(img, x, y)
     }

diff --git a/ProcessingKit/Input/Event.swift b/ProcessingKit/Input/Event.swift
@@ -6,12 +6,14 @@
 //  Copyright © 2017年 Atsuya Sato. All rights reserved.
 //
 
-#if !os(iOS)
+import Foundation
+
+#if os(iOS)
+import UIKit
+#elseif os(OSX)
 import Cocoa
 #endif
 
-import Foundation
-
 class EventComponents {
     #if os(iOS)
     var fingerTapped = false
@@ -22,7 +24,7 @@ class EventComponents {
     var touchY: CGFloat = 0.0
     var touchesX: Set<CGFloat> = []
     var touchesY: Set<CGFloat> = []
-    #else
+    #elseif os(OSX)
     var mouseClicked = false
     var mouseDragged = false
     var mouseMoved = false
@@ -43,7 +45,7 @@ protocol EventModelContract {
     mutating func touchesBegan(_ touches: Set<UITouch>, with event: UIEvent?)
     mutating func touchesMoved(_ touches: Set<UITouch>, with event: UIEvent?)
     mutating func touchesEnded(_ touches: Set<UITouch>, with event: UIEvent?)
-    #else
+    #elseif os(OSX)
     var mousePressed: Bool { get }
     var mouseX: CGFloat { get }
     var mouseY: CGFloat { get }
@@ -86,7 +88,7 @@ struct EventModel: EventModelContract {
     var touchesY: Set<CGFloat> {
         return self.eventComponents.touchesY
     }
-    #else
+    #elseif os(OSX)
     var mousePressed: Bool {
         return self.eventComponents.mousePressed
     }
@@ -132,7 +134,7 @@ struct EventModel: EventModelContract {
             }
         }
     }
-    #else
+    #elseif os(OSX)
     mutating func mouseDown(with event: NSEvent) {
         self.eventComponents.mouseX = event.locationInWindow.x
         self.eventComponents.mouseY = event.locationInWindow.y
@@ -190,7 +192,7 @@ extension ProcessingView: EventModelContract {
     public var touchesY: Set<CGFloat> {
         return self.eventModel.touchesY
     }
-    #else
+    #elseif os(OSX)
     public var mousePressed: Bool {
         return self.eventModel.mousePressed
     }
@@ -217,7 +219,7 @@ extension ProcessingView: EventModelContract {
     open override func touchesEnded(_ touches: Set<UITouch>, with event: UIEvent?) {
         self.eventModel.touchesEnded(touches, with: event)
     }
-    #else
+    #elseif os(OSX)
     open override func mouseDown(with event: NSEvent) {
         self.eventModel.mouseDown(with: event)
     }

diff --git a/ProcessingKit/MultiplatformCommon.swift b/ProcessingKit/MultiplatformCommon.swift
@@ -6,7 +6,11 @@
 //  Copyright © 2017年 Atsuya Sato. All rights reserved.
 //
 
-#if !os(iOS)
+import Foundation
+
+#if os(iOS)
+import UIKit
+#elseif os(OSX)
 import Cocoa
 public typealias UIColor = NSColor
 public typealias UIImageView = NSImageView
@@ -19,13 +23,11 @@ public typealias UIView = NSView
 public typealias UIResponder = NSResponder
 #endif
 
-import Foundation
-
 public class MultiplatformCommon {
     public class func getCurrentContext() -> CGContext? {
         #if os(iOS)
             return UIGraphicsGetCurrentContext()
-        #else
+        #elseif os(OSX)
             return NSGraphicsContext.current()?.cgContext
         #endif
     }

diff --git a/ProcessingKit/ProcessingKit.h b/ProcessingKit/ProcessingKit.h
@@ -6,7 +6,7 @@
 //  Copyright © 2017年 Atsuya Sato. All rights reserved.
 //
 
-#import <UIKit/UIKit.h>
+#import <Foundation/Foundation.h>
 
 //! Project version number for ProcessingKit.
 FOUNDATION_EXPORT double ProcessingKitVersionNumber;

diff --git a/ProcessingKit/ProcessingView.swift b/ProcessingKit/ProcessingView.swift
@@ -6,12 +6,14 @@
 //  Copyright © 2017年 Atsuya Sato. All rights reserved.
 //
 
-#if !os(iOS)
+import Foundation
+
+#if os(iOS)
+import UIKit
+#elseif os(OSX)
 import Cocoa
 #endif
 
-import Foundation
-
 @objc public protocol ProcessingViewDelegate {
     @objc optional func setup()
     @objc optional func draw()
@@ -20,7 +22,7 @@ import Foundation
     @objc optional func fingerTapped()
     @objc optional func fingerDragged()
     @objc optional func fingerReleased()
-    #else
+    #elseif os(OSX)
     @objc optional func mouseClicked()
     @objc optional func mouseDragged()
     @objc optional func mouseMoved()
@@ -116,7 +118,7 @@ open class ProcessingView: UIImageView, ProcessingViewDelegate {
     private func configuration() {
         #if os(iOS)
         self.isUserInteractionEnabled = true
-        #else
+        #elseif os(OSX)
         if let window = self.window {
             self.bounds = CGRect(x: 0, y: 0, width: window.frame.size.width, height: window.frame.size.height)
         } else {
@@ -159,7 +161,7 @@ open class ProcessingView: UIImageView, ProcessingViewDelegate {
         #if os(iOS)
         UIGraphicsBeginImageContext(rect.size)
         self.image?.draw(at: CGPoint(x: 0, y: 0))
-        #else
+        #elseif os(OSX)
         self.image?.draw(at: NSPoint.zero, from: NSRect.zero, operation: .copy, fraction: 1.0)
 
         // MARK: Coordinate systems are different between iOS and OS X
@@ -186,7 +188,7 @@ open class ProcessingView: UIImageView, ProcessingViewDelegate {
         let drawnImage = UIGraphicsGetImageFromCurrentImageContext()
         self.image = drawnImage
         UIGraphicsEndImageContext()
-        #else
+        #elseif os(OSX)
         if let cgImage = NSGraphicsContext.current()?.cgContext.makeImage() {
             DispatchQueue.main.async {
                 self.image = NSImage(cgImage: cgImage, size: self.frame.size)
@@ -224,7 +226,7 @@ open class ProcessingView: UIImageView, ProcessingViewDelegate {
             self.eventComponents.fingerReleased = false
             self.delegate?.fingerReleased?()
         }
-        #else
+        #elseif os(OSX)
         if self.eventComponents.mouseClicked {
             self.eventComponents.mouseClicked = false
             self.delegate?.mouseClicked?()

diff --git a/ProcessingKit/Shape/Shape.swift b/ProcessingKit/Shape/Shape.swift
@@ -8,6 +8,12 @@
 
 import Foundation
 
+#if os(iOS)
+import UIKit
+#elseif os(OSX)
+import Cocoa
+#endif
+
 protocol ShapeModelContract {
     func point(_ x: CGFloat, _ y: CGFloat)
     func line(_ x1: CGFloat, _ y1: CGFloat, _ x2: CGFloat, _ y2: CGFloat)

diff --git a/ProcessingKit/Shape/Vertex.swift b/ProcessingKit/Shape/Vertex.swift
@@ -8,6 +8,12 @@
 
 import Foundation
 
+#if os(iOS)
+import UIKit
+#elseif os(OSX)
+import Cocoa
+#endif
+
 public enum BeginShapeKind {
     case points
     case lines

diff --git a/ProcessingKit/Transform/Transform.swift b/ProcessingKit/Transform/Transform.swift
@@ -8,6 +8,12 @@
 
 import Foundation
 
+#if os(iOS)
+import UIKit
+#elseif os(OSX)
+import Cocoa
+#endif
+
 protocol TransformModelContract {
     func pushMatrix()
     func popMatrix()