Skip to content

Commit 5da3384

Browse files
committed
Merge branch 'main' into kabir/swift-sdks
2 parents d9a6fe9 + e71bbfa commit 5da3384

File tree

27 files changed

+596
-169
lines changed

27 files changed

+596
-169
lines changed

.github/workflows/pull_request.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,6 @@ on:
55
types: [opened, reopened, synchronize]
66

77
jobs:
8-
soundness:
9-
name: Soundness
10-
uses: swiftlang/github-workflows/.github/workflows/soundness.yml@main
11-
with:
12-
# Pending https://github.com/swiftlang/vscode-swift/pull/1176
13-
license_header_check_enabled: false
14-
license_header_check_project_name: "VS Code Swift"
15-
api_breakage_check_enabled: false
16-
docs_check_enabled: false
17-
format_check_enabled: false
18-
shell_check_enabled: true
19-
unacceptable_language_check_enabled: true
20-
218
tests:
229
name: Test
2310
uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@main
@@ -37,3 +24,16 @@ jobs:
3724
echo "$NODE_PATH" >> $GITHUB_PATH
3825
linux_build_command: ./docker/test.sh
3926
enable_windows_checks: false
27+
28+
soundness:
29+
name: Soundness
30+
uses: swiftlang/github-workflows/.github/workflows/soundness.yml@main
31+
with:
32+
# Pending https://github.com/swiftlang/vscode-swift/pull/1176
33+
license_header_check_enabled: false
34+
license_header_check_project_name: "VS Code Swift"
35+
api_breakage_check_enabled: false
36+
docs_check_enabled: false
37+
format_check_enabled: false
38+
shell_check_enabled: true
39+
unacceptable_language_check_enabled: true
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
// swift-tools-version:5.6
2+
// The swift-tools-version declares the minimum version of Swift required to build this package.
3+
4+
import PackageDescription
5+
6+
let package = Package(
7+
// FIXME: Can be changed back to Swift-Markdown when
8+
// https://github.com/swiftlang/swift-package-manager/issues/7931
9+
// is released in the toolchain
10+
// NB: The name here needs to match the name of the dependencies under assets/test/dependencies/Package.swift
11+
name: "swift-markdown",
12+
products: [
13+
// Products define the executables and libraries a package produces, making them visible to other packages.
14+
.library(
15+
name: "PackageLib",
16+
targets: ["PackageLib"]),
17+
],
18+
targets: [
19+
.target(
20+
name: "PackageLib",
21+
dependencies: []
22+
),
23+
]
24+
)
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
public let a = "B"

assets/test/dependencies/Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ let package = Package(
1212
targets: [
1313
.executableTarget(
1414
name: "dependencies",
15-
dependencies: [],
15+
dependencies: [.product(name: "PackageLib", package: "Swift-Markdown")],
1616
path: "Sources"),
1717
]
1818
)
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
1+
import PackageLib
12

2-
print("dependencies")
3+
print("Test Asset:(dependencies)")
4+
print(a)

package-lock.json

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

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1309,8 +1309,8 @@
13091309
"@types/sinon-chai": "^3.2.12",
13101310
"@types/vscode": "^1.88.0",
13111311
"@types/xml2js": "^0.4.14",
1312-
"@typescript-eslint/eslint-plugin": "^8.13.0",
1313-
"@typescript-eslint/parser": "^8.13.0",
1312+
"@typescript-eslint/eslint-plugin": "^8.14.0",
1313+
"@typescript-eslint/parser": "^8.14.0",
13141314
"@vscode/test-cli": "^0.0.10",
13151315
"@vscode/test-electron": "^2.4.1",
13161316
"@vscode/vsce": "^2.32.0",

0 commit comments

Comments
 (0)