Skip to content

Commit 38358ae

Browse files
committed
Update identity-case dep
1 parent 2eae4c6 commit 38358ae

File tree

3 files changed

+30
-12
lines changed

3 files changed

+30
-12
lines changed

assets/test/identity-case/Package.resolved

Lines changed: 14 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

assets/test/identity-case/Package.swift

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version:5.4
1+
// swift-tools-version:5.8
22
// The swift-tools-version declares the minimum version of Swift required to build this package.
33

44
import PackageDescription
@@ -13,13 +13,14 @@ let package = Package(
1313
],
1414
dependencies: [
1515
// Dependencies declare other packages that this package depends on.
16-
.package(url: "https://github.com/jpsim/Yams.git", from: "5.0.0"),
16+
.package(url: "https://github.com/swiftlang/swift-markdown.git", exact: "0.6.0"),
1717
],
1818
targets: [
1919
// Targets are the basic building blocks of a package. A target can define a module or a test suite.
2020
// Targets can depend on other targets in this package, and on products in packages this package depends on.
2121
.target(
2222
name: "identity-case",
23-
dependencies: ["Yams"]),
23+
dependencies: [.product(name: "Markdown", package: "swift-markdown")]
24+
),
2425
]
2526
)

test/integration-tests/SwiftPackage.test.ts

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ import * as assert from "assert";
1616
import { FolderContext } from "@src/FolderContext";
1717
import { SwiftPackage } from "@src/SwiftPackage";
1818
import { WorkspaceContext } from "@src/WorkspaceContext";
19+
import { Version } from "@src/utilities/version";
1920

2021
import { tag } from "../tags";
2122
import { activateExtensionForSuite } from "./utilities/testutilities";
2223

23-
// eslint-disable-next-line no-restricted-syntax
2424
tag("medium").suite("SwiftPackage Test Suite", function () {
2525
let swiftPackage: SwiftPackage;
2626

@@ -100,7 +100,14 @@ tag("medium").suite("SwiftPackage Test Suite", function () {
100100

101101
activateExtensionForSuite({
102102
async setup(ctx) {
103-
swiftPackage = getFolderContext(ctx, asset).swiftPackage;
103+
const folderContext = getFolderContext(ctx, asset);
104+
if (
105+
folderContext.swiftVersion.isGreaterThanOrEqual(new Version(6, 1, 0)) &&
106+
folderContext.swiftVersion.isLessThan(new Version(6, 2, 0))
107+
) {
108+
this.skip();
109+
}
110+
swiftPackage = folderContext.swiftPackage;
104111
},
105112
testAssets: [asset],
106113
});
@@ -109,8 +116,9 @@ tag("medium").suite("SwiftPackage Test Suite", function () {
109116
assert.strictEqual(await swiftPackage.isValid, true);
110117
assert.strictEqual((await swiftPackage.dependencies).length, 1);
111118
assert(swiftPackage.resolved !== undefined);
112-
assert.strictEqual(swiftPackage.resolved.pins.length, 1);
113-
assert.strictEqual(swiftPackage.resolved.pins[0].identity, "yams");
119+
assert.strictEqual(swiftPackage.resolved.pins.length, 2);
120+
assert.strictEqual(swiftPackage.resolved.pins[0].identity, "swift-cmark");
121+
assert.strictEqual(swiftPackage.resolved.pins[1].identity, "swift-markdown");
114122
});
115123
});
116124

0 commit comments

Comments
 (0)