File tree Expand file tree Collapse file tree 2 files changed +9
-9
lines changed
Sources/Commands/PackageCommands Expand file tree Collapse file tree 2 files changed +9
-9
lines changed Original file line number Diff line number Diff line change @@ -16,8 +16,8 @@ import CoreCommands
16
16
import Foundation
17
17
import PackageGraph
18
18
import PackageModel
19
- import PackageModelSyntax
20
19
import SwiftParser
20
+ @_spi ( PackageRefactor) import SwiftRefactor
21
21
import TSCBasic
22
22
import TSCUtility
23
23
import Workspace
@@ -124,7 +124,7 @@ extension SwiftPackageCommand {
124
124
}
125
125
}
126
126
127
- let editResult : PackageEditResult
127
+ let editResult : PackageEdit
128
128
129
129
switch setting {
130
130
case . experimentalFeature:
@@ -146,7 +146,7 @@ extension SwiftPackageCommand {
146
146
147
147
editResult = try AddSwiftSetting . languageMode (
148
148
to: target,
149
- mode: mode,
149
+ mode: mode. rawValue ,
150
150
manifest: manifestSyntax
151
151
)
152
152
case . strictMemorySafety:
Original file line number Diff line number Diff line change @@ -23,7 +23,9 @@ import OrderedCollections
23
23
24
24
import PackageGraph
25
25
import PackageModel
26
- import enum PackageModelSyntax. ManifestEditError
26
+
27
+ @_spi ( PackageRefactor)
28
+ import enum SwiftRefactor. ManifestEditError
27
29
28
30
import SPMBuildCore
29
31
import SwiftFixIt
@@ -283,16 +285,14 @@ extension SwiftPackageCommand {
283
285
switch error {
284
286
case . cannotFindPackage,
285
287
. cannotAddSettingsToPluginTarget,
286
- . existingDependency:
288
+ . existingDependency,
289
+ . malformedManifest:
287
290
break
288
291
case . cannotFindArrayLiteralArgument,
289
292
// This means the target could not be found
290
293
// syntactically, not that it does not exist.
291
294
. cannotFindTargets,
292
- . cannotFindTarget,
293
- // This means the swift-tools-version is lower than
294
- // the version where one of the setting was introduced.
295
- . oldManifest:
295
+ . cannotFindTarget:
296
296
let settings = try features. map {
297
297
try $0. swiftSettingDescription
298
298
} . joined ( separator: " , " )
You can’t perform that action at this time.
0 commit comments