Prefer "#if canImport(ObjectiveC)" to "#if !os(macOS)

stephencelis · aciidgh · commit 14e5e60b72af · 2018-10-22T19:34:12.000-07:00
Currently, projects that use `--generate-linuxmain` will generate a file that breaks iOS and other platforms.
diff --git a/Sources/Commands/GenerateLinuxMain.swift b/Sources/Commands/GenerateLinuxMain.swift
@@ -57,7 +57,7 @@ final class LinuxMainGenerator {
             let testManifest = target.sources.root.appending(component: "XCTestManifests.swift")
             let stream = try LocalFileOutputByteStream(testManifest)
 
-            stream <<< "#if !os(macOS)" <<< "\n"
+            stream <<< "#if !canImport(ObjectiveC)" <<< "\n"
             stream <<< "import XCTest" <<< "\n"
             for klass in module.classes.lazy.sorted(by: { $0.name < $1.name }) {
                 stream <<< "\n"
diff --git a/Tests/BasicTests/XCTestManifests.swift b/Tests/BasicTests/XCTestManifests.swift
@@ -1,4 +1,4 @@
-#if !os(macOS)
+#if !canImport(ObjectiveC)
 import XCTest
 
 extension AwaitTests {
diff --git a/Tests/BuildTests/XCTestManifests.swift b/Tests/BuildTests/XCTestManifests.swift
@@ -1,4 +1,4 @@
-#if !os(macOS)
+#if !canImport(ObjectiveC)
 import XCTest
 
 extension BuildPlanTests {
diff --git a/Tests/CommandsTests/XCTestManifests.swift b/Tests/CommandsTests/XCTestManifests.swift
@@ -1,4 +1,4 @@
-#if !os(macOS)
+#if !canImport(ObjectiveC)
 import XCTest
 
 extension BuildToolTests {
diff --git a/Tests/FunctionalTests/MiscellaneousTests.swift b/Tests/FunctionalTests/MiscellaneousTests.swift
@@ -414,7 +414,7 @@ class MiscellaneousTestCase: XCTestCase {
             // Check test manifest.
             let testManifest = prefix.appending(components: "Tests", "ParallelTestsPkgTests", "XCTestManifests.swift")
             XCTAssertEqual(try fs.readFileContents(testManifest), """
-                #if !os(macOS)
+                #if !canImport(ObjectiveC)
                 import XCTest
 
                 extension ParallelTestsFailureTests {
diff --git a/Tests/FunctionalTests/XCTestManifests.swift b/Tests/FunctionalTests/XCTestManifests.swift
@@ -1,4 +1,4 @@
-#if !os(macOS)
+#if !canImport(ObjectiveC)
 import XCTest
 
 extension CFamilyTargetTestCase {
diff --git a/Tests/POSIXTests/XCTestManifests.swift b/Tests/POSIXTests/XCTestManifests.swift
@@ -1,4 +1,4 @@
-#if !os(macOS)
+#if !canImport(ObjectiveC)
 import XCTest
 
 extension EnvTests {
diff --git a/Tests/PackageDescription4Tests/XCTestManifests.swift b/Tests/PackageDescription4Tests/XCTestManifests.swift
@@ -1,4 +1,4 @@
-#if !os(macOS)
+#if !canImport(ObjectiveC)
 import XCTest
 
 extension JSONTests {
diff --git a/Tests/PackageGraphTests/XCTestManifests.swift b/Tests/PackageGraphTests/XCTestManifests.swift
@@ -1,4 +1,4 @@
-#if !os(macOS)
+#if !canImport(ObjectiveC)
 import XCTest
 
 extension DependencyResolverTests {
diff --git a/Tests/PackageLoadingTests/XCTestManifests.swift b/Tests/PackageLoadingTests/XCTestManifests.swift
@@ -1,4 +1,4 @@
-#if !os(macOS)
+#if !canImport(ObjectiveC)
 import XCTest
 
 extension ModuleMapGeneration {
diff --git a/Tests/PackageModelTests/XCTestManifests.swift b/Tests/PackageModelTests/XCTestManifests.swift
@@ -1,4 +1,4 @@
-#if !os(macOS)
+#if !canImport(ObjectiveC)
 import XCTest
 
 extension PackageModelTests {
diff --git a/Tests/SourceControlTests/XCTestManifests.swift b/Tests/SourceControlTests/XCTestManifests.swift
@@ -1,4 +1,4 @@
-#if !os(macOS)
+#if !canImport(ObjectiveC)
 import XCTest
 
 extension GitRepositoryTests {
diff --git a/Tests/TestSupportTests/XCTestManifests.swift b/Tests/TestSupportTests/XCTestManifests.swift
@@ -1,4 +1,4 @@
-#if !os(macOS)
+#if !canImport(ObjectiveC)
 import XCTest
 
 extension TestSupportTests {
diff --git a/Tests/UtilityTests/XCTestManifests.swift b/Tests/UtilityTests/XCTestManifests.swift
@@ -1,4 +1,4 @@
-#if !os(macOS)
+#if !canImport(ObjectiveC)
 import XCTest
 
 extension ArgumentParserTests {
diff --git a/Tests/WorkspaceTests/XCTestManifests.swift b/Tests/WorkspaceTests/XCTestManifests.swift
@@ -1,4 +1,4 @@
-#if !os(macOS)
+#if !canImport(ObjectiveC)
 import XCTest
 
 extension InitTests {
diff --git a/Tests/XcodeprojTests/XCTestManifests.swift b/Tests/XcodeprojTests/XCTestManifests.swift
@@ -1,4 +1,4 @@
-#if !os(macOS)
+#if !canImport(ObjectiveC)
 import XCTest
 
 extension FunctionalTests {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#if !os(macOS)`
	`1`	`+#if !canImport(ObjectiveC)`
`2`	`2`	`import XCTest`
`3`	`3`
`4`	`4`	`extension AwaitTests {`