Merge remote-tracking branch 'origin/master' into SR-1741

Author: ViktorSimko

.mailmap

@@ -0,0 +1,134 @@
+Adrian-Constantin Popescu <[email protected]> <[email protected]>
+Alex Blewitt <[email protected]> <[email protected]>
+Alex Hoppen <[email protected]> <[email protected]>
+Alexis Beingessner <[email protected]> <[email protected]>
+Alper Çugun <[email protected]> <[email protected]>
+Amr Aboelela <[email protected]> <[email protected]>
+Ankit Aggarwal <[email protected]> <[email protected]>
+Argyrios Kyrtzidis <[email protected]> <[email protected]>
+Arsen Gasparyan <[email protected]> <[email protected]>
+Ben Cohen <[email protected]>
+Ben Cohen <[email protected]> <[email protected]>
+Ben Cohen <[email protected]> <[email protected]>
+Ben Langmuir <[email protected]> <[email protected]>
+Brent Royal-Gordon <[email protected]> <[email protected]>
+Brian Croom <[email protected]> <[email protected]>
+Brian Gesiak <[email protected]> <[email protected]>
+Bryan Chan <[email protected]> <[email protected]>
+Calvin Hill <[email protected]> <[email protected]>
+Chris Bieneman <[email protected]>
+Chris Bieneman <[email protected]> <[email protected]>
+Chris Lattner <[email protected]> <[email protected]>
+Chris Lattner <[email protected]> <[email protected]>
+Chris Lattner <[email protected]> <[email protected]>
+Chris Williams <[email protected]> <[email protected]>
+codester <[email protected]> codestergit <[email protected]>
+Dan Liew <[email protected]> <[email protected]>
+Daniel Duan <[email protected]> <[email protected]>
+Dante Broggi <[email protected]>
+Dave <[email protected]>
+Dave Abrahams <[email protected]> <[email protected]>
+Dave Abrahams <[email protected]> <[email protected]>
+Dave Abrahams <[email protected]> <[email protected]>
+Dave Abrahams <[email protected]> <[email protected]>
+Dave Lee <[email protected]> <[email protected]>
+David Rönnqvist <[email protected]> <[email protected]>
+David Zarzycki <[email protected]> <[email protected]>
+David Zarzycki <[email protected]> <[email protected]>
+Davide Italiano <[email protected]> <[email protected]>
+Davide Italiano <[email protected]> <[email protected]>
+Dmitri Gribenko <[email protected]> <[email protected]>
+Doug Coleman <[email protected]> <[email protected]>
+Enrico Granata <[email protected]> <[email protected]>
+Enrico Granata <[email protected]> <[email protected]>
+Erik Eckstein <[email protected]> <[email protected]>
+Erik Eckstein <[email protected]> <[email protected]>
+Erik Verbruggen <[email protected]> <[email protected]>
+Ewa Matejska <[email protected]> <[email protected]>
+Ewa Matejska <[email protected]> <[email protected]>
+Ewa Matejska <[email protected]> <[email protected]>
+Florent Bruneau <[email protected]> <[email protected]>
+Francis Ricci <[email protected]> <[email protected]>
+GauravDS <[email protected]> <[email protected]>
+Graydon Hoare <[email protected]> <[email protected]>
+Greg Parker <[email protected]> <[email protected]>
+Guillaume Lessard <[email protected]> <[email protected]>
+Hamish <[email protected]> <[email protected]>
+Han Sangjin <[email protected]> <[email protected]>
+Harlan Haskins <[email protected]> <[email protected]>
+Hitster GTD <[email protected]> <[email protected]>
+Huon Wilson <[email protected]> <[email protected]>
+Ingmar Stein <[email protected]>
+Itai Ferber <[email protected]> <[email protected]>
+Jacob Bandes-Storch <[email protected]> <[email protected]>
+Jacob Mizraji <[email protected]> <[email protected]>
+Janosch Hildebrand <[email protected]> <[email protected]>
+Janosch Hildebrand <[email protected]> <[email protected]>
+Javier Soto <[email protected]> <[email protected]>
+Javier Soto <[email protected]> <[email protected]>
+Joe <[email protected]>
+Joe <[email protected]>
+joe DeCapo <[email protected]>
+Joe Groff <[email protected]> <[email protected]>
+Joe Shajrawi <[email protected]> <[email protected]>
+Joe Shajrawi <[email protected]> <[email protected]>
+Johannes Weiß <[email protected]> <[email protected]>
+John Regner <[email protected]> <[email protected]>
+Karoy Lorentey <[email protected]> <[email protected]>
+Keith Smiley <[email protected]> <[email protected]>
+Kevin Ballard <[email protected]> <[email protected]>
+Kosuke Ogawa <[email protected]> <[email protected]>
+Kuba Mracek <[email protected]> <[email protected]>
+Luiz Fernando Silva <[email protected]>
+Luqman Aden <[email protected]> <[email protected]>
+Marcelo Fabri <[email protected]> <[email protected]>
+Mark Lacey <[email protected]> <[email protected]>
+Mark Lacey <[email protected]> <[email protected]>
+Matt Rajca <[email protected]> <[email protected]>
+Max Moiseev <[email protected]> <[email protected]>
+Max Moiseev <[email protected]> <[email protected]>
+Maxwell Swadling <[email protected]> <[email protected]>
+Maxwell Swadling <[email protected]> <[email protected]>
+Mayur Raiturkar <[email protected]> <[email protected]>
+Michael Gottesman <[email protected]> <[email protected]>
+Michael Ilseman <[email protected]> <[email protected]>
+Mike Ash <[email protected]> <[email protected]>
+Mike Ferris <[email protected]> <[email protected]>
+Mishal Awadah <[email protected]>
+Mishal Shah <[email protected]> <[email protected]>
+Nadav Rotem <[email protected]> <[email protected]>
+Nate Cook <[email protected]> <[email protected]>
+Nate Cook <[email protected]> <[email protected]>
+Nate Cook <[email protected]> <[email protected]>
+Nate Cook <[email protected]> <[email protected]>
+Nathan Lanza <[email protected]> <[email protected]>
+Nicole Jacque <[email protected]>
+Niels Andriesse <[email protected]> <[email protected]>
+Paul Meng <[email protected]> <[email protected]>
+Pavel Yaskevich <[email protected]> <[email protected]>
+Paweł Szot <[email protected]>
+Paweł Szot <[email protected]> <[email protected]>
+Pete Cooper <[email protected]>
+Philip Ridgeway <[email protected]> <[email protected]>
+Richard Wei <[email protected]> <[email protected]>
+Rintaro Ishizaki <[email protected]> <[email protected]>
+Robert Widmann <[email protected]> <[email protected]>
+Roman Levenstein <[email protected]> <[email protected]>
+Ross Bayer <[email protected]> <[email protected]>
+Russ Bishop <[email protected]> <[email protected]>
+Ryan Lovelett <[email protected]> <[email protected]>
+Shawn Erickson <[email protected]> <[email protected]>
+Slava Pestov <[email protected]> <[email protected]>
+Slava Pestov <[email protected]> <[email protected]>
+Stephen Canon <[email protected]>
+Stephen Canon <[email protected]> <[email protected]>
+Sukolsak Sakshuwong <[email protected]>
+Todd Fiala <[email protected]> <[email protected]>
+Toni Suter <[email protected]> <[email protected]>
+Vedant Kumar <[email protected]> <[email protected]>
+Xi Ge <[email protected]> <[email protected]>
+Xin Tong <[email protected]> <[email protected]>
+Xin Tong <[email protected]> <[email protected]>
+Yuka Ezura <[email protected]> <[email protected]>
+Yurii Samsoniuk <[email protected]> <[email protected]>
+Zac Bowling <[email protected]> <[email protected]>

CODE_OWNERS.txt

@@ -8,6 +8,10 @@ beautification by scripts.  The fields are: name (N), email (E), web-address
 (W), PGP key ID and fingerprint (P), description (D), and snail-mail address
 (S).
 
+N: Ankit Aggarwal
+E: [email protected]
+D: Package Manager
+
 N: Anders Bertelrud
 E: [email protected]
 D: Package Manager

Documentation/Development.md

@@ -29,7 +29,7 @@ using a [snapshot](https://swift.org/download/#releases) from swift.org.
 ## Using trunk snapshot
 
 
-1. [Download](https://swift.org/download/#releases) and install latest Trunk Development snapshot.
+1. [Download](https://swift.org/download/#snapshots) and install latest Trunk Development snapshot.
 2. Run the following command depending on your platform.
 
 
@@ -128,12 +128,12 @@ For contributors on macOS who need to test on Linux, install Docker and use the
 following commands:
 
 ```sh
-$ Utilities/docker-utils build # will build an image with the latest swift snapshot
-$ Utilities/docker-utils bootstrap # will bootstrap SwiftPM on the linux container
-$ Utilities/docker-utils run bash # to run an interactive bash shell in the container
-$ Utilities/docker-utils swift-build # to run swift-build in the container
-$ Utilities/docker-utils swift-test # to run swift-test in the container
-$ Utilities/docker-utils swift-run # to run swift-run in the container
+$ Utilities/Docker/docker-utils build # will build an image with the latest swift snapshot
+$ Utilities/Docker/docker-utils bootstrap # will bootstrap SwiftPM on the linux container
+$ Utilities/Docker/docker-utils run bash # to run an interactive bash shell in the container
+$ Utilities/Docker/docker-utils swift-build # to run swift-build in the container
+$ Utilities/Docker/docker-utils swift-test # to run swift-test in the container
+$ Utilities/Docker/docker-utils swift-run # to run swift-run in the container
 ```
 
 ## Using custom Swift compilers

Documentation/PackageDescriptionV4.md

@@ -19,8 +19,8 @@ All targets should be declared in the `Package.swift` manifest file.  Unless the
 relative path of the target is declared, the Package Manager will look for
 a directory matching the name of the target in these places:
 
-Regular targets: package root, Sources, Source, src, srcs.  
-Test targets: Tests, package root, Sources, Source, src, srcs.
+Regular targets: Sources, Source, src, srcs.  
+Test targets: Tests, Sources, Source, src, srcs.
 
 ## Package Manifest File Format Reference
 
@@ -242,7 +242,7 @@ The above manifest declares two target, `Foo` and `Bar`. `Bar` is a test target
 which depends on `Foo`. The Package Manager will automatically search for the
 targets inside package in the [predefined search paths](#target-format-reference).
 
-A target dependency can either be another target in the same package or a target
+A target dependency can either be another target in the same package or a product
 in one of its package dependencies. All target dependencies, internal or
 external, must be explicitly declared.
 

Documentation/README.md

@@ -81,7 +81,7 @@ Dependencies are specified in your `Package.swift` manifest file.
 
 “Dependency Hell” is the colloquialism for a situation where the graph of dependencies required by a project cannot be met. The end-user is then required to solve the scenario; usually a difficult task:
 
-1. The conflict may be in unfamiliar dependencies (of dependencies) that the user did not explicitly request
+1. The conflict may be in unfamiliar dependencies (of dependencies) that the user did not explicitly request.
 2. Due to the nature of development it would be rare for two dependency graphs to be the same. Thus the amount of help other users (often even the package authors) can offer is limited. Internet searches will likely prove fruitless.
 
 A good package manager should be designed from the start to minimize the risk of dependency hell and where this is not possible, to mitigate it and provide tooling so that the end-user can solve the scenario with a minimum of trouble. The [Package Manager Community Proposal](PackageManagerCommunityProposal.md) contains our thoughts on how we intend to iterate with these hells in mind.

Documentation/Resources.md

@@ -15,7 +15,7 @@
 
 ## Support
 
-User-to-user support for Swift Package Manager is available on [swift-users mailing list](mailto:swift-users@swift.org).
+User-to-user support for Swift Package Manager is available on [swift-forums](https://forums.swift.org/c/development/SwiftPM).
 
 ---
 

Documentation/Usage.md

@@ -719,18 +719,27 @@ SwiftPM ships with completion scripts for both Bash and ZSH. These files should
 Use the following commands to install the Bash completions to `~/.swift-package-complete.bash` and automatically load them using your `~/.bash_profile` file.
 
 ```bash
-swift package generate-completion-script bash > ~/.swift-package-complete.bash
+swift package completion-tool generate-bash-script > ~/.swift-package-complete.bash
 echo -e "source ~/.swift-package-complete.bash\n" >> ~/.bash_profile
 source ~/.swift-package-complete.bash
 ```
 
+Alternatively, add the following commands to your `~/.bash_profile` file to directly load completions:
+
+```bash
+# Source Swift completion
+if [ -n "`which swift`" ]; then
+	eval "`swift package completion-tool generate-bash-script`"
+fi
+```
+
 ### ZSH
 
 Use the following commands to install the ZSH completions to `~/.zsh/_swift`. You can chose a different folder, but the filename should be `_swift`. This will also add `~/.zsh` to your `$fpath` using your `~/.zshrc` file.
 
 ```bash
 mkdir ~/.zsh
-swift package generate-completion-script zsh > ~/.zsh/_swift
+swift package completion-tool generate-zsh-script > ~/.zsh/_swift
 echo -e "fpath=(~/.zsh \$fpath)\n" >> ~/.zshrc
 compinit
 ```

Fixtures/CFamilyTargets/ObjCmacOSPackage/Sources/Include/HelloWorldExample.h renamed to Fixtures/CFamilyTargets/ObjCmacOSPackage/Sources/include/HelloWorldExample.h

@@ -1,4 +1,4 @@
-public struct PlayingCard {
+public struct PlayingCard: Equatable {
     let rank: Rank
     let suit: Suit
 
@@ -8,14 +8,6 @@ public struct PlayingCard {
     }
 }
 
-// MARK: - Equatable
-
-extension PlayingCard: Equatable {}
-
-public func ==(lhs: PlayingCard, rhs: PlayingCard) -> Bool {
-    return lhs.rank == rhs.rank && lhs.suit == rhs.suit
-}
-
 // MARK: - Comparable
 
 extension PlayingCard: Comparable {}

Fixtures/DependencyResolution/External/Complex/PlayingCard/src/PlayingCard.swift

@@ -11,7 +11,7 @@
 import FisherYates
 import PlayingCard
 
-public struct Deck {
+public struct Deck: Equatable {
     fileprivate var cards: [PlayingCard]
 
     public static func standard52CardDeck() -> Deck {
@@ -50,11 +50,3 @@ extension Deck : ExpressibleByArrayLiteral {
         self.init(elements)
     }
 }
-
-// MARK: - Equatable
-
-extension Deck : Equatable {}
-
-public func ==(lhs: Deck, rhs: Deck) -> Bool {
-    return lhs.cards == rhs.cards
-}

Fixtures/DependencyResolution/External/Complex/deck-of-playing-cards/src/Deck.swift

@@ -1,4 +1,4 @@
-public struct PlayingCard {
+public struct PlayingCard: Equatable {
     let rank: Rank
     let suit: Suit
 
@@ -8,14 +8,6 @@ public struct PlayingCard {
     }
 }
 
-// MARK: - Equatable
-
-extension PlayingCard: Equatable {}
-
-public func ==(lhs: PlayingCard, rhs: PlayingCard) -> Bool {
-    return lhs.rank == rhs.rank && lhs.suit == rhs.suit
-}
-
 // MARK: - Comparable
 
 extension PlayingCard: Comparable {}

Fixtures/DependencyResolution/External/IgnoreIndirectTests/PlayingCard/src/PlayingCard.swift

@@ -11,7 +11,7 @@
 import FisherYates
 import PlayingCard
 
-public struct Deck {
+public struct Deck: Equatable {
     fileprivate var cards: [PlayingCard]
 
     public static func standard52CardDeck() -> Deck {
@@ -50,11 +50,3 @@ extension Deck : ExpressibleByArrayLiteral {
         self.init(elements)
     }
 }
-
-// MARK: - Equatable
-
-extension Deck : Equatable {}
-
-public func ==(lhs: Deck, rhs: Deck) -> Bool {
-    return lhs.cards == rhs.cards
-}

Fixtures/DependencyResolution/External/IgnoreIndirectTests/deck-of-playing-cards/src/Deck.swift

@@ -0,0 +1,4 @@
+.DS_Store
+/.build
+/Packages
+/*.xcodeproj

Fixtures/Miscellaneous/ThreadRace/.gitignore

@@ -0,0 +1,18 @@
+// swift-tools-version:4.0
+
+import PackageDescription
+
+let package = Package(
+    name: "race",
+    targets: [
+        .target(
+            name: "lib",
+            dependencies: []),
+        .target(
+            name: "exec",
+            dependencies: ["lib"]),
+        .testTarget(
+            name: "libTests",
+            dependencies: ["lib"]),
+    ]
+)

Fixtures/Miscellaneous/ThreadRace/Package.swift

@@ -0,0 +1,3 @@
+# race
+
+A description of this package.

Fixtures/Miscellaneous/ThreadRace/README.md

@@ -0,0 +1,3 @@
+import lib
+
+executeRace()

Fixtures/Miscellaneous/ThreadRace/Sources/exec/main.swift

@@ -0,0 +1,16 @@
+import Dispatch
+
+public func executeRace() {
+    var global = 5
+
+    let sema = DispatchSemaphore(value: 0)
+    DispatchQueue.global().async {
+        global = 6
+        sema.signal()
+    }
+
+    global = 7
+    sema.wait()
+
+    print(global)
+}

Fixtures/Miscellaneous/ThreadRace/Sources/lib/lib.swift

@@ -0,0 +1,8 @@
+import XCTest
+
+import libTests
+
+var tests = [XCTestCaseEntry]()
+tests += libTests.__allTests()
+
+XCTMain(tests)

Fixtures/Miscellaneous/ThreadRace/Tests/LinuxMain.swift

@@ -0,0 +1,15 @@
+import XCTest
+
+extension libTests {
+    static let __allTests = [
+        ("testRace", testRace),
+    ]
+}
+
+#if !os(macOS)
+public func __allTests() -> [XCTestCaseEntry] {
+    return [
+        testCase(libTests.__allTests),
+    ]
+}
+#endif