Re-enable the Rainbow dep for windows.

* This dependency appears to be supported on the Windows platform per the following revision: onevcat/Rainbow#40
wabiverse · Aug 5, 2024 · bbc23ea · bbc23ea
1 parent 6fec1aa
commit bbc23ea
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 10 deletions.
diff --git a/Package.swift b/Package.swift
@@ -288,7 +288,7 @@ let package = Package(
         .product(name: "Apple", package: "MetaverseKit", condition: .when(platforms: Arch.OS.apple.platform)),
         /* ---------- Console logging. ---------- */
         .product(name: "Logging", package: "swift-log"),
-        .product(name: "Rainbow", package: "Rainbow", condition: .when(platforms: Arch.OS.nix.platform))
+        .product(name: "Rainbow", package: "Rainbow")
       ] + Arch.OS.dependency(.boost),
       publicHeadersPath: "include",
       cxxSettings: [
@@ -1308,7 +1308,7 @@ let package = Package(
         .product(name: "Version", package: "Version"),
         .product(name: "ArgumentParser", package: "swift-argument-parser"),
         .product(name: "Logging", package: "swift-log"),
-        .product(name: "Rainbow", package: "Rainbow", condition: .when(platforms: Arch.OS.nix.platform))
+        .product(name: "Rainbow", package: "Rainbow")
       ],
       resources: [
         // usd source files that need modifications to work with swift are maintained out of these

diff --git a/Sources/OpenUSD/AsyncMain.swift b/Sources/OpenUSD/AsyncMain.swift
@@ -29,9 +29,7 @@
  * ---------------------------------------------------------------- */
 
 import Foundation
-#if os(macOS) || os(visionOS) || os(iOS) || os(tvOS) || os(watchOS) || os(Linux)
 import Rainbow
-#endif
 
 @main
 struct AsyncMain

diff --git a/Sources/OpenUSD/Utility/Logger.swift b/Sources/OpenUSD/Utility/Logger.swift
@@ -30,9 +30,7 @@
 
 import Foundation
 import Logging
-#if os(macOS) || os(visionOS) || os(iOS) || os(tvOS) || os(watchOS) || os(Linux)
 import Rainbow
-#endif
 
 /// The standard error stream used for logging errors.
 var standardError = FileHandle.standardError

diff --git a/Sources/PixarUSD/Base/Arch/Logging.swift b/Sources/PixarUSD/Base/Arch/Logging.swift
@@ -30,9 +30,7 @@
 
 import Foundation
 import Logging
-#if os(macOS) || os(visionOS) || os(iOS) || os(tvOS) || os(watchOS) || os(Linux)
 import Rainbow
-#endif
 
 /* --- xxx --- */
 

diff --git a/Sources/PixarUSD/Bundle.swift b/Sources/PixarUSD/Bundle.swift
@@ -32,9 +32,7 @@ import Arch
 import CxxStdlib
 import Foundation
 import Plug
-#if os(macOS) || os(visionOS) || os(iOS) || os(tvOS) || os(watchOS) || os(Linux)
 import Rainbow
-#endif
 
 #if os(Linux)
   /**