Skip to content

Commit f76dd0d

Browse files
authored
Update for Swift 5.6 (#8)
1 parent 98b4cca commit f76dd0d

File tree

8 files changed

+33
-14
lines changed

8 files changed

+33
-14
lines changed

.bazelrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
11
build --test_output=errors
2+
3+
# TODO: Remove once https://github.com/bazelbuild/rules_swift/issues/775 is fixed
4+
build --swiftcopt=-wmo --host_swiftcopt=-wmo

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ jobs:
1717
runs-on: ubuntu-20.04
1818
steps:
1919
- uses: actions/checkout@v1
20-
- uses: fwal/setup-swift@b5f579654904ef9a49e1b51e4bff6bd1b9b49224
20+
- uses: fwal/setup-swift@9b115e243bda8c144c113b8cb26fe3d48e9c47bf
2121
with:
22-
swift-version: "5.5.2"
22+
swift-version: "5.6"
2323
- name: Get swift version
2424
run: swift --version
2525
- name: test

SwiftSyntax.BUILD

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,19 @@ swift_library(
2121
}),
2222
visibility = ["//visibility:public"],
2323
)
24+
25+
swift_library(
26+
name = "SwiftSyntaxParser",
27+
srcs = glob(["Sources/SwiftSyntaxParser/**/*.swift"]),
28+
module_name = "SwiftSyntaxParser",
29+
visibility = ["//visibility:public"],
30+
deps = [":SwiftSyntax"],
31+
)
32+
33+
swift_library(
34+
name = "SwiftSyntaxBuilder",
35+
srcs = glob(["Sources/SwiftSyntaxBuilder/**/*.swift"]),
36+
module_name = "SwiftSyntaxBuilder",
37+
visibility = ["//visibility:public"],
38+
deps = [":SwiftSyntax"],
39+
)

deps.bzl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ def swift_syntax_deps():
1414

1515
http_archive(
1616
name = "StaticInternalSwiftSyntaxParser",
17-
url = "https://github.com/keith/StaticInternalSwiftSyntaxParser/releases/download/5.5.2/lib_InternalSwiftSyntaxParser.xcframework.zip",
18-
sha256 = "96bbc9ab4679953eac9ee46778b498cb559b8a7d9ecc658e54d6679acfbb34b8",
17+
url = "https://github.com/keith/StaticInternalSwiftSyntaxParser/releases/download/5.6/lib_InternalSwiftSyntaxParser.xcframework.zip",
18+
sha256 = "88d748f76ec45880a8250438bd68e5d6ba716c8042f520998a438db87083ae9d",
1919
build_file_content = """
2020
load("@build_bazel_rules_apple//apple:apple.bzl", "apple_static_framework_import")
2121
@@ -30,7 +30,7 @@ apple_static_framework_import(
3030
http_archive(
3131
name = "com_github_keith_swift_syntax",
3232
build_file = "@com_github_keith_swift_syntax_bazel//:SwiftSyntax.BUILD",
33-
sha256 = "39b5f08e3691df7b2c7c82b787e5ecc9c2b9e9cc69e7355cc6885ad6cee633b7",
34-
strip_prefix = "swift-syntax-0.50500.0",
35-
url = "https://github.com/apple/swift-syntax/archive/refs/tags/0.50500.0.tar.gz",
33+
sha256 = "1326d193f78251e85153550e0383f2c85bd7a5a7b1bc1b789be4399596c8e3f5",
34+
strip_prefix = "swift-syntax-0.50600.0",
35+
url = "https://github.com/apple/swift-syntax/archive/refs/tags/0.50600.0.tar.gz",
3636
)

test/BUILD

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ swift_test(
55
name = "swift_test",
66
size = "small",
77
srcs = ["swift_test.swift"],
8-
deps = ["@com_github_keith_swift_syntax//:SwiftSyntax"],
8+
deps = ["@com_github_keith_swift_syntax//:SwiftSyntaxParser"],
99
)
1010

1111
swift_binary(
1212
name = "swift_binary",
1313
srcs = ["main.swift"],
1414
visibility = ["//visibility:public"],
15-
deps = ["@com_github_keith_swift_syntax//:SwiftSyntax"],
15+
deps = ["@com_github_keith_swift_syntax//:SwiftSyntaxParser"],
1616
)
1717

1818
sh_test(
@@ -26,7 +26,7 @@ swift_library(
2626
name = "macos_test_library",
2727
srcs = ["macos_test_library.swift"],
2828
tags = ["manual"],
29-
deps = ["@com_github_keith_swift_syntax//:SwiftSyntax"],
29+
deps = ["@com_github_keith_swift_syntax//:SwiftSyntaxParser"],
3030
)
3131

3232
macos_unit_test(
@@ -40,7 +40,7 @@ swift_library(
4040
name = "macos_binary_main",
4141
srcs = ["main.swift"],
4242
tags = ["manual"],
43-
deps = ["@com_github_keith_swift_syntax//:SwiftSyntax"],
43+
deps = ["@com_github_keith_swift_syntax//:SwiftSyntaxParser"],
4444
)
4545

4646
macos_command_line_application(

test/macos_test_library.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import XCTest
2-
import SwiftSyntax
2+
import SwiftSyntaxParser
33

44
final class TestLoad: XCTestCase {
55
func testNoThrows() {

test/main.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
import SwiftSyntax
1+
import SwiftSyntaxParser
22

33
_ = try! SyntaxParser.parse(source: "/dev/null")

test/swift_test.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import XCTest
2-
import SwiftSyntax
2+
import SwiftSyntaxParser
33

44
final class TestLoad: XCTestCase {
55
func testNoThrows() {

0 commit comments

Comments
 (0)