Merge pull request #386 from lorentey/merge.1.1→main

Merge release/1.1 to main

Author: lorentey

CMakeLists.txt

@@ -30,6 +30,13 @@ if(CMAKE_SYSTEM_NAME STREQUAL Windows OR CMAKE_SYSTEM_NAME STREQUAL Darwin)
   option(BUILD_SHARED_LIBS "Build shared libraries by default" YES)
 endif()
 
+option(COLLECTIONS_SINGLE_MODULE "Build as a single module" NO)
+option(COLLECTIONS_FOUNDATION_TOOLCHAIN_MODULE "Build a module for Foundation in the toolchain" NO)
+
+if(COLLECTIONS_FOUNDATION_TOOLCHAIN_MODULE)
+  set(COLLECTIONS_SINGLE_MODULE YES)
+endif()
+
 include(CTest)
 include(SwiftSupport)
 

Package.swift

@@ -178,14 +178,14 @@ let targets: [CustomTarget] = [
   .target(
     kind: .testSupport,
     name: "_CollectionsTestSupport",
-    dependencies: ["_CollectionsUtilities"]),
+    dependencies: ["InternalCollectionsUtilities"]),
   .target(
     kind: .test,
     name: "CollectionsTestSupportTests",
     dependencies: ["_CollectionsTestSupport"]),
   .target(
     kind: .hidden,
-    name: "_CollectionsUtilities",
+    name: "InternalCollectionsUtilities",
     exclude: [
       "CMakeLists.txt",
       "Compatibility/UnsafeMutableBufferPointer+SE-0370.swift.gyb",
@@ -209,7 +209,7 @@ let targets: [CustomTarget] = [
   .target(
     kind: .exported,
     name: "BitCollections",
-    dependencies: ["_CollectionsUtilities"],
+    dependencies: ["InternalCollectionsUtilities"],
     exclude: ["CMakeLists.txt"]),
   .target(
     kind: .test,
@@ -221,7 +221,7 @@ let targets: [CustomTarget] = [
   .target(
     kind: .exported,
     name: "DequeModule",
-    dependencies: ["_CollectionsUtilities"],
+    dependencies: ["InternalCollectionsUtilities"],
     exclude: ["CMakeLists.txt"]),
   .target(
     kind: .test,
@@ -231,7 +231,7 @@ let targets: [CustomTarget] = [
   .target(
     kind: .exported,
     name: "HashTreeCollections",
-    dependencies: ["_CollectionsUtilities"],
+    dependencies: ["InternalCollectionsUtilities"],
     exclude: ["CMakeLists.txt"]),
   .target(
     kind: .test,
@@ -241,7 +241,7 @@ let targets: [CustomTarget] = [
   .target(
     kind: .exported,
     name: "HeapModule",
-    dependencies: ["_CollectionsUtilities"],
+    dependencies: ["InternalCollectionsUtilities"],
     exclude: ["CMakeLists.txt"]),
   .target(
     kind: .test,
@@ -251,7 +251,7 @@ let targets: [CustomTarget] = [
   .target(
     kind: .exported,
     name: "OrderedCollections",
-    dependencies: ["_CollectionsUtilities"],
+    dependencies: ["InternalCollectionsUtilities"],
     exclude: ["CMakeLists.txt"]),
   .target(
     kind: .test,
@@ -261,7 +261,7 @@ let targets: [CustomTarget] = [
   .target(
     kind: .exported,
     name: "_RopeModule",
-    dependencies: ["_CollectionsUtilities"],
+    dependencies: ["InternalCollectionsUtilities"],
     directory: "RopeModule",
     exclude: ["CMakeLists.txt"]),
   .target(
@@ -272,7 +272,7 @@ let targets: [CustomTarget] = [
   .target(
     kind: .exported,
     name: "SortedCollections",
-    dependencies: ["_CollectionsUtilities"],
+    dependencies: ["InternalCollectionsUtilities"],
     directory: "SortedCollections"),
   .target(
     kind: .test,

Sources/BitCollections/BitArray/BitArray+ChunkedBitsIterators.swift

@@ -10,7 +10,7 @@
 //===----------------------------------------------------------------------===//
 
 #if !COLLECTIONS_SINGLE_MODULE
-import _CollectionsUtilities
+import InternalCollectionsUtilities
 #endif
 
 internal struct _ChunkedBitsForwardIterator {

Sources/BitCollections/BitArray/BitArray+Copy.swift

@@ -10,7 +10,7 @@
 //===----------------------------------------------------------------------===//
 
 #if !COLLECTIONS_SINGLE_MODULE
-import _CollectionsUtilities
+import InternalCollectionsUtilities
 #endif
 
 extension BitArray {

Sources/BitCollections/BitArray/BitArray+Invariants.swift

@@ -10,7 +10,7 @@
 //===----------------------------------------------------------------------===//
 
 #if !COLLECTIONS_SINGLE_MODULE
-import _CollectionsUtilities
+import InternalCollectionsUtilities
 #endif
 
 extension BitArray {

Sources/BitCollections/BitArray/BitArray+RangeReplaceableCollection.swift

@@ -10,7 +10,7 @@
 //===----------------------------------------------------------------------===//
 
 #if !COLLECTIONS_SINGLE_MODULE
-import _CollectionsUtilities
+import InternalCollectionsUtilities
 #endif
 
 extension BitArray: RangeReplaceableCollection {}

Sources/BitCollections/BitArray/BitArray._UnsafeHandle.swift

@@ -10,7 +10,7 @@
 //===----------------------------------------------------------------------===//
 
 #if !COLLECTIONS_SINGLE_MODULE
-import _CollectionsUtilities
+import InternalCollectionsUtilities
 #endif
 
 extension BitArray {

Sources/BitCollections/BitArray/BitArray.swift

@@ -10,7 +10,7 @@
 //===----------------------------------------------------------------------===//
 
 #if !COLLECTIONS_SINGLE_MODULE
-import _CollectionsUtilities
+import InternalCollectionsUtilities
 #endif
 
 /// An ordered, random-access collection of `Bool` values, implemented as an

Sources/BitCollections/BitSet/BitSet+CustomStringConvertible.swift

@@ -10,7 +10,7 @@
 //===----------------------------------------------------------------------===//
 
 #if !COLLECTIONS_SINGLE_MODULE
-import _CollectionsUtilities
+import InternalCollectionsUtilities
 #endif
 
 extension BitSet: CustomStringConvertible {

Sources/BitCollections/BitSet/BitSet+Extras.swift

@@ -10,7 +10,7 @@
 //===----------------------------------------------------------------------===//
 
 #if !COLLECTIONS_SINGLE_MODULE
-import _CollectionsUtilities
+import InternalCollectionsUtilities
 #endif
 
 extension BitSet: _UniqueCollection {}