Skip to content

Commit 436c2c9

Browse files
dschaefer2pmattosbkhouristmontgomerykateinoigakukun
authored
6.2 merge main 0602 (#8754)
Merge main at 4dce989 using `git merge -X theirs origin/main` `git diff origin/main HEAD` is minimal. ``` diff --git a/Package.swift b/Package.swift index 9fbb315..a372459 100644 --- a/Package.swift +++ b/Package.swift @@ -1038,7 +1038,7 @@ func swiftSyntaxDependencies(_ names: [String]) -> [Target.Dependency] { // this right now. /// When not using local dependencies, the branch to use for llbuild and TSC repositories. -let relatedDependenciesBranch = "main" +let relatedDependenciesBranch = "release/6.2" if ProcessInfo.processInfo.environment["SWIFTPM_LLBUILD_FWK"] == nil { if ProcessInfo.processInfo.environment["SWIFTCI_USE_LOCAL_DEPS"] == nil { ``` --------- Co-authored-by: Paulo Mattos <p_mattos@apple.com> Co-authored-by: Bassam (Sam) Khouri <bkhouri@users.noreply.github.com> Co-authored-by: Stuart Montgomery <smontgomery@apple.com> Co-authored-by: Yuta Saito <kateinoigakukun@gmail.com> Co-authored-by: nate-chandler <46721658+nate-chandler@users.noreply.github.com> Co-authored-by: Max Desiatov <m_desiatov@apple.com> Co-authored-by: 3405691582 <dsk@google.com> Co-authored-by: Chris McGee <87777443+cmcgee1024@users.noreply.github.com> Co-authored-by: Dave Inglis <dave.inglis@gmail.com> Co-authored-by: Jonathan Grynspan <jgrynspan@apple.com> Co-authored-by: Jake Petroules <jake.petroules@apple.com> Co-authored-by: Shawn Hyam <shawn_hyam@apple.com> Co-authored-by: Paul LeMarquand <plemarquand@apple.com> Co-authored-by: Pavel Yaskevich <xedin@apache.org> Co-authored-by: johnbute <john.bute@hotmail.com> Co-authored-by: John Bute <johnbute@Johns-MacBook-Pro.local> Co-authored-by: Joseph Heck <j_heck@apple.com> Co-authored-by: kcieplak <kcieplak@apple.com> Co-authored-by: Bri Peticca <briannap_22@apple.com> Co-authored-by: Matt Seaman <mseaman@apple.com> Co-authored-by: Yury Yurevich <yya@apple.com> Co-authored-by: Anthony Latsis <aqamoss3fan2010@gmail.com> Co-authored-by: Bri Peticca <bripeticca@gmail.com> Co-authored-by: Louis Qian <qianyu021026@163.com> Co-authored-by: Ben Barham <ben_barham@apple.com> Co-authored-by: Rauhul Varma <rauhul@apple.com> Co-authored-by: Pavel Yaskevich <pyaskevich@apple.com> Co-authored-by: Owen Voorhees <ovoorhees@apple.com> Co-authored-by: Sam Khouri <bkhouri@apple.com> Co-authored-by: Franz Busch <f.busch@apple.com> Co-authored-by: Robin Kunde <robin.kunde@recoursive.com> Co-authored-by: Dave Inglis <dinglis@apple.com> Co-authored-by: Anthony Latsis <alatsis@apple.com> Co-authored-by: Doug Gregor <dgregor@apple.com> Co-authored-by: Alexis Laferrière <alaf@apple.com> Co-authored-by: Andrew Hoos <AndrewHoos@users.noreply.github.com>
1 parent 3d3246b commit 436c2c9

File tree

195 files changed

+16805
-3052
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

195 files changed

+16805
-3052
lines changed

‎CODEOWNERS‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@
2424

2525
# The following lines are used by GitHub to automatically recommend reviewers.
2626

27-
Sources/XCBuildSupport/* @jakepetroules
28-
2927
* @jakepetroules @dschaefer2 @shawnhyam @bripeticca @plemarquand @owenv @bkhouri @cmcgee1024 @daveyc123
28+
29+
Sources/XCBuildSupport/* @jakepetroules
30+
Sources/Commands/PackageCommands/Migrate.swift @AnthonyLatsis @bnbarham @xedin @jakepetroules @dschaefer2 @shawnhyam @bripeticca @plemarquand @owenv @bkhouri @cmcgee1024 @daveyc123
31+
Sources/SwiftFixIt/* @AnthonyLatsis @bnbarham @xedin @jakepetroules @dschaefer2 @shawnhyam @bripeticca @plemarquand @owenv @bkhouri @cmcgee1024 @daveyc123
32+
Tests/SwiftFixItTests/* @AnthonyLatsis @bnbarham @xedin @jakepetroules @dschaefer2 @shawnhyam @bripeticca @plemarquand @owenv @bkhouri @cmcgee1024 @daveyc123

‎CONTRIBUTING.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -343,6 +343,8 @@ your contribution to Apple and the community, and agree by submitting the patch
343343
that your contributions are licensed under the [Swift
344344
license](https://swift.org/LICENSE.txt).
345345

346+
After a change is known not to cause regressions in the `main` branch, it may be considered for cherry-picking to the latest release branch depending on the release schedule. Cherry-picks require [a specific template to be followed](https://github.com/swiftlang/.github/blob/main/PULL_REQUEST_TEMPLATE/release.md) in PR description that consolidates information about the change necessary for inclusion in the release branch and provides risk evaluation for nominating the change.
347+
346348
## Continuous Integration
347349

348350
SwiftPM uses [swift-ci](https://ci.swift.org) infrastructure for its continuous integration testing. The bots can be triggered on pull-requests if you have commit access. Otherwise, ask one of the code owners to trigger them for you.

‎Documentation/Design/PackageManagerCommunityProposal.md‎

Lines changed: 0 additions & 311 deletions
This file was deleted.

‎Documentation/PackageRegistry/PackageRegistryUsage.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ Here is an example of a source control dependency:
137137

138138
```swift
139139
dependencies: [
140-
.package(id: "https://github.com/mona/LinkedList", .upToNextMajor(from: "1.0.0")),
140+
.package(url: "https://github.com/mona/LinkedList", .upToNextMajor(from: "1.0.0")),
141141
],
142142
```
143143

‎Documentation/PackageRegistry/Registry.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -560,7 +560,7 @@ Content-Disposition: attachment; filename="Package.swift"
560560
Content-Length: 361
561561
Content-Version: 1
562562
Link: <http://packages.example.com/mona/LinkedList/1.1.1/Package.swift?swift-version=4>; rel="alternate"; filename="Package@swift-4.swift"; swift-tools-version="4.0",
563-
<http://packages.example.com/mona/LinkedList/1.1.1/Package.swift?swift-version=4.2>; rel="alternate"; filename="Package@swift-4.2.swift"; swift-tools-version="4.0"
563+
<http://packages.example.com/mona/LinkedList/1.1.1/Package.swift?swift-version=4.2>; rel="alternate"; filename="Package@swift-4.2.swift"; swift-tools-version="4.2"
564564
565565
// swift-tools-version:5.0
566566
import PackageDescription

‎Fixtures/DependencyResolution/External/Complex/FisherYates/src/Fisher-Yates_Shuffle.swift‎

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,3 @@
1-
#if os(macOS) || os(iOS)
2-
import Darwin
3-
#elseif canImport(Glibc)
4-
import Glibc
5-
#elseif canImport(Musl)
6-
import Musl
7-
#elseif canImport(Bionic)
8-
import Bionic
9-
#endif
101

112
public extension Collection {
123
func shuffle() -> [Iterator.Element] {
@@ -24,15 +15,13 @@ public extension MutableCollection {
2415
guard c > 1 else { return }
2516

2617
for (firstUnshuffled, unshuffledCount) in zip(indices, stride(from: c, to: 1, by: -1)) {
27-
#if os(macOS) || os(iOS)
28-
let d = arc4random_uniform(numericCast(unshuffledCount))
29-
#else
30-
let d = numericCast(random()) % unshuffledCount
31-
#endif
32-
let i = index(firstUnshuffled, offsetBy: numericCast(d))
18+
var g = SystemRandomNumberGenerator()
19+
let d = Int.random(in: 1...unshuffledCount, using: &g)
20+
let i = index(firstUnshuffled, offsetBy: d)
3321
swapAt(firstUnshuffled, i)
3422
}
3523
}
3624
}
3725

26+
3827
public let shuffle = false

‎Fixtures/Miscellaneous/AtMainSupport/Package.swift‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@ let package = Package(
99
.executable(name: "SwiftExecMultiFile", targets: ["SwiftExecMultiFile"]),
1010
],
1111
targets: [
12-
.executableTarget(name: "ClangExecSingleFile"),
12+
.executableTarget(name: "ClangExecSingleFile",
13+
linkerSettings: [
14+
.linkedLibrary("swiftCore", .when(platforms: [.windows])), // for swift_addNewDSOImage
15+
]),
1316
.executableTarget(name: "SwiftExecSingleFile"),
1417
.executableTarget(name: "SwiftExecMultiFile"),
1518
]

‎Fixtures/Miscellaneous/EchoExecutable/Sources/secho/main.swift‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,12 @@
44
import Musl
55
#elseif canImport(Android)
66
import Android
7-
#else
7+
#elseif canImport(Darwin.C)
88
import Darwin.C
9+
#elseif canImport(ucrt)
10+
import ucrt
11+
let PATH_MAX = 260
12+
typealias Int = Int32
913
#endif
1014

1115
let cwd = getcwd(nil, Int(PATH_MAX))

‎Fixtures/Miscellaneous/EchoExecutable/echo.bat‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
echo sentinel
2+
echo %*

‎Fixtures/Miscellaneous/EchoExecutable/toolset.win32.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"debugger": { "path": "echo.bat" },
3+
"testRunner": { "path": "echo.bat" },
4+
"schemaVersion" : "1.0",
5+
"rootPath" : "."
6+
}

0 commit comments

Comments
 (0)