Skip to content

Automatically add swift-tools-version and import PackageDescription to manifest in SwiftPMTestProject #1391

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.

Sign up for GitHub

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 2, 2024
Merged

Automatically add swift-tools-version and import PackageDescription to manifest in SwiftPMTestProject #1391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 11 additions & 0 deletions Sources/SKTestSupport/SwiftPMTestProject.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,17 @@ public class SwiftPMTestProject: MultiFileTestProject {

filesByPath[RelativeFileLocation(directories: directories, fileLocation.fileName)] = contents
}
var manifest = manifest
if !manifest.contains("swift-tools-version") {
// Tests specify a shorthand package manifest that doesn't contain the tools version boilerplate.
manifest = """
// swift-tools-version: 5.7

import PackageDescription

\(manifest)
"""
}
filesByPath["Package.swift"] = manifest

try await super.init(
Expand Down
26 changes: 0 additions & 26 deletions Tests/SourceKitLSPTests/BackgroundIndexingTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,10 +117,6 @@ final class BackgroundIndexingTests: XCTestCase {
""",
],
manifest: """
// swift-tools-version: 5.7

import PackageDescription

let package = Package(
name: "MyLibrary",
targets: [
Expand Down Expand Up @@ -181,10 +177,6 @@ final class BackgroundIndexingTests: XCTestCase {
""",
],
manifest: """
// swift-tools-version: 5.7

import PackageDescription

let package = Package(
name: "MyLibrary",
targets: [
Expand Down Expand Up @@ -231,8 +223,6 @@ final class BackgroundIndexingTests: XCTestCase {
"""
],
manifest: """
// swift-tools-version: 5.7
import PackageDescription
let package = Package(
name: "MyLibrary",
dependencies: [.package(url: "\(dependencyProject.packageDirectory)", from: "1.0.0")],
Expand Down Expand Up @@ -562,10 +552,6 @@ final class BackgroundIndexingTests: XCTestCase {
""",
],
manifest: """
// swift-tools-version: 5.7

import PackageDescription

let package = Package(
name: "MyLibrary",
targets: [
Expand Down Expand Up @@ -686,10 +672,6 @@ final class BackgroundIndexingTests: XCTestCase {
"LibD/LibD.swift": "",
],
manifest: """
// swift-tools-version: 5.7

import PackageDescription

let package = Package(
name: "MyLibrary",
targets: [
Expand Down Expand Up @@ -801,10 +783,6 @@ final class BackgroundIndexingTests: XCTestCase {
""",
],
manifest: """
// swift-tools-version: 5.7

import PackageDescription

let package = Package(
name: "MyLibrary",
targets: [
Expand Down Expand Up @@ -909,10 +887,6 @@ final class BackgroundIndexingTests: XCTestCase {
""",
],
manifest: """
// swift-tools-version: 5.7

import PackageDescription

let package = Package(
name: "MyLibrary",
targets: [
Expand Down
16 changes: 0 additions & 16 deletions Tests/SourceKitLSPTests/CrossLanguageRenameTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@ import SKTestSupport
import XCTest

private let libAlibBPackageManifest = """
// swift-tools-version: 5.7

import PackageDescription

let package = Package(
name: "MyLibrary",
targets: [
Expand Down Expand Up @@ -564,10 +560,6 @@ final class CrossLanguageRenameTests: XCTestCase {
""",
],
manifest: """
// swift-tools-version: 5.7

import PackageDescription

let package = Package(
name: "MyLibrary",
targets: [
Expand Down Expand Up @@ -622,10 +614,6 @@ final class CrossLanguageRenameTests: XCTestCase {
""",
],
manifest: """
// swift-tools-version: 5.7

import PackageDescription

let package = Package(
name: "MyLibrary",
targets: [
Expand Down Expand Up @@ -680,10 +668,6 @@ final class CrossLanguageRenameTests: XCTestCase {
""",
],
manifest: """
// swift-tools-version: 5.7

import PackageDescription

let package = Package(
name: "MyLibrary",
targets: [
Expand Down
16 changes: 0 additions & 16 deletions Tests/SourceKitLSPTests/DefinitionTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,10 +165,6 @@ class DefinitionTests: XCTestCase {
""",
],
manifest: """
// swift-tools-version: 5.7

import PackageDescription

let package = Package(
name: "MyLibrary",
targets: [
Expand Down Expand Up @@ -272,10 +268,6 @@ class DefinitionTests: XCTestCase {
""",
],
manifest: """
// swift-tools-version: 5.7

import PackageDescription

let package = Package(
name: "MyLibrary",
targets: [
Expand Down Expand Up @@ -323,10 +315,6 @@ class DefinitionTests: XCTestCase {
""",
],
manifest: """
// swift-tools-version: 5.7

import PackageDescription

let package = Package(
name: "MyLibrary",
targets: [
Expand Down Expand Up @@ -452,10 +440,6 @@ class DefinitionTests: XCTestCase {
""",
],
manifest: """
// swift-tools-version: 5.7

import PackageDescription

let package = Package(
name: "MyLibrary",
targets: [
Expand Down
4 changes: 0 additions & 4 deletions Tests/SourceKitLSPTests/DependencyTrackingTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,6 @@ final class DependencyTrackingTests: XCTestCase {
""",
],
manifest: """
// swift-tools-version: 5.7

import PackageDescription

let package = Package(
name: "MyLibrary",
targets: [
Expand Down
16 changes: 0 additions & 16 deletions Tests/SourceKitLSPTests/DocumentTestDiscoveryTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,6 @@ final class DocumentTestDiscoveryTests: XCTestCase {
""",
],
manifest: """
// swift-tools-version: 5.7

import PackageDescription

let package = Package(
name: "MyLibrary",
targets: [.testTarget(name: "MyLibraryTests")]
Expand Down Expand Up @@ -142,10 +138,6 @@ final class DocumentTestDiscoveryTests: XCTestCase {
"""
],
manifest: """
// swift-tools-version: 5.7

import PackageDescription

let package = Package(
name: "MyLibrary",
targets: [.testTarget(name: "MyLibraryTests")]
Expand Down Expand Up @@ -1295,10 +1287,6 @@ final class DocumentTestDiscoveryTests: XCTestCase {
"""
],
manifest: """
// swift-tools-version: 5.7

import PackageDescription

let package = Package(
name: "MyLibrary",
targets: [.testTarget(name: "MyLibraryTests")]
Expand Down Expand Up @@ -1354,10 +1342,6 @@ final class DocumentTestDiscoveryTests: XCTestCase {
"""
],
manifest: """
// swift-tools-version: 5.7

import PackageDescription

let package = Package(
name: "MyLibrary",
targets: [.testTarget(name: "MyLibraryTests")]
Expand Down
4 changes: 0 additions & 4 deletions Tests/SourceKitLSPTests/IndexTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,6 @@ final class IndexTests: XCTestCase {
""",
],
manifest: """
// swift-tools-version: 5.7

import PackageDescription

let package = Package(
name: "MyLibrary",
targets: [
Expand Down
16 changes: 0 additions & 16 deletions Tests/SourceKitLSPTests/MainFilesProviderTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,6 @@ final class MainFilesProviderTests: XCTestCase {
""",
],
manifest: """
// swift-tools-version: 5.7

import PackageDescription

let package = Package(
name: "MyLibrary",
targets: [
Expand Down Expand Up @@ -71,10 +67,6 @@ final class MainFilesProviderTests: XCTestCase {
""",
],
manifest: """
// swift-tools-version: 5.7

import PackageDescription

let package = Package(
name: "MyLibrary",
targets: [
Expand Down Expand Up @@ -123,10 +115,6 @@ final class MainFilesProviderTests: XCTestCase {
""",
],
manifest: """
// swift-tools-version: 5.7

import PackageDescription

let package = Package(
name: "MyLibrary",
targets: [
Expand Down Expand Up @@ -172,10 +160,6 @@ final class MainFilesProviderTests: XCTestCase {
"Sources/MyFancyLibrary/MyFancyLibrary.c": "",
],
manifest: """
// swift-tools-version: 5.7

import PackageDescription

let package = Package(
name: "MyLibrary",
targets: [
Expand Down
4 changes: 0 additions & 4 deletions Tests/SourceKitLSPTests/PublishDiagnosticsTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,10 +169,6 @@ final class PublishDiagnosticsTests: XCTestCase {
""",
],
manifest: """
// swift-tools-version: 5.7

import PackageDescription

let package = Package(
name: "MyLibrary",
targets: [
Expand Down
8 changes: 0 additions & 8 deletions Tests/SourceKitLSPTests/PullDiagnosticsTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,10 +200,6 @@ final class PullDiagnosticsTests: XCTestCase {
""",
],
manifest: """
// swift-tools-version: 5.7

import PackageDescription

let package = Package(
name: "MyLibrary",
targets: [
Expand Down Expand Up @@ -287,10 +283,6 @@ final class PullDiagnosticsTests: XCTestCase {
""",
],
manifest: """
// swift-tools-version: 5.7

import PackageDescription

let package = Package(
name: "MyLibrary",
targets: [
Expand Down
12 changes: 0 additions & 12 deletions Tests/SourceKitLSPTests/RenameTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -536,10 +536,6 @@ final class RenameTests: XCTestCase {
""",
],
manifest: """
// swift-tools-version: 5.7

import PackageDescription

let package = Package(
name: "MyLibrary",
targets: [
Expand Down Expand Up @@ -576,10 +572,6 @@ final class RenameTests: XCTestCase {
""",
],
manifest: """
// swift-tools-version: 5.7

import PackageDescription

let package = Package(
name: "MyLibrary",
targets: [
Expand Down Expand Up @@ -627,10 +619,6 @@ final class RenameTests: XCTestCase {
""",
],
manifest: """
// swift-tools-version: 5.7

import PackageDescription

let package = Package(
name: "MyLibrary",
targets: [
Expand Down
8 changes: 0 additions & 8 deletions Tests/SourceKitLSPTests/SwiftInterfaceTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,6 @@ final class SwiftInterfaceTests: XCTestCase {
"Exec/main.swift": "import MyLibrary",
],
manifest: """
// swift-tools-version: 5.7

import PackageDescription

let package = Package(
name: "MyLibrary",
targets: [
Expand Down Expand Up @@ -162,10 +158,6 @@ final class SwiftInterfaceTests: XCTestCase {
"Exec/main.swift": "import 1️⃣MyLibrary",
],
manifest: """
// swift-tools-version: 5.7

import PackageDescription

let package = Package(
name: "MyLibrary",
targets: [
Expand Down
Loading