update to latest collections

swiftlang · Jul 8, 2021 · 0b55ada · 0b55ada
1 parent 2121ec0
commit 0b55ada
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -53,8 +53,7 @@ if(FIND_PM_DEPS)
   find_package(ArgumentParser CONFIG REQUIRED)
   find_package(SwiftCrypto CONFIG REQUIRED)
   find_package(SwiftDriver CONFIG REQUIRED)
-  # FIXME: need to change in SwiftCollections (swift-collections -> SwiftCollections)
-  find_package(swift-collections CONFIG REQUIRED)
+  find_package(SwiftCollections CONFIG REQUIRED)
 endif()
 
 find_package(dispatch QUIET)

diff --git a/Package.swift b/Package.swift
@@ -359,7 +359,7 @@ if ProcessInfo.processInfo.environment["SWIFTCI_USE_LOCAL_DEPS"] == nil {
         .package(url: "https://github.com/apple/swift-argument-parser.git", .upToNextMinor(from: "0.4.3")),
         .package(url: "https://github.com/apple/swift-driver.git", .branch(relatedDependenciesBranch)),
         .package(url: "https://github.com/apple/swift-crypto.git", .upToNextMinor(from: "1.1.4")),
-        .package(url: "https://github.com/apple/swift-collections.git", .upToNextMinor(from: "0.0.3")),
+        .package(url: "https://github.com/apple/swift-collections.git", .upToNextMinor(from: "0.0.4")),
     ]
 } else {
     package.dependencies += [

diff --git a/Utilities/bootstrap b/Utilities/bootstrap
@@ -604,9 +604,7 @@ def build_swiftpm_with_cmake(args):
         "-DArgumentParser_DIR=" + os.path.join(args.swift_argument_parser_build_dir, "cmake/modules"),
         "-DSwiftDriver_DIR=" + os.path.join(args.swift_driver_build_dir, "cmake/modules"),
         "-DSwiftCrypto_DIR=" + os.path.join(args.swift_crypto_build_dir, "cmake/modules"),
-        # FIXME: need to change in SwiftCollections (swift-collections -> SwiftCollections)
-        #"-DSwiftCollections_DIR=" + os.path.join(args.swift_collections_build_dir, "cmake/modules"),        
-        "-Dswift-collections_DIR=" + os.path.join(args.swift_collections_build_dir),
+        "-DSwiftCollections_DIR=" + os.path.join(args.swift_collections_build_dir, "cmake/modules"),
     ]
 
     if platform.system() == 'Darwin':