Skip to content

Update links for repositories moved to the swiftlang org on GitHub #7712

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion BuildSupport/SwiftSyntax/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ if(NOT SwiftSyntax_FOUND)
SOURCE_DIR "${swift_syntax_path}")
else()
FetchContent_Declare(SwiftSyntax
GIT_REPOSITORY https://github.com/apple/swift-syntax
GIT_REPOSITORY https://github.com/swiftlang/swift-syntax
GIT_TAG main)
endif()
FetchContent_MakeAvailable(SwiftSyntax)
Expand Down
8 changes: 4 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ For more information about making contributions to the Swift project in general

## Reporting issues

Issues are tracked using [SwiftPM GitHub Issue Tracker](https://github.com/apple/swift-package-manager/issues).
Issues are tracked using [SwiftPM GitHub Issue Tracker](https://github.com/swiftlang/swift-package-manager/issues).

Fill the following fields:

Expand All @@ -37,7 +37,7 @@ generated and the Xcode build log.

## Setting up the development environment

First, clone a copy of SwiftPM code from https://github.com/apple/swift-package-manager.
First, clone a copy of SwiftPM code from https://github.com/swiftlang/swift-package-manager.

If you are preparing to make a contribution you should fork the repository first and clone the fork which will make opening Pull Requests easier. See "Creating Pull Requests" section below.

Expand Down Expand Up @@ -314,7 +314,7 @@ Note there are several Linux and Swift versions options to choose from, e.g.:

## Creating Pull Requests

1. Fork: https://github.com/apple/swift-package-manager
1. Fork: https://github.com/swiftlang/swift-package-manager
2. Clone a working copy of your fork
3. Create a new branch
4. Make your code changes
Expand Down Expand Up @@ -421,7 +421,7 @@ SwiftPM uses [Tools Support Core](https://github.com/apple/swift-tools-support-c

If you want to connect with the Swift community you can:
* Use Swift Forums: [https://forums.swift.org/c/development/SwiftPM](https://forums.swift.org/c/development/SwiftPM)
* Contact the CODEOWNERS: https://github.com/apple/swift-package-manager/blob/main/CODEOWNERS
* Contact the CODEOWNERS: https://github.com/swiftlang/swift-package-manager/blob/main/CODEOWNERS

## Additional resources

Expand Down
4 changes: 2 additions & 2 deletions Documentation/PackageRegistry/Registry.md
Original file line number Diff line number Diff line change
Expand Up @@ -1273,7 +1273,7 @@ JSON schema below.
```json
{
"$schema": "https://json-schema.org/draft/2020-12/schema",
"$id": "https://github.com/apple/swift-package-manager/blob/main/Documentation/PackageRegistry/Registry.md",
"$id": "https://github.com/swiftlang/swift-package-manager/blob/main/Documentation/PackageRegistry/Registry.md",
"title": "Package Release Metadata",
"description": "Metadata of a package release.",
"type": "object",
Expand Down Expand Up @@ -1428,5 +1428,5 @@ JSON schema below.
[offline cache]: https://yarnpkg.com/features/offline-cache "Offline Cache | Yarn - Package Manager"
[XCFramework]: https://developer.apple.com/videos/play/wwdc2019/416/ "WWDC 2019 Session 416: Binary Frameworks in Swift"
[SE-0272]: https://github.com/apple/swift-evolution/blob/master/proposals/0272-swiftpm-binary-dependencies.md "Package Manager Binary Dependencies"
[Swift tools version]: https://github.com/apple/swift-package-manager/blob/9b9bed7eaf0f38eeccd0d8ca06ae08f6689d1c3f/Documentation/Usage.md#swift-tools-version-specification "Swift Tools Version Specification"
[Swift tools version]: https://github.com/swiftlang/swift-package-manager/blob/9b9bed7eaf0f38eeccd0d8ca06ae08f6689d1c3f/Documentation/Usage.md#swift-tools-version-specification "Swift Tools Version Specification"
[ISO 8601]: https://www.iso.org/iso-8601-date-and-time-format.html "ISO 8601 Date and Time Format"
2 changes: 1 addition & 1 deletion Documentation/Usage.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ SwiftPM can generate boilerplate for custom macros:
The value 42 was produced by the code "a + b"

This creates a package with a `.macro` type target with its required dependencies
on [swift-syntax](https://github.com/apple/swift-syntax), a library `.target`
on [swift-syntax](https://github.com/swiftlang/swift-syntax), a library `.target`
containing the macro's code, and an `.executableTarget` and `.testTarget` for
running the macro. The sample macro, `StringifyMacro`, is documented in the Swift
Evolution proposal for [Expression Macros](https://github.com/apple/swift-evolution/blob/main/proposals/0382-expression-macros.md)
Expand Down
4 changes: 2 additions & 2 deletions Documentation/libSwiftPM.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ A subset of `libSwiftPM` that includes only the data model (without SwiftPM's
build system) is available as `libSwiftPMDataModel`. Any one client should
depend on one or the other, but not both.

The SwiftPM repository contains an [example](https://github.com/apple/swift-package-manager/tree/master/Examples/package-info) that demonstrates the use of
The SwiftPM repository contains an [example](https://github.com/swiftlang/swift-package-manager/tree/master/Examples/package-info) that demonstrates the use of
`libSwiftPM` in a Swift package. Use the following commands to run the example
package:

```sh
$ git clone https://github.com/apple/swift-package-manager
$ git clone https://github.com/swiftlang/swift-package-manager
$ cd swift-package-manager/Examples/package-info
$ swift run
```
2 changes: 1 addition & 1 deletion Examples/package-info/Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ let package = Package(
// This just points to the SwiftPM at the root of this repository.
.package(name: "swift-package-manager", path: "../../"),
// You will want to depend on a stable semantic version instead:
// .package(url: "https://github.com/apple/swift-package-manager", .exact("0.4.0"))
// .package(url: "https://github.com/swiftlang/swift-package-manager", .exact("0.4.0"))
],
targets: [
.executableTarget(
Expand Down
2 changes: 1 addition & 1 deletion NOTICE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

Please visit the SwiftPM web site for more information:

* https://github.com/apple/swift-package-manager
* https://github.com/swiftlang/swift-package-manager

Copyright (c) 2014 - 2021 Apple Inc. and the Swift project authors

Expand Down
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -829,7 +829,7 @@ if ProcessInfo.processInfo.environment["SWIFTCI_USE_LOCAL_DEPS"] == nil {
.package(url: "https://github.com/apple/swift-argument-parser.git", .upToNextMinor(from: "1.2.2")),
.package(url: "https://github.com/apple/swift-driver.git", branch: relatedDependenciesBranch),
.package(url: "https://github.com/apple/swift-crypto.git", .upToNextMinor(from: "3.0.0")),
.package(url: "https://github.com/apple/swift-syntax.git", branch: relatedDependenciesBranch),
.package(url: "https://github.com/swiftlang/swift-syntax.git", branch: relatedDependenciesBranch),
.package(url: "https://github.com/apple/swift-system.git", "1.1.1" ..< "1.4.0"),
.package(url: "https://github.com/apple/swift-collections.git", "1.0.1" ..< "1.2.0"),
.package(url: "https://github.com/apple/swift-certificates.git", "1.0.1" ..< "1.4.0"),
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ We’ve designed the system to make it easy to share packages on services like G

Swift Package Manager includes a build system that can build for macOS and Linux. Starting with Xcode 11, Xcode integrates with SwiftPM to provide support for including packages in iOS, macOS, watchOS, and tvOS applications.

The [SourceKit-LSP](https://github.com/apple/sourcekit-lsp) project leverages libSwiftPM and provides [Language Server Protocol](https://langserver.org/) implementation for editors that support LSP.
The [SourceKit-LSP](https://github.com/swiftlang/sourcekit-lsp) project leverages libSwiftPM and provides [Language Server Protocol](https://langserver.org/) implementation for editors that support LSP.

---

Expand Down Expand Up @@ -73,7 +73,7 @@ The Swift package manager uses [llbuild](https://github.com/apple/swift-llbuild)
If you have any trouble with the package manager, help is available. We recommend:

* The [Swift Forums](https://forums.swift.org/c/development/swiftpm/),
* SwiftPM's [bug tracker](https://github.com/apple/swift-package-manager/issues)
* SwiftPM's [bug tracker](https://github.com/swiftlang/swift-package-manager/issues)

When reporting an issue please follow the bug reporting guidelines, they can be found in [contribution guide](./CONTRIBUTING.md#reporting-issues).

Expand Down
2 changes: 1 addition & 1 deletion Sources/Basics/Errors.swift
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public struct InternalError: Error {
public init(_ description: String) {
assertionFailure(description)
self.description =
"Internal error. Please file a bug at https://github.com/apple/swift-package-manager/issues with this info. \(description)"
"Internal error. Please file a bug at https://github.com/swiftlang/swift-package-manager/issues with this info. \(description)"
}
}

Expand Down
8 changes: 4 additions & 4 deletions Sources/PackageCollectionsModel/Formats/v1.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ To begin, define the top-level metadata about the collection:
Each item in the `packages` array is a package object with the following properties:

* `url`: The URL of the package. Currently only Git repository URLs are supported. URL should be HTTPS and may contain `.git` suffix.
* `identity`: The [identity](https://github.com/apple/swift-package-manager/blob/main/Documentation/PackageRegistry/Registry.md#36-package-identification) of the package if published to registry. **Optional.**
* `identity`: The [identity](https://github.com/swiftlang/swift-package-manager/blob/main/Documentation/PackageRegistry/Registry.md#36-package-identification) of the package if published to registry. **Optional.**
* `summary`: A description of the package. **Optional.**
* `keywords`: An array of keywords that the package is associated with. **Optional.**
* `readmeURL`: The URL of the package's README. **Optional.**
Expand Down Expand Up @@ -102,7 +102,7 @@ A version object has metadata extracted from `Package.swift` and optionally addi
* `name`: License name. [SPDX identifier](https://spdx.org/licenses/) (e.g., `Apache-2.0`, `MIT`, etc.) preferred. Omit if unknown. **Optional.**
* `author`: The package version's author. **Optional.**
* `name`: The author of the package version.
* `signer`: The signer of the package version. **Optional.** Refer to [documentation](https://github.com/apple/swift-package-manager/blob/main/Documentation/PackageRegistry/PackageRegistryUsage.md#package-signing) on package signing for details.
* `signer`: The signer of the package version. **Optional.** Refer to [documentation](https://github.com/swiftlang/swift-package-manager/blob/main/Documentation/PackageRegistry/PackageRegistryUsage.md#package-signing) on package signing for details.
* `type`: The signer type. Currently the only valid value is `ADP` (Apple Developer Program).
* `commonName`: The common name of the signing certificate's subject.
* `organizationalUnitName`: The organizational unit name of the signing certificate's subject.
Expand All @@ -111,15 +111,15 @@ A version object has metadata extracted from `Package.swift` and optionally addi

##### Version-specific manifests

Package collection generators should include data from the "default" manifest `Package.swift` as well as [version-specific manifest(s)](https://github.com/apple/swift-package-manager/blob/main/Documentation/Usage.md#version-specific-manifest-selection).
Package collection generators should include data from the "default" manifest `Package.swift` as well as [version-specific manifest(s)](https://github.com/swiftlang/swift-package-manager/blob/main/Documentation/Usage.md#version-specific-manifest-selection).

The keys of the `manifests` map are Swift tools (semantic) versions:
* For `Package.swift`, the tools version specified in `Package.swift` should be used.
* For version-specific manifests, the tools version specified in the filename should be used. For example, for `[email protected]` it would be `4.2`. The tools version in the manifest must match that in the filename.

##### Version-specific tags

[Version-specific tags](https://github.com/apple/swift-package-manager/blob/main/Documentation/Usage.md#version-specific-tag-selection) are not
[Version-specific tags](https://github.com/swiftlang/swift-package-manager/blob/main/Documentation/Usage.md#version-specific-tag-selection) are not
supported by package collections.

## Example
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ extension PackageCollectionModel.V1.Collection {
/// The URL of the package. Currently only Git repository URLs are supported.
public let url: URL

/// Package identity for registry (https://github.com/apple/swift-package-manager/blob/main/Documentation/PackageRegistry/Registry.md#36-package-identification).
/// Package identity for registry (https://github.com/swiftlang/swift-package-manager/blob/main/Documentation/PackageRegistry/Registry.md#36-package-identification).
public let identity: String?

/// A description of the package.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ The package manifest also allows you to define executable products, as well as p

For more information about adding a package dependency to your app project and creating Swift packages with Xcode, see [Adding Package Dependencies to Your App](https://developer.apple.com/documentation/xcode/adding-package-dependencies-to-your-app), [Creating a Standalone Swift Package with Xcode](https://developer.apple.com/documentation/xcode/creating-a-standalone-swift-package-with-xcode), and [Swift Packages](https://developer.apple.com/documentation/xcode/swift-packages).

Support for Swift packages in Xcode builds on the open-source Swift Package Manager project. To learn more about the Swift Package Manager, visit [Swift.org](https://www.swift.org/package-manager/) and the Swift Package Manager repository on [GitHub](https://github.com/apple/swift-package-manager).
Support for Swift packages in Xcode builds on the open-source Swift Package Manager project. To learn more about the Swift Package Manager, visit [Swift.org](https://www.swift.org/package-manager/) and the Swift Package Manager repository on [GitHub](https://github.com/swiftlang/swift-package-manager).

## Topics

Expand Down
2 changes: 1 addition & 1 deletion Sources/PackageGraph/Resolution/ResolvedModule.swift
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ public struct ResolvedModule {
// Make sure that test products are built for the tools triple if it has tools as direct dependencies.
// Without this workaround, `assertMacroExpansion` in tests can't be built, as it requires macros
// and SwiftSyntax to be built for the same triple as the tests.
// See https://github.com/apple/swift-package-manager/pull/7349 for more context.
// See https://github.com/swiftlang/swift-package-manager/pull/7349 for more context.
var inferredBuildTriple = BuildTriple.destination
loop: for dependency in dependencies {
switch dependency {
Expand Down
2 changes: 1 addition & 1 deletion Sources/PackageGraph/Resolution/ResolvedProduct.swift
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ public struct ResolvedProduct {
// Make sure that test products are built for the tools triple if it has tools as direct dependencies.
// Without this workaround, `assertMacroExpansion` in tests can't be built, as it requires macros
// and SwiftSyntax to be built for the same triple as the tests.
// See https://github.com/apple/swift-package-manager/pull/7349 for more context.
// See https://github.com/swiftlang/swift-package-manager/pull/7349 for more context.
var inferredBuildTriple = BuildTriple.destination
modulesLoop: for module in modules {
for dependency in module.dependencies {
Expand Down
4 changes: 2 additions & 2 deletions Sources/PackageLoading/ModuleMapGenerator.swift
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ extension ClangModule: ModuleMapProtocol {
/// * Otherwise, if the "include" directory only contains header files and no other subdirectory:
/// Generates: `umbrella "path/to/include"`
///
/// These rules are documented at https://github.com/apple/swift-package-manager/blob/master/Documentation/Usage.md#creating-c-language-targets. To avoid breaking existing packages, do not change the semantics here without making any change conditional on the tools version of the package that defines the module.
/// These rules are documented at https://github.com/swiftlang/swift-package-manager/blob/master/Documentation/Usage.md#creating-c-language-targets. To avoid breaking existing packages, do not change the semantics here without making any change conditional on the tools version of the package that defines the module.
///
/// Note that a module map generator doesn't require a module to already have been instantiated; it can operate on information that will later be used to instantiate a module.
public struct ModuleMapGenerator {
Expand All @@ -89,7 +89,7 @@ public struct ModuleMapGenerator {

/// Inspects the file system at the public-headers directory with which the module map generator was instantiated, and returns the type of module map that applies to that directory. This function contains all of the heuristics that implement module map policy for package targets; other functions just use the results of this determination.
public func determineModuleMapType(observabilityScope: ObservabilityScope) -> ModuleMapType {
// The following rules are documented at https://github.com/apple/swift-package-manager/blob/master/Documentation/Usage.md#creating-c-language-targets. To avoid breaking existing packages, do not change the semantics here without making any change conditional on the tools version of the package that defines the module.
// The following rules are documented at https://github.com/swiftlang/swift-package-manager/blob/master/Documentation/Usage.md#creating-c-language-targets. To avoid breaking existing packages, do not change the semantics here without making any change conditional on the tools version of the package that defines the module.

let diagnosticsEmitter = observabilityScope.makeDiagnosticsEmitter {
var metadata = ObservabilityMetadata()
Expand Down
4 changes: 2 additions & 2 deletions Sources/PackageLoading/Target+PkgConfig.swift
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ public func pkgConfigArgs(
var (cFlags, libs) = try removeDefaultFlags(cFlags: filtered.cFlags, libs: filtered.libs)

// Patch any paths containing an SDK to the current SDK
// See https://github.com/apple/swift-package-manager/issues/6439
// See https://github.com/swiftlang/swift-package-manager/issues/6439
if let sdkRootPath = sdkRootPath {
cFlags = try patchSDKPaths(in: cFlags, to: sdkRootPath)
libs = try patchSDKPaths(in: libs, to: sdkRootPath)
Expand Down Expand Up @@ -316,7 +316,7 @@ public func removeDefaultFlags(cFlags: [String], libs: [String]) throws -> ([Str

/// Replaces any path containing *.sdk with the current SDK to avoid conflicts.
///
/// See https://github.com/apple/swift-package-manager/issues/6439 for details.
/// See https://github.com/swiftlang/swift-package-manager/issues/6439 for details.
public func patchSDKPaths(in flags: [String], to sdkRootPath: AbsolutePath) throws -> [String] {
let sdkRegex = try! RegEx(pattern: #"^.*\.sdk(\/.*|$)"#)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public struct LibraryMetadata: Hashable, Decodable {
case sourceControl(url: SourceControlURL)
}

/// The package from which it was built (e.g., the URL https://github.com/apple/swift-syntax.git)
/// The package from which it was built (e.g., the URL https://github.com/swiftlang/swift-syntax.git)
public let identities: [Identity]
/// The version that was built (e.g., 509.0.2)
public let version: String
Expand Down
2 changes: 1 addition & 1 deletion Sources/PackageModelSyntax/AddTarget.swift
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ fileprivate let macroTargetDependencies: [TargetDescription.Dependency] = [
fileprivate extension PackageDependency {
/// Source control URL for the swift-syntax package.
static var swiftSyntaxURL: SourceControlURL {
"https://github.com/apple/swift-syntax.git"
"https://github.com/swiftlang/swift-syntax.git"
}

/// Package dependency on the swift-syntax package.
Expand Down
Loading