Эх сурвалжийг харах

Now that 5.10 is the baseline, remove some old bits/refs. (#1788)

Thomas Van Lenten 10 сар өмнө
parent
commit
b83e38c8f7

+ 1 - 1
CompileTests/InternalImportsByDefault/Package@swift-5.9.swift → CompileTests/InternalImportsByDefault/Package@swift-5.10.swift

@@ -1,4 +1,4 @@
-// swift-tools-version: 5.9
+// swift-tools-version: 5.10
 
 // Package.swift
 //

+ 0 - 25
CompileTests/InternalImportsByDefault/Package@swift-5.8.swift

@@ -1,25 +0,0 @@
-// swift-tools-version: 5.8
-
-// Package.swift
-//
-// Copyright (c) 2024 Apple Inc. and the project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See LICENSE.txt for license information:
-// https://github.com/apple/swift-protobuf/blob/main/LICENSE.txt
-
-import PackageDescription
-
-let package = Package(
-    name: "CompileTests",
-    targets: [
-        .executableTarget(
-            name: "InternalImportsByDefault",
-            exclude: [
-                "swift-protobuf-config.json",
-                "Protos/SomeProtoWithBytes.proto",
-                "Protos/ServiceOnly.proto",
-            ]
-        )
-    ]
-)

+ 0 - 2
CompileTests/InternalImportsByDefault/Sources/InternalImportsByDefault/main.swift

@@ -6,8 +6,6 @@
 // See LICENSE.txt for license information:
 // https://github.com/apple/swift-protobuf/blob/main/LICENSE.txt
 
-// This test only makes sense for Swift 5.9+ because 5.8 doesn't support access
-// level on imports.
 private import Foundation
 
 struct InternalImportsByDefault {

+ 1 - 1
CompileTests/MultiModule/Package@swift-5.8.swift → CompileTests/MultiModule/Package@swift-5.10.swift

@@ -1,4 +1,4 @@
-// swift-tools-version: 5.8
+// swift-tools-version: 5.10
 
 import PackageDescription
 

+ 0 - 40
CompileTests/MultiModule/Package@swift-5.9.swift

@@ -1,40 +0,0 @@
-// swift-tools-version: 5.9
-
-import PackageDescription
-
-let package = Package(
-    name: "CompileTests",
-    dependencies: [
-        .package(name: "swift-protobuf", path: "../..")
-    ],
-    targets: [
-        .testTarget(
-            name: "Test1",
-            dependencies: ["ImportsAPublicly"]
-        ),
-        .testTarget(
-            name: "Test2",
-            dependencies: ["ImportsImportsAPublicly"]
-        ),
-        .target(
-            name: "ModuleA",
-            dependencies: [
-                .product(name: "SwiftProtobuf", package: "swift-protobuf")
-            ]
-        ),
-        .target(
-            name: "ImportsAPublicly",
-            dependencies: [
-                .product(name: "SwiftProtobuf", package: "swift-protobuf"),
-                .target(name: "ModuleA"),
-            ]
-        ),
-        .target(
-            name: "ImportsImportsAPublicly",
-            dependencies: [
-                .product(name: "SwiftProtobuf", package: "swift-protobuf"),
-                .target(name: "ImportsAPublicly"),
-            ]
-        ),
-    ]
-)

+ 1 - 1
PluginExamples/Package@swift-5.9.swift → PluginExamples/Package@swift-5.10.swift

@@ -1,4 +1,4 @@
-// swift-tools-version: 5.9
+// swift-tools-version: 5.10
 
 import PackageDescription
 

+ 0 - 47
PluginExamples/Package@swift-5.8.swift

@@ -1,47 +0,0 @@
-// swift-tools-version: 5.8
-
-import PackageDescription
-
-let package = Package(
-    name: "PluginExamples",
-    dependencies: [
-        .package(path: "../")
-    ],
-    targets: [
-        .testTarget(
-            name: "ExampleTests",
-            dependencies: [
-                .target(name: "Simple"),
-                .target(name: "Nested"),
-                .target(name: "Import"),
-            ]
-        ),
-        .target(
-            name: "Simple",
-            dependencies: [
-                .product(name: "SwiftProtobuf", package: "swift-protobuf")
-            ],
-            plugins: [
-                .plugin(name: "SwiftProtobufPlugin", package: "swift-protobuf")
-            ]
-        ),
-        .target(
-            name: "Nested",
-            dependencies: [
-                .product(name: "SwiftProtobuf", package: "swift-protobuf")
-            ],
-            plugins: [
-                .plugin(name: "SwiftProtobufPlugin", package: "swift-protobuf")
-            ]
-        ),
-        .target(
-            name: "Import",
-            dependencies: [
-                .product(name: "SwiftProtobuf", package: "swift-protobuf")
-            ],
-            plugins: [
-                .plugin(name: "SwiftProtobufPlugin", package: "swift-protobuf")
-            ]
-        ),
-    ]
-)