exyte · rhaining · Oct 21, 2021 · Oct 21, 2021 · Oct 22, 2021 · Nov 8, 2021
diff --git a/.travis.yml b/.travis.yml
@@ -8,7 +8,7 @@ branches:
 script:
   - set -o pipefail && xcodebuild test -project Macaw.xcodeproj -scheme 'Macaw iOS' -sdk iphonesimulator13.5 ONLY_ACTIVE_ARCH=NO -destination 'platform=iOS Simulator,OS=13.5,name=iPhone 11 Pro' | xcpretty;
   - set -o pipefail && xcodebuild test -project Macaw.xcodeproj -scheme 'MacawOSX' ONLY_ACTIVE_ARCH=NO | xcpretty;
-
+  - set -o pipefail && xcodebuild build -project Macaw.xcodeproj -scheme 'MacawTV' ONLY_ACTIVE_ARCH=NO | xcpretty;
 
 notifications:
     slack: exyte:kdo9FNtTOFMuMqAyyvZPDAD7
diff --git a/Macaw.podspec b/Macaw.podspec
@@ -19,6 +19,7 @@ Pod::Spec.new do |s|
 
   s.ios.deployment_target = "9.0"
   s.osx.deployment_target = "10.12"
+  s.tvos.deployment_target = "10.0"
   s.requires_arc = true
   s.swift_version = "5.3"
 

diff --git a/Macaw.xcodeproj/project.pbxproj b/Macaw.xcodeproj/project.pbxproj
diff --git a/Macaw.xcodeproj/xcshareddata/xcschemes/MacawTV.xcscheme b/Macaw.xcodeproj/xcshareddata/xcschemes/MacawTV.xcscheme
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1300"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "EF78802327220CE8006E331E"
+               BuildableName = "MacawTV.framework"
+               BlueprintName = "MacawTV"
+               ReferencedContainer = "container:Macaw.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "EF78802327220CE8006E331E"
+            BuildableName = "MacawTV.framework"
+            BlueprintName = "MacawTV"
+            ReferencedContainer = "container:Macaw.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/MacawTests/Animation/AnimationUtilsTests.swift b/MacawTests/Animation/AnimationUtilsTests.swift
@@ -12,6 +12,8 @@ import XCTest
 @testable import MacawOSX
 #elseif os(iOS)
 @testable import Macaw
+#elseif os(tvOS)
+@testable import MacawTV
 #endif
 
 class AnimationUtilsTests: XCTestCase {

diff --git a/MacawTests/Animation/CombineAnimationTests.swift b/MacawTests/Animation/CombineAnimationTests.swift
@@ -12,6 +12,8 @@ import XCTest
 @testable import MacawOSX
 #elseif os(iOS)
 @testable import Macaw
+#elseif os(tvOS)
+@testable import MacawTV
 #endif
 
 class CombineAnimationTests: XCTestCase {

diff --git a/MacawTests/Animation/ControlStatesTests.swift b/MacawTests/Animation/ControlStatesTests.swift
@@ -12,6 +12,8 @@ import XCTest
 @testable import MacawOSX
 #elseif os(iOS)
 @testable import Macaw
+#elseif os(tvOS)
+@testable import MacawTV
 #endif
 
 class ControlStatesTests: XCTestCase {

diff --git a/MacawTests/Animation/DelayedAnimationTests.swift b/MacawTests/Animation/DelayedAnimationTests.swift
@@ -12,6 +12,8 @@ import XCTest
 @testable import MacawOSX
 #elseif os(iOS)
 @testable import Macaw
+#elseif os(tvOS)
+@testable import MacawTV
 #endif
 
 class DelayedAnimationTests: XCTestCase {

diff --git a/MacawTests/Animation/SequenceAnimationTests.swift b/MacawTests/Animation/SequenceAnimationTests.swift
@@ -12,6 +12,8 @@ import XCTest
 @testable import MacawOSX
 #elseif os(iOS)
 @testable import Macaw
+#elseif os(tvOS)
+@testable import MacawTV
 #endif
 
 class SequenceAnimationTests: XCTestCase {

diff --git a/MacawTests/Bounds/ImageBoundsTests.swift b/MacawTests/Bounds/ImageBoundsTests.swift
@@ -12,6 +12,8 @@ import XCTest
 @testable import MacawOSX
 #elseif os(iOS)
 @testable import Macaw
+#elseif os(tvOS)
+@testable import MacawTV
 #endif
 
 class ImageBoundsTests: XCTestCase {
@@ -29,7 +31,7 @@ class ImageBoundsTests: XCTestCase {
             return
         }
 
-        #if os(iOS)
+        #if os(iOS) || os(tvOS)
             XCTAssert(bounds.w == 1174.0 && bounds.h == 862.0, "Wrong bounds for path src")
         #elseif os(OSX)
             XCTAssert(bounds.w == 587.0 && bounds.h == 431.0, "Wrong bounds for path src")
@@ -55,7 +57,7 @@ class ImageBoundsTests: XCTestCase {
             return
         }
 
-        #if os(iOS)
+        #if os(iOS) || os(tvOS)
             XCTAssert(bounds.w == 1174.0 && bounds.h == 862.0, "Wrong bounds for base64 src")
         #elseif os(OSX)
             XCTAssert(bounds.w == 587.0 && bounds.h == 431.0, "Wrong bounds for base64 src")
@@ -65,7 +67,7 @@ class ImageBoundsTests: XCTestCase {
     func testInMemoryImage() {
         let bundle = Bundle(for: type(of: TestUtils()))
 
-        #if os(iOS)
+        #if os(iOS) || os(tvOS)
         guard let mImage = MImage(named: "logo.png", in: bundle, compatibleWith: .none) else {
             XCTFail()
             return
@@ -84,7 +86,7 @@ class ImageBoundsTests: XCTestCase {
             return
         }
 
-        #if os(iOS)
+        #if os(iOS) || os(tvOS)
             XCTAssert(bounds.w == 1174.0 && bounds.h == 862.0, "Wrong bounds for in-memory image")
         #elseif os(OSX)
             XCTAssert(bounds.w == 587.0 && bounds.h == 431.0, "Wrong bounds for in-memory image")

diff --git a/MacawTests/Bounds/NodeBoundsTests.swift b/MacawTests/Bounds/NodeBoundsTests.swift
@@ -12,6 +12,8 @@ import XCTest
 @testable import MacawOSX
 #elseif os(iOS)
 @testable import Macaw
+#elseif os(tvOS)
+@testable import MacawTV
 #endif
 
 class NodeBoundsTests: XCTestCase {

diff --git a/MacawTests/MacawSVGTests.swift b/MacawTests/MacawSVGTests.swift
@@ -4,6 +4,8 @@ import XCTest
 @testable import MacawOSX
 #elseif os(iOS)
 @testable import Macaw
+#elseif os(tvOS)
+@testable import MacawTV
 #endif
 
 class MacawSVGTests: XCTestCase {
@@ -259,7 +261,7 @@ class MacawSVGTests: XCTestCase {
         }
         #endif
 
-        #if os(iOS)
+        #if os(iOS) || os(tvOS)
         guard let referenceContentData = referenceImage.pngData() else {
             XCTFail("Failed to get Data from png \(referenceFile).png")
             return
@@ -312,7 +314,7 @@ class MacawSVGTests: XCTestCase {
             }
             #endif
 
-            #if os(iOS)
+            #if os(iOS) || os(tvOS)
             if #available(iOS 11.0, *) {
                 return try JSONSerialization.data(withJSONObject: serializableNode.toDictionary(), options: [.prettyPrinted, .sortedKeys])
             } else {
@@ -647,7 +649,7 @@ class MacawSVGTests: XCTestCase {
     }
 
     func testColorProp04() {
-        #if os(iOS)
+        #if os(iOS) || os(tvOS)
         validateJSON("color-prop-04-t-manual")
         #elseif os(OSX)
         validateJSON("color-prop-04-t-manual-osx")
@@ -853,7 +855,7 @@ class MacawSVGTests: XCTestCase {
         }
         #endif
 
-        #if os(iOS)
+        #if os(iOS) || os(tvOS)
         guard let data = image.pngData() else {
             return
         }

diff --git a/MacawTests/MacawTests.swift b/MacawTests/MacawTests.swift
@@ -4,6 +4,8 @@ import XCTest
 @testable import MacawOSX
 #elseif os(iOS)
 @testable import Macaw
+#elseif os(tvOS)
+@testable import MacawTV
 #endif
 
 class MacawTests: XCTestCase {

diff --git a/MacawTests/SVGParserTest.swift b/MacawTests/SVGParserTest.swift
@@ -12,6 +12,8 @@ import XCTest
 @testable import MacawOSX
 #elseif os(iOS)
 @testable import Macaw
+#elseif os(tvOS)
+@testable import MacawTV
 #endif
 
 class SVGParserTest: XCTestCase {

diff --git a/MacawTests/SceneSerialization.swift b/MacawTests/SceneSerialization.swift
@@ -14,6 +14,9 @@ import Foundation
 #if os(iOS)
 import UIKit
 @testable import Macaw
+#elseif os(tvOS)
+import UIKit
+@testable import MacawTV
 #endif
 
 protocol Initializable {
@@ -374,7 +377,7 @@ extension Path: Serializable {
     }
 }
 
-#if os(iOS)
+#if os(iOS) || os(tvOS)
 extension Polygon: Serializable {
 
     func toDictionary() -> [String:Any] {

diff --git a/MacawTests/TestUtils.swift b/MacawTests/TestUtils.swift
@@ -5,6 +5,8 @@ import Foundation
 
 #if os(iOS)
 @testable import Macaw
+#elseif os(tvOS)
+@testable import MacawTV
 #endif
 
 class TestUtils {

diff --git a/Source/MCAMediaTimingFillMode_iOS.swift b/Source/MCAMediaTimingFillMode_iOS.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 
-#if os(iOS)
+#if os(iOS) || os(tvOS)
 import UIKit
 
 public struct MCAMediaTimingFillMode {

diff --git a/Source/MCAMediaTimingFunctionName_iOS.swift b/Source/MCAMediaTimingFunctionName_iOS.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 
-#if os(iOS)
+#if os(iOS) || os(tvOS)
 import UIKit
 
 public struct MCAMediaTimingFunctionName {

diff --git a/Source/MCAShapeLayerLineCap_iOS.swift b/Source/MCAShapeLayerLineCap_iOS.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 
-#if os(iOS)
+#if os(iOS) || os(tvOS)
 import UIKit
 
 public struct MCAShapeLayerLineCap {

diff --git a/Source/MCAShapeLayerLineJoin_iOS.swift b/Source/MCAShapeLayerLineJoin_iOS.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 
-#if os(iOS)
+#if os(iOS) || os(tvOS)
 import UIKit
 
 public struct MCAShapeLayerLineJoin {

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/Easing.swift b/Source/animation/Easing.swift
@@ -6,7 +6,7 @@
 //
 //
 
-#if os(iOS)
+#if os(iOS) || os(tvOS)
 import UIKit
 #elseif os(OSX)
 import AppKit

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/CombinationAnimationGenerator.swift b/Source/animation/types/animation_generators/CombinationAnimationGenerator.swift
@@ -5,7 +5,7 @@
 //  Created by Alisa Mylnikova on 17/12/2018.
 //
 
-#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/PathAnimationGenerator.swift b/Source/animation/types/animation_generators/PathAnimationGenerator.swift
@@ -7,7 +7,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/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,4 +1,4 @@
-#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