Merge targets and schemes and fix xcode warnings and errors

isair · isair · commit 81d7fc009c46 · 2017-05-09T23:11:06.000+03:00
diff --git a/JSONHelper.xcodeproj/project.pbxproj b/JSONHelper.xcodeproj/project.pbxproj
diff --git a/JSONHelper.xcodeproj/xcshareddata/xcschemes/JSONHelper-Mac.xcscheme b/JSONHelper.xcodeproj/xcshareddata/xcschemes/JSONHelper-Mac.xcscheme
diff --git a/JSONHelper.xcodeproj/xcshareddata/xcschemes/JSONHelper-tvOS.xcscheme b/JSONHelper.xcodeproj/xcshareddata/xcschemes/JSONHelper-tvOS.xcscheme
diff --git a/JSONHelper.xcodeproj/xcshareddata/xcschemes/JSONHelper.xcscheme b/JSONHelper.xcodeproj/xcshareddata/xcschemes/JSONHelper.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0820"
+   LastUpgradeVersion = "0830"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -16,32 +16,17 @@
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "5FAD07631A70F2FC00C4D09E"
                BuildableName = "JSONHelper.framework"
-               BlueprintName = "JSONHelper-iOS"
-               ReferencedContainer = "container:JSONHelper.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "NO"
-            buildForArchiving = "NO"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "5FAD076E1A70F2FC00C4D09E"
-               BuildableName = "JSONHelperTests.xctest"
-               BlueprintName = "JSONHelperTests"
+               BlueprintName = "JSONHelper"
                ReferencedContainer = "container:JSONHelper.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
    <TestAction
-      buildConfiguration = "Release"
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      codeCoverageEnabled = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -59,7 +44,7 @@
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "5FAD07631A70F2FC00C4D09E"
             BuildableName = "JSONHelper.framework"
-            BlueprintName = "JSONHelper-iOS"
+            BlueprintName = "JSONHelper"
             ReferencedContainer = "container:JSONHelper.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
@@ -81,7 +66,7 @@
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "5FAD07631A70F2FC00C4D09E"
             BuildableName = "JSONHelper.framework"
-            BlueprintName = "JSONHelper-iOS"
+            BlueprintName = "JSONHelper"
             ReferencedContainer = "container:JSONHelper.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
@@ -99,7 +84,7 @@
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "5FAD07631A70F2FC00C4D09E"
             BuildableName = "JSONHelper.framework"
-            BlueprintName = "JSONHelper-iOS"
+            BlueprintName = "JSONHelper"
             ReferencedContainer = "container:JSONHelper.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
diff --git a/JSONHelper.xcodeproj/xcshareddata/xcschemes/JSONHelperExample.xcscheme b/JSONHelper.xcodeproj/xcshareddata/xcschemes/JSONHelperExample.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0820"
+   LastUpgradeVersion = "0830"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/JSONHelper/Conversion.swift b/JSONHelper/Conversion.swift
@@ -105,7 +105,7 @@ public protocol Convertible {
     return lhs
   }
 
-  if let elements = rhs as? NSArray as? [AnyObject] {
+  if let elements = rhs as? NSArray as [AnyObject]? {
     return lhs <-- elements
   }
 
diff --git a/JSONHelper/Deserialization.swift b/JSONHelper/Deserialization.swift
@@ -73,7 +73,7 @@ private func dataStringToObject(_ dataString: String) -> AnyObject? {
 @discardableResult public func <-- <D: Deserializable, T>(lhs: inout [D]?, rhs: T?) -> [D]? {
   guard let rhs = rhs else { return nil }
 
-  if let elements = rhs as? NSArray as? [AnyObject] {
+  if let elements = rhs as? NSArray as [AnyObject]? {
     return lhs <-- elements
   }
 
diff --git a/JSONHelper/Extensions/Color.swift b/JSONHelper/Extensions/Color.swift
@@ -59,7 +59,7 @@ extension NSColor: Convertible {
       return self.init(red: rgba.red, green: rgba.green, blue: rgba.blue, alpha: rgba.alpha)
     }
 
-    throw ConversionError.UnsupportedType
+    throw ConversionError.unsupportedType
   }
 }
 
diff --git a/JSONHelperTests/JSONHelperTests.swift b/JSONHelperTests/JSONHelperTests.swift
@@ -2,7 +2,7 @@
 //  Copyright © 2016 Baris Sencan. All rights reserved.
 //
 
-import UIKit
+import Foundation
 import XCTest
 import JSONHelper
 
diff --git a/scripts/test.sh b/scripts/test.sh
@@ -2,12 +2,22 @@
 
 cd "$(dirname "$0")/.."
 
-xcodebuild test -project JSONHelper.xcodeproj -scheme JSONHelper-iOS -destination 'platform=iOS Simulator,name=iPhone SE' -derivedDataPath='./build' | bundle exec xcpretty
+xcodebuild test -project JSONHelper.xcodeproj -scheme JSONHelper -destination 'platform=iOS Simulator,name=iPhone SE' -derivedDataPath='./build' | bundle exec xcpretty
 
 IOS_STATUS=${PIPESTATUS[0]}
 
-xcodebuild test -project JSONHelper.xcodeproj -scheme JSONHelper-Mac -destination 'platform=OS X,arch=x86_64' | bundle exec xcpretty
+xcodebuild test -project JSONHelper.xcodeproj -scheme JSONHelper -destination 'platform=OS X,arch=x86_64' | bundle exec xcpretty
 
 MAC_STATUS=${PIPESTATUS[0]}
 
-exit $IOS_STATUS || $MAC_STATUS
+xcodebuild test -project JSONHelper.xcodeproj -scheme JSONHelper -destination 'platform=tvOS Simulator,name=Apple TV 1080p' | bundle exec xcpretty
+
+TVOS_STATUS=${PIPESTATUS[0]}
+
+if [[ $IOS_STATUS == 0 && $MAC_STATUS == 0 && $TVOS_STATUS == 0 ]]; then
+  echo "All tests have passed."
+  exit 0
+else
+  echo "Some tests have failed."
+  exit 1
+fi

Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ public protocol Convertible {`
`105`	`105`	`return lhs`
`106`	`106`	`}`
`107`	`107`
`108`		`- if let elements = rhs as? NSArray as? [AnyObject] {`
	`108`	`+ if let elements = rhs as? NSArray as [AnyObject]? {`
`109`	`109`	`return lhs <-- elements`
`110`	`110`	`}`
`111`	`111`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ private func dataStringToObject(_ dataString: String) -> AnyObject? {`
`73`	`73`	`@discardableResult public func <-- <D: Deserializable, T>(lhs: inout [D]?, rhs: T?) -> [D]? {`
`74`	`74`	`guard let rhs = rhs else { return nil }`
`75`	`75`
`76`		`- if let elements = rhs as? NSArray as? [AnyObject] {`
	`76`	`+ if let elements = rhs as? NSArray as [AnyObject]? {`
`77`	`77`	`return lhs <-- elements`
`78`	`78`	`}`
`79`	`79`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ extension NSColor: Convertible {`
`59`	`59`	`return self.init(red: rgba.red, green: rgba.green, blue: rgba.blue, alpha: rgba.alpha)`
`60`	`60`	`}`
`61`	`61`
`62`		`- throw ConversionError.UnsupportedType`
	`62`	`+ throw ConversionError.unsupportedType`
`63`	`63`	`}`
`64`	`64`	`}`
`65`	`65`