exyte · fassko · Feb 28, 2018 · Feb 28, 2018 · Mar 20, 2018 · Mar 20, 2018
diff --git a/.travis.yml b/.travis.yml
@@ -7,4 +7,5 @@ branches:
 
 script:
   - set -o pipefail && xcodebuild test -project Macaw.xcodeproj -scheme 'Macaw iOS' -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO -destination 'platform=iOS Simulator,name=iPhone 6,OS=11.2' | xcpretty;
-  - set -o pipefail && xcodebuild build -project Macaw.xcodeproj -scheme 'MacawOSX' ONLY_ACTIVE_ARCH=NO | xcpretty;
+  - set -o pipefail && xcodebuild build -project Macaw.xcodeproj -scheme 'MacawOSX' ONLY_ACTIVE_ARCH=NO | xcpretty;
+  - set -o pipefail && xcodebuild build -project Macaw.xcodeproj -scheme 'MacawtvOS' ONLY_ACTIVE_ARCH=NO | xcpretty;
diff --git a/Macaw.podspec b/Macaw.podspec
@@ -28,6 +28,7 @@ Pod::Spec.new do |s|
 
   s.ios.deployment_target = "9.0"
   s.osx.deployment_target = "10.12"
+  s.tvos.deployment_target = '9.0'
   s.requires_arc = true
   s.pod_target_xcconfig = { 'SWIFT_VERSION' => '4.0' }
 

diff --git a/Macaw.xcodeproj/project.pbxproj b/Macaw.xcodeproj/project.pbxproj
diff --git a/MacawTests/Animation/CombineAnimationTests.swift b/MacawTests/Animation/CombineAnimationTests.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2017 Exyte. All rights reserved.
 //
 
-#if os(iOS)
+#if os(iOS) || os(tvOS)
 
 import XCTest
 @testable import Macaw

diff --git a/MacawTests/Animation/DelayedAnimationTests.swift b/MacawTests/Animation/DelayedAnimationTests.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2017 Exyte. All rights reserved.
 //
 
-#if os(iOS)
+#if os(iOS) || os(tvOS)
 
 import XCTest
 @testable import Macaw

diff --git a/MacawTests/Animation/SequenceAnimationTests.swift b/MacawTests/Animation/SequenceAnimationTests.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2017 Exyte. All rights reserved.
 //
 
-#if os(iOS)
+#if os(iOS) || os(tvOS)
 
 import XCTest
 @testable import Macaw

diff --git a/MacawTests/Bounds/ImageBoundsTests.swift b/MacawTests/Bounds/ImageBoundsTests.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2017 Exyte. All rights reserved.
 //
 
-#if os(iOS)
+#if os(iOS) || os(tvOS)
 
 import XCTest
 @testable import Macaw

diff --git a/MacawTests/Bounds/NodeBoundsTests.swift b/MacawTests/Bounds/NodeBoundsTests.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2017 Exyte. All rights reserved.
 //
 
-#if os(iOS)
+#if os(iOS) || os(tvOS)
 
 import XCTest
 @testable import Macaw

diff --git a/Source/animation/AnimationProducer.swift b/Source/animation/AnimationProducer.swift
@@ -1,6 +1,6 @@
 import Foundation
 
-#if os(iOS)
+#if os(iOS) || os(tvOS)
     import UIKit
 #elseif os(OSX)
     import AppKit

diff --git a/Source/animation/layer_animation/CGExtensions.swift b/Source/animation/layer_animation/CGExtensions.swift
@@ -1,6 +1,6 @@
 import Foundation
 
-#if os(iOS)
+#if os(iOS) || os(tvOS)
     import UIKit
 #endif
 

diff --git a/Source/animation/types/animation_generators/Cache/AnimationCache.swift b/Source/animation/types/animation_generators/Cache/AnimationCache.swift
@@ -1,6 +1,6 @@
 import Foundation
 
-#if os(iOS)
+#if os(iOS) || os(tvOS)
     import UIKit
 #elseif os(OSX)
     import AppKit

diff --git a/Source/animation/types/animation_generators/MorphingGenerator.swift b/Source/animation/types/animation_generators/MorphingGenerator.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 
-#if os(iOS)
+#if os(iOS) || os(tvOS)
     import UIKit
 #elseif os(OSX)
     import AppKit

diff --git a/Source/animation/types/animation_generators/OpacityGenerator.swift b/Source/animation/types/animation_generators/OpacityGenerator.swift
@@ -1,6 +1,6 @@
 import Foundation
 
-#if os(iOS)
+#if os(iOS) || os(tvOS)
     import UIKit
 #elseif os(OSX)
     import AppKit

diff --git a/Source/animation/types/animation_generators/ShapeAnimationGenerator.swift b/Source/animation/types/animation_generators/ShapeAnimationGenerator.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 
-#if os(iOS)
+#if os(iOS) || os(tvOS)
     import UIKit
 #elseif os(OSX)
     import AppKit

diff --git a/Source/animation/types/animation_generators/TimingFunction.swift b/Source/animation/types/animation_generators/TimingFunction.swift
@@ -1,6 +1,6 @@
 import Foundation
 
-#if os(iOS)
+#if os(iOS) || os(tvOS)
     import UIKit
 #elseif os(OSX)
     import AppKit

diff --git a/Source/animation/types/animation_generators/TransformGenerator.swift b/Source/animation/types/animation_generators/TransformGenerator.swift
@@ -1,6 +1,6 @@
 import Foundation
 
-#if os(iOS)
+#if os(iOS) || os(tvOS)
     import UIKit
 #elseif os(OSX)
     import AppKit

diff --git a/Source/model/draw/RadialGradient.swift b/Source/model/draw/RadialGradient.swift
@@ -1,6 +1,6 @@
 import Foundation
 
-#if os(iOS)
+#if os(iOS) || os(tvOS)
     import UIKit
 #endif
 

diff --git a/Source/model/scene/Image.swift b/Source/model/scene/Image.swift
@@ -4,7 +4,7 @@ import Foundation
     import AppKit
 #endif
 
-#if os(iOS)
+#if os(iOS) || os(tvOS)
     import UIKit
 #endif
 
@@ -159,7 +159,7 @@ open class Image: Node {
         }
 
         // General case
-        #if os(iOS)
+        #if os(iOS) || os(tvOS)
             return MImage(named: src)
         #elseif os(OSX)
             return MImage(named: NSImage.Name(rawValue: src))

diff --git a/Source/model/scene/Text.swift b/Source/model/scene/Text.swift
@@ -1,6 +1,6 @@
 import Foundation
 
-#if os(iOS)
+#if os(iOS) || os(tvOS)
     import UIKit
 #elseif os(OSX)
     import AppKit

diff --git a/Source/platform/iOS/Common_iOS.swift b/Source/platform/iOS/Common_iOS.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 
-#if os(iOS)
+#if os(iOS) || os(tvOS)
     import UIKit
 
     public typealias MRectCorner = UIRectCorner
@@ -23,8 +23,12 @@ import Foundation
     public typealias MGestureRecognizerDelegate = UIGestureRecognizerDelegate
     public typealias MTapGestureRecognizer = UITapGestureRecognizer
     public typealias MPanGestureRecognizer = UIPanGestureRecognizer
+
+    #if os(iOS)
     public typealias MPinchGestureRecognizer = UIPinchGestureRecognizer
     public typealias MRotationGestureRecognizer = UIRotationGestureRecognizer
+    #endif
+
     public typealias MScreen = UIScreen
     public typealias MViewContentMode = UIViewContentMode
 
@@ -44,6 +48,7 @@ import Foundation
         }
     }
 
+    #if os(iOS)
     extension MRotationGestureRecognizer {
         final var mRotation: CGFloat {
             get {
@@ -71,10 +76,15 @@ import Foundation
             return super.location(ofTouch: touch, in: inView)
         }
     }
+    #endif
 
     extension MFont {
         class var mSystemFontSize: CGFloat {
-            return UIFont.systemFontSize
+            #if os(iOS)
+                return UIFont.systemFontSize
+            #elseif os(tvOS)
+                return 12.0
+            #endif
         }
     }
 

diff --git a/Source/platform/iOS/Graphics_iOS.swift b/Source/platform/iOS/Graphics_iOS.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 
-#if os(iOS)
+#if os(iOS) || os(tvOS)
     import UIKit
 
     func MGraphicsGetCurrentContext() -> CGContext? {

diff --git a/Source/platform/iOS/MDisplayLink_iOS.swift b/Source/platform/iOS/MDisplayLink_iOS.swift
@@ -6,7 +6,7 @@
 //
 //
 
-#if os(iOS)
+#if os(iOS) || os(tvOS)
     import UIKit
 
     class MDisplayLink: MDisplayLinkProtocol {
@@ -23,7 +23,11 @@
             self.onUpdate = onUpdate
 
             displayLink = CADisplayLink(target: self, selector: #selector(updateHandler))
-            displayLink?.frameInterval = 1
+            #if os(iOS)
+                displayLink?.frameInterval = 1
+            #elseif os(tvOS)
+                displayLink?.preferredFramesPerSecond = 1
+            #endif
             displayLink?.add(to: RunLoop.current, forMode: RunLoopMode.defaultRunLoopMode)
         }
 

diff --git a/Source/platform/iOS/MView_iOS.swift b/Source/platform/iOS/MView_iOS.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 
-#if os(iOS)
+#if os(iOS) || os(tvOS)
     import UIKit
 
     open class MView: UIView, Touchable {

diff --git a/Source/platform/macOS/Common_macOS.swift b/Source/platform/macOS/Common_macOS.swift
@@ -123,7 +123,7 @@ import Foundation
     func MMainScreen() -> MScreen? {
         return MScreen.main
     }
-    
+
     extension MBezierPath {
         func apply(_ transform: CGAffineTransform) {
             let affineTransform = AffineTransform(
@@ -134,7 +134,7 @@ import Foundation
                 tX: transform.tx,
                 tY: transform.ty
             )
-            
+
             self.transform(using: affineTransform)
         }
     }

diff --git a/Source/platform/macOS/MDisplayLink_macOS.swift b/Source/platform/macOS/MDisplayLink_macOS.swift
@@ -28,7 +28,7 @@ import Foundation
                 return
             }
 
-            CVDisplayLinkSetOutputCallback(displayLink!, { (_, _, _, _, _, userData) -> CVReturn in
+            CVDisplayLinkSetOutputCallback(displayLink!, { _, _, _, _, _, userData -> CVReturn in
 
                 let `self` = unsafeBitCast(userData, to: MDisplayLink.self)
                 `self`.onUpdate?()

diff --git a/Source/render/GroupRenderer.swift b/Source/render/GroupRenderer.swift
@@ -1,6 +1,6 @@
 import Foundation
 
-#if os(iOS)
+#if os(iOS) || os(tvOS)
     import UIKit
 #endif
 

diff --git a/Source/render/ImageRenderer.swift b/Source/render/ImageRenderer.swift
@@ -4,7 +4,7 @@ import Foundation
     import AppKit
 #endif
 
-#if os(iOS)
+#if os(iOS) || os(tvOS)
     import UIKit
 #endif
 
@@ -64,7 +64,7 @@ class ImageRenderer: NodeRenderer {
             return .none
         }
 
-        #if os(iOS)
+        #if os(iOS) || os(tvOS)
             let osImage = MImage(named: image.src)
         #elseif os(OSX)
             let osImage = MImage(named: NSImage.Name(rawValue: image.src))

diff --git a/Source/render/NodeRenderer.swift b/Source/render/NodeRenderer.swift
@@ -1,6 +1,6 @@
 import Foundation
 
-#if os(iOS)
+#if os(iOS) || os(tvOS)
     import UIKit
 #endif
 

diff --git a/Source/render/RenderContext.swift b/Source/render/RenderContext.swift
@@ -1,6 +1,6 @@
 import Foundation
 
-#if os(iOS)
+#if os(iOS) || os(tvOS)
     import UIKit
 #endif
 

diff --git a/Source/render/RenderUtils.swift b/Source/render/RenderUtils.swift
@@ -1,6 +1,6 @@
 import Foundation
 
-#if os(iOS)
+#if os(iOS) || os(tvOS)
     import UIKit
 #elseif os(OSX)
     import AppKit
@@ -423,7 +423,7 @@ class RenderUtils {
                 let maxSize = CGFloat(max(w, h))
                 let path = MBezierPath(arcCenter: CGPoint.zero, radius: maxSize / 2, startAngle: extent, endAngle: end, clockwise: arcAngle >= 0)
 
-                #if os(iOS)
+                #if os(iOS) || os(tvOS)
                     var transform = CGAffineTransform(translationX: cx, y: cy)
                     transform = transform.rotated(by: CGFloat(rotation))
                     path.apply(transform.scaledBy(x: CGFloat(w) / maxSize, y: CGFloat(h) / maxSize))

diff --git a/Source/render/ShapeRenderer.swift b/Source/render/ShapeRenderer.swift
@@ -1,6 +1,6 @@
 import Foundation
 
-#if os(iOS)
+#if os(iOS) || os(tvOS)
     import UIKit
 #elseif os(OSX)
     import AppKit

diff --git a/Source/render/TextRenderer.swift b/Source/render/TextRenderer.swift
@@ -1,6 +1,6 @@
 import Foundation
 
-#if os(iOS)
+#if os(iOS) || os(tvOS)
     import UIKit
 #elseif os(OSX)
     import AppKit
@@ -160,7 +160,7 @@ class TextRenderer: NodeRenderer {
     fileprivate func getTextColor(_ fill: Fill) -> MColor {
         if let color = fill as? Color {
 
-            #if os(iOS)
+            #if os(iOS) || os(tvOS)
                 return MColor(cgColor: RenderUtils.mapColor(color))
             #elseif os(OSX)
                 return MColor(cgColor: RenderUtils.mapColor(color)) ?? .black

diff --git a/Source/svg/SVGView.swift b/Source/svg/SVGView.swift
@@ -1,6 +1,6 @@
 import Foundation
 
-#if os(iOS)
+#if os(iOS) || os(tvOS)
     import UIKit
 #elseif os(OSX)
     import AppKit

diff --git a/Source/thirdparty/CGFloat+Double.swift b/Source/thirdparty/CGFloat+Double.swift
@@ -1,6 +1,6 @@
 import Foundation
 
-#if os(iOS)
+#if os(iOS) || os(tvOS)
     import UIKit
 #endif
 

diff --git a/Source/utils/UIImage2Image.swift b/Source/utils/UIImage2Image.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 
-#if os(iOS)
+#if os(iOS) || os(tvOS)
     import UIKit
 #endif