Merge pull request Quick#687 from Quick/fix-ios-tvos-device-builds

Fix device builds for iOS and tvOS
yanamura · Sep 10, 2019 · d831761 · d831761
2 parents ed9881d + 13fbf84
commit d831761
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git a/...ts/CwlPreconditionTesting/Sources/CwlPreconditionTesting/CwlBadInstructionException.swift b/...ts/CwlPreconditionTesting/Sources/CwlPreconditionTesting/CwlBadInstructionException.swift
@@ -18,7 +18,7 @@
 //  IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 //
 
-#if os(macOS) || os(iOS)
+#if (os(macOS) || os(iOS)) && arch(x86_64)
 
 import Foundation
 

diff --git a/...ckouts/CwlPreconditionTesting/Sources/CwlPreconditionTesting/CwlCatchBadInstruction.swift b/...ckouts/CwlPreconditionTesting/Sources/CwlPreconditionTesting/CwlCatchBadInstruction.swift
@@ -18,7 +18,7 @@
 //  IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 //
 
-#if os(macOS) || os(iOS)
+#if (os(macOS) || os(iOS)) && arch(x86_64)
 
 import Foundation
 import Swift

diff --git a/...s/CwlPreconditionTesting/Sources/CwlPreconditionTesting/CwlCatchBadInstructionPosix.swift b/...s/CwlPreconditionTesting/Sources/CwlPreconditionTesting/CwlCatchBadInstructionPosix.swift
@@ -18,7 +18,7 @@
 //  IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 //
 
-#if os(tvOS)
+#if os(tvOS) && targetEnvironment(simulator)
 
 import Foundation
 

diff --git a/...heckouts/CwlPreconditionTesting/Sources/CwlPreconditionTesting/CwlDarwinDefinitions.swift b/...heckouts/CwlPreconditionTesting/Sources/CwlPreconditionTesting/CwlDarwinDefinitions.swift
@@ -18,7 +18,7 @@
 //  IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 //
 
-#if os(macOS) || os(iOS)
+#if (os(macOS) || os(iOS)) && arch(x86_64)
 
 import Darwin
 

diff --git a/test b/test
@@ -54,6 +54,8 @@ function run {
 }
 
 function test_ios {
+    run set -o pipefail && xcodebuild -project Nimble.xcodeproj -scheme "Nimble-iOS" -configuration "Debug" -destination "generic/platform=iOS" OTHER_SWIFT_FLAGS='$(inherited) -suppress-warnings' build | xcpretty
+
     run osascript -e 'tell app "Simulator" to quit'
     run set -o pipefail && xcodebuild -project Nimble.xcodeproj -scheme "Nimble-iOS" -configuration "Debug" -sdk "iphonesimulator$BUILD_IOS_SDK_VERSION" -destination "name=iPad Pro (11-inch),OS=$RUNTIME_IOS_SDK_VERSION" OTHER_SWIFT_FLAGS='$(inherited) -suppress-warnings' build-for-testing test-without-building | xcpretty
 
@@ -62,6 +64,8 @@ function test_ios {
 }
 
 function test_tvos {
+    run set -o pipefail && xcodebuild -project Nimble.xcodeproj -scheme "Nimble-tvOS" -configuration "Debug" -destination "generic/platform=tvOS" OTHER_SWIFT_FLAGS='$(inherited) -suppress-warnings' build | xcpretty
+
     run osascript -e 'tell app "Simulator" to quit'
     run set -o pipefail && xcodebuild -project Nimble.xcodeproj -scheme "Nimble-tvOS" -configuration "Debug" -sdk "appletvsimulator$BUILD_TVOS_SDK_VERSION" -destination "name=Apple TV,OS=$RUNTIME_TVOS_SDK_VERSION" OTHER_SWIFT_FLAGS='$(inherited) -suppress-warnings' build-for-testing test-without-building | xcpretty
 }