diff --git a/BuildSupport/SwiftSyntax/CMakeLists.txt b/BuildSupport/SwiftSyntax/CMakeLists.txt index e1d9decb5f3..ce15f75525c 100644 --- a/BuildSupport/SwiftSyntax/CMakeLists.txt +++ b/BuildSupport/SwiftSyntax/CMakeLists.txt @@ -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) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b750b816b37..2545f9ba97c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -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: @@ -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. @@ -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 @@ -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 diff --git a/Documentation/PackageRegistry/Registry.md b/Documentation/PackageRegistry/Registry.md index c4667416aa4..e9a8bd5f4d9 100644 --- a/Documentation/PackageRegistry/Registry.md +++ b/Documentation/PackageRegistry/Registry.md @@ -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", @@ -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" diff --git a/Documentation/Usage.md b/Documentation/Usage.md index 499e545302d..22a26c29e54 100644 --- a/Documentation/Usage.md +++ b/Documentation/Usage.md @@ -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) diff --git a/Documentation/libSwiftPM.md b/Documentation/libSwiftPM.md index 144f8bec18b..7ea9c64621e 100644 --- a/Documentation/libSwiftPM.md +++ b/Documentation/libSwiftPM.md @@ -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 ``` diff --git a/Examples/package-info/Package.swift b/Examples/package-info/Package.swift index 94e5d6d6ffa..e0edff5852e 100644 --- a/Examples/package-info/Package.swift +++ b/Examples/package-info/Package.swift @@ -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( diff --git a/NOTICE.txt b/NOTICE.txt index a68340f8a99..5fa7c7bafaa 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -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 diff --git a/Package.swift b/Package.swift index 33aeed44ce8..6e500b9ff33 100644 --- a/Package.swift +++ b/Package.swift @@ -801,7 +801,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"), diff --git a/README.md b/README.md index 4525450fea0..2b147e560f1 100644 --- a/README.md +++ b/README.md @@ -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. --- @@ -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). diff --git a/Sources/Basics/Errors.swift b/Sources/Basics/Errors.swift index f075978da86..3a6e11c81aa 100644 --- a/Sources/Basics/Errors.swift +++ b/Sources/Basics/Errors.swift @@ -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)" } } diff --git a/Sources/PackageCollectionsModel/Formats/v1.md b/Sources/PackageCollectionsModel/Formats/v1.md index 66235e133dd..e7c5d862d15 100644 --- a/Sources/PackageCollectionsModel/Formats/v1.md +++ b/Sources/PackageCollectionsModel/Formats/v1.md @@ -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.** @@ -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. @@ -111,7 +111,7 @@ 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. @@ -119,7 +119,7 @@ The keys of the `manifests` map are Swift tools (semantic) versions: ##### 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 diff --git a/Sources/PackageCollectionsModel/PackageCollectionModel+v1.swift b/Sources/PackageCollectionsModel/PackageCollectionModel+v1.swift index 58098db299b..85ba3a5dbb2 100644 --- a/Sources/PackageCollectionsModel/PackageCollectionModel+v1.swift +++ b/Sources/PackageCollectionsModel/PackageCollectionModel+v1.swift @@ -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. diff --git a/Sources/PackageDescription/PackageDescription.docc/PackageDescription.md b/Sources/PackageDescription/PackageDescription.docc/PackageDescription.md index 3259534d9c2..0e17c20520b 100644 --- a/Sources/PackageDescription/PackageDescription.docc/PackageDescription.md +++ b/Sources/PackageDescription/PackageDescription.docc/PackageDescription.md @@ -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 diff --git a/Sources/PackageGraph/Resolution/ResolvedModule.swift b/Sources/PackageGraph/Resolution/ResolvedModule.swift index f218a35886d..743ca62cc68 100644 --- a/Sources/PackageGraph/Resolution/ResolvedModule.swift +++ b/Sources/PackageGraph/Resolution/ResolvedModule.swift @@ -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 { diff --git a/Sources/PackageGraph/Resolution/ResolvedProduct.swift b/Sources/PackageGraph/Resolution/ResolvedProduct.swift index 3217ef8d9ea..0a34af10154 100644 --- a/Sources/PackageGraph/Resolution/ResolvedProduct.swift +++ b/Sources/PackageGraph/Resolution/ResolvedProduct.swift @@ -109,7 +109,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 targetsLoop: for target in targets { for dependency in target.dependencies { diff --git a/Sources/PackageLoading/ModuleMapGenerator.swift b/Sources/PackageLoading/ModuleMapGenerator.swift index 141930fa892..bf6ebe7531c 100644 --- a/Sources/PackageLoading/ModuleMapGenerator.swift +++ b/Sources/PackageLoading/ModuleMapGenerator.swift @@ -63,7 +63,7 @@ extension ClangTarget: 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 target. +/// 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 target. /// /// Note that a module map generator doesn't require a target to already have been instantiated; it can operate on information that will later be used to instantiate a target. public struct ModuleMapGenerator { @@ -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 target. + // 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 target. let diagnosticsEmitter = observabilityScope.makeDiagnosticsEmitter { var metadata = ObservabilityMetadata() diff --git a/Sources/PackageLoading/Target+PkgConfig.swift b/Sources/PackageLoading/Target+PkgConfig.swift index 3d20fb863bd..37b3d67dc32 100644 --- a/Sources/PackageLoading/Target+PkgConfig.swift +++ b/Sources/PackageLoading/Target+PkgConfig.swift @@ -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) @@ -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(\/.*|$)"#) diff --git a/Sources/PackageModel/InstalledLibrariesSupport/LibraryMetadata.swift b/Sources/PackageModel/InstalledLibrariesSupport/LibraryMetadata.swift index 7e12d31a6f3..a0c96815c92 100644 --- a/Sources/PackageModel/InstalledLibrariesSupport/LibraryMetadata.swift +++ b/Sources/PackageModel/InstalledLibrariesSupport/LibraryMetadata.swift @@ -19,7 +19,7 @@ public struct LibraryMetadata: 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 diff --git a/Sources/PackageModelSyntax/AddTarget.swift b/Sources/PackageModelSyntax/AddTarget.swift index 2f60c1a840d..b32f705e990 100644 --- a/Sources/PackageModelSyntax/AddTarget.swift +++ b/Sources/PackageModelSyntax/AddTarget.swift @@ -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. diff --git a/Sources/PackageModelSyntax/ManifestSyntaxRepresentable.swift b/Sources/PackageModelSyntax/ManifestSyntaxRepresentable.swift index 8af1d379c18..1b40b2d592a 100644 --- a/Sources/PackageModelSyntax/ManifestSyntaxRepresentable.swift +++ b/Sources/PackageModelSyntax/ManifestSyntaxRepresentable.swift @@ -22,10 +22,10 @@ protocol ManifestSyntaxRepresentable { /// There might be other kinds of syntax nodes that can also represent /// the syntax, but this is the one that a canonical manifest will use. /// As an example, a package dependency is usually expressed as, e.g., - /// .package(url: "https://github.com/apple/swift-syntax.git", from: "510.0.1") + /// .package(url: "https://github.com/swiftlang/swift-syntax.git", from: "510.0.1") /// /// However, there could be other forms, e.g., this is also valid: - /// Package.Dependency.package(url: "https://github.com/apple/swift-syntax.git", from: "510.0.1") + /// Package.Dependency.package(url: "https://github.com/swiftlang/swift-syntax.git", from: "510.0.1") associatedtype PreferredSyntax: SyntaxProtocol /// Provides a suitable syntax node to describe this entity in the package @@ -35,7 +35,7 @@ protocol ManifestSyntaxRepresentable { /// and it's enclosing entity will need to understand how to fit it in. /// For example, a `PackageDependency` entity would map to syntax for /// something like - /// .package(url: "https://github.com/apple/swift-syntax.git", from: "510.0.1") + /// .package(url: "https://github.com/swiftlang/swift-syntax.git", from: "510.0.1") func asSyntax() -> PreferredSyntax } diff --git a/Sources/PackageRegistry/RegistryClient.swift b/Sources/PackageRegistry/RegistryClient.swift index 96445280282..d5d7fb88d2b 100644 --- a/Sources/PackageRegistry/RegistryClient.swift +++ b/Sources/PackageRegistry/RegistryClient.swift @@ -28,7 +28,7 @@ public protocol RegistryClientDelegate { } /// Package registry client. -/// API specification: https://github.com/apple/swift-package-manager/blob/main/Documentation/PackageRegistry/Registry.md +/// API specification: https://github.com/swiftlang/swift-package-manager/blob/main/Documentation/PackageRegistry/Registry.md public final class RegistryClient: Cancellable { public typealias Delegate = RegistryClientDelegate diff --git a/Sources/Workspace/InitPackage.swift b/Sources/Workspace/InitPackage.swift index 28db61c183a..fea673ddd7e 100644 --- a/Sources/Workspace/InitPackage.swift +++ b/Sources/Workspace/InitPackage.swift @@ -116,7 +116,7 @@ public final class InitPackage { fileSystem: FileSystem ) throws { if options.packageType == .macro && options.supportedTestingLibraries.contains(.swiftTesting) { - // FIXME: https://github.com/apple/swift-syntax/issues/2400 + // FIXME: https://github.com/swiftlang/swift-syntax/issues/2400 throw InitError.unsupportedTestingLibraryForPackageType(.swiftTesting, .macro) } @@ -273,10 +273,10 @@ public final class InitPackage { if packageType == .tool { dependencies.append(#".package(url: "https://github.com/apple/swift-argument-parser.git", from: "1.2.0")"#) } else if packageType == .macro { - dependencies.append(#".package(url: "https://github.com/apple/swift-syntax.git", from: "\#(self.installedSwiftPMConfiguration.swiftSyntaxVersionForMacroTemplate.description)")"#) + dependencies.append(#".package(url: "https://github.com/swiftlang/swift-syntax.git", from: "\#(self.installedSwiftPMConfiguration.swiftSyntaxVersionForMacroTemplate.description)")"#) } if options.supportedTestingLibraries.contains(.swiftTesting) { - dependencies.append(#".package(url: "https://github.com/apple/swift-testing.git", from: "0.2.0")"#) + dependencies.append(#".package(url: "https://github.com/swiftlang/swift-testing.git", from: "0.2.0")"#) } if !dependencies.isEmpty { let dependencies = dependencies.map { dependency in @@ -766,7 +766,7 @@ public final class InitPackage { // libraries, but we still only want to present a single library's // example tests. if options.supportedTestingLibraries.contains(.swiftTesting) { - // FIXME: https://github.com/apple/swift-syntax/issues/2400 + // FIXME: https://github.com/swiftlang/swift-syntax/issues/2400 } else if options.supportedTestingLibraries.contains(.xctest) { content += ##""" final class \##(moduleName)Tests: XCTestCase { diff --git a/Tests/BuildTests/BuildPlanTests.swift b/Tests/BuildTests/BuildPlanTests.swift index da21bdb8a33..d1e892323e1 100644 --- a/Tests/BuildTests/BuildPlanTests.swift +++ b/Tests/BuildTests/BuildPlanTests.swift @@ -5548,7 +5548,7 @@ final class BuildPlanTests: XCTestCase { XCTAssertMatch(contents, .contains("extension Foundation.Bundle")) // Assert that `Bundle.main` is executed in the compiled binary (and not during compilation) // See https://bugs.swift.org/browse/SR-14555 and - // https://github.com/apple/swift-package-manager/pull/2972/files#r623861646 + // https://github.com/swiftlang/swift-package-manager/pull/2972/files#r623861646 XCTAssertMatch(contents, .contains("let mainPath = Bundle.main.")) let barTarget = try result.target(for: "Bar").swiftTarget() @@ -5616,7 +5616,7 @@ final class BuildPlanTests: XCTestCase { XCTAssertMatch(contents, .contains("extension Foundation.Bundle")) // Assert that `Bundle.main` is executed in the compiled binary (and not during compilation) // See https://bugs.swift.org/browse/SR-14555 and - // https://github.com/apple/swift-package-manager/pull/2972/files#r623861646 + // https://github.com/swiftlang/swift-package-manager/pull/2972/files#r623861646 XCTAssertMatch(contents, .contains("let mainPath = \"")) let barTarget = try result.target(for: "Bar").swiftTarget() diff --git a/Tests/CommandsTests/PackageCommandTests.swift b/Tests/CommandsTests/PackageCommandTests.swift index edd8b4b0f9d..1fa46c887ba 100644 --- a/Tests/CommandsTests/PackageCommandTests.swift +++ b/Tests/CommandsTests/PackageCommandTests.swift @@ -808,13 +808,13 @@ final class PackageCommandTests: CommandsTestCase { """ ) - _ = try execute(["add-dependency", "--branch", "main", "https://github.com/apple/swift-syntax.git"], packagePath: path) + _ = try execute(["add-dependency", "--branch", "main", "https://github.com/swiftlang/swift-syntax.git"], packagePath: path) let manifest = path.appending("Package.swift") XCTAssertFileExists(manifest) let contents: String = try fs.readFileContents(manifest) - XCTAssertMatch(contents, .contains(#".package(url: "https://github.com/apple/swift-syntax.git", branch: "main"),"#)) + XCTAssertMatch(contents, .contains(#".package(url: "https://github.com/swiftlang/swift-syntax.git", branch: "main"),"#)) } } @@ -1366,7 +1366,7 @@ final class PackageCommandTests: CommandsTestCase { // Test writing. try execute(["config", "set-mirror", "--original", "https://github.com/foo/bar", "--mirror", "https://mygithub.com/foo/bar"], packagePath: packageRoot) - try execute(["config", "set-mirror", "--original", "git@github.com:apple/swift-package-manager.git", "--mirror", "git@mygithub.com:foo/swift-package-manager.git"], packagePath: packageRoot) + try execute(["config", "set-mirror", "--original", "git@github.com:swiftlang/swift-package-manager.git", "--mirror", "git@mygithub.com:foo/swift-package-manager.git"], packagePath: packageRoot) XCTAssertTrue(fs.isFile(configFile)) // Test env override. @@ -1378,7 +1378,7 @@ final class PackageCommandTests: CommandsTestCase { // Test reading. var (stdout, _) = try execute(["config", "get-mirror", "--original", "https://github.com/foo/bar"], packagePath: packageRoot) XCTAssertEqual(stdout.spm_chomp(), "https://mygithub.com/foo/bar") - (stdout, _) = try execute(["config", "get-mirror", "--original", "git@github.com:apple/swift-package-manager.git"], packagePath: packageRoot) + (stdout, _) = try execute(["config", "get-mirror", "--original", "git@github.com:swiftlang/swift-package-manager.git"], packagePath: packageRoot) XCTAssertEqual(stdout.spm_chomp(), "git@mygithub.com:foo/swift-package-manager.git") func check(stderr: String, _ block: () throws -> ()) { @@ -1399,7 +1399,7 @@ final class PackageCommandTests: CommandsTestCase { try execute(["config", "get-mirror", "--original", "https://github.com/foo/bar"], packagePath: packageRoot) } check(stderr: "not found\n") { - try execute(["config", "get-mirror", "--original", "git@github.com:apple/swift-package-manager.git"], packagePath: packageRoot) + try execute(["config", "get-mirror", "--original", "git@github.com:swiftlang/swift-package-manager.git"], packagePath: packageRoot) } check(stderr: "error: Mirror not found for 'foo'\n") { diff --git a/Tests/FunctionalTests/MiscellaneousTests.swift b/Tests/FunctionalTests/MiscellaneousTests.swift index badae071951..ffdd5e14ecf 100644 --- a/Tests/FunctionalTests/MiscellaneousTests.swift +++ b/Tests/FunctionalTests/MiscellaneousTests.swift @@ -346,7 +346,7 @@ class MiscellaneousTestCase: XCTestCase { // See the following additional discussion: // - https://github.com/apple/swift/pull/69696 // - https://github.com/apple/swift/pull/61766 - // - https://github.com/apple/swift-package-manager/pull/5842#issuecomment-1301632685 + // - https://github.com/swiftlang/swift-package-manager/pull/5842#issuecomment-1301632685 try fixture(name: "Miscellaneous/LTO/SwiftAndCTargets") { fixturePath in /*let output =*/ try executeSwiftBuild( diff --git a/Tests/PackageModelSyntaxTests/ManifestEditTests.swift b/Tests/PackageModelSyntaxTests/ManifestEditTests.swift index 614ca912d3e..b2c6254ce67 100644 --- a/Tests/PackageModelSyntaxTests/ManifestEditTests.swift +++ b/Tests/PackageModelSyntaxTests/ManifestEditTests.swift @@ -81,7 +81,7 @@ class ManifestEditTests: XCTestCase { let package = Package( name: "packages", dependencies: [ - .package(url: "https://github.com/apple/swift-syntax.git", from: "510.0.1"), + .package(url: "https://github.com/swiftlang/swift-syntax.git", from: "510.0.1"), ] ) """, expectedManifest: """ @@ -89,7 +89,7 @@ class ManifestEditTests: XCTestCase { let package = Package( name: "packages", dependencies: [ - .package(url: "https://github.com/apple/swift-syntax.git", from: "510.0.1"), + .package(url: "https://github.com/swiftlang/swift-syntax.git", from: "510.0.1"), .package(url: "https://github.com/apple/swift-system.git", branch: "main"), ] ) @@ -112,7 +112,7 @@ class ManifestEditTests: XCTestCase { let package = Package( name: "packages", dependencies: [ - .package(url: "https://github.com/apple/swift-syntax.git", from: "510.0.1") + .package(url: "https://github.com/swiftlang/swift-syntax.git", from: "510.0.1") ] ) """, expectedManifest: """ @@ -120,7 +120,7 @@ class ManifestEditTests: XCTestCase { let package = Package( name: "packages", dependencies: [ - .package(url: "https://github.com/apple/swift-syntax.git", from: "510.0.1"), + .package(url: "https://github.com/swiftlang/swift-syntax.git", from: "510.0.1"), .package(url: "https://github.com/apple/swift-system.git", exact: "510.0.0"), ] ) @@ -144,7 +144,7 @@ class ManifestEditTests: XCTestCase { let package = Package( name: "packages", dependencies: [ - .package(url: "https://github.com/apple/swift-syntax.git", from: "510.0.1") + .package(url: "https://github.com/swiftlang/swift-syntax.git", from: "510.0.1") ] + [] ) """, expectedManifest: """ @@ -152,7 +152,7 @@ class ManifestEditTests: XCTestCase { let package = Package( name: "packages", dependencies: [ - .package(url: "https://github.com/apple/swift-syntax.git", from: "510.0.1"), + .package(url: "https://github.com/swiftlang/swift-syntax.git", from: "510.0.1"), .package(url: "https://github.com/apple/swift-system.git", from: "510.0.0"), ] + [] ) @@ -177,13 +177,13 @@ class ManifestEditTests: XCTestCase { // swift-tools-version: 5.5 let package = Package( name: "packages", - dependencies: [ .package(url: "https://github.com/apple/swift-syntax.git", from: "510.0.1") ] + dependencies: [ .package(url: "https://github.com/swiftlang/swift-syntax.git", from: "510.0.1") ] ) """, expectedManifest: """ // swift-tools-version: 5.5 let package = Package( name: "packages", - dependencies: [ .package(url: "https://github.com/apple/swift-syntax.git", from: "510.0.1"), .package(url: "https://github.com/apple/swift-system.git", from: "510.0.0"),] + dependencies: [ .package(url: "https://github.com/swiftlang/swift-syntax.git", from: "510.0.1"), .package(url: "https://github.com/apple/swift-system.git", from: "510.0.0"),] ) """) { manifest in let versionRange = Range.upToNextMajor(from: Version(510, 0, 0)) @@ -518,7 +518,7 @@ class ManifestEditTests: XCTestCase { let package = Package( name: "packages", dependencies: [ - .package(url: "https://github.com/apple/swift-syntax.git", from: "600.0.0-latest"), + .package(url: "https://github.com/swiftlang/swift-syntax.git", from: "600.0.0-latest"), ], targets: [ .macro( diff --git a/Utilities/bootstrap b/Utilities/bootstrap index 6595dd3dc90..2e589359cfa 100755 --- a/Utilities/bootstrap +++ b/Utilities/bootstrap @@ -730,7 +730,7 @@ def get_llbuild_source_path(args): llbuild_path = os.path.join(args.project_root, "..", "llbuild") if os.path.exists(llbuild_path): return llbuild_path - note("clone llbuild next to swiftpm directory; see development docs: https://github.com/apple/swift-package-manager/blob/master/Documentation/Contributing.md") + note("clone llbuild next to swiftpm directory; see development docs: https://github.com/swiftlang/swift-package-manager/blob/master/Documentation/Contributing.md") error("unable to find llbuild source directory at %s" % llbuild_path) def get_swiftpm_env_cmd(args):