Update for Swift 5.7 from Xcode 14 beta 5 (#11)

Author: keith

.github/workflows/ci.yml

@@ -12,15 +12,16 @@ jobs:
         run: sudo xcode-select -s /Applications/Xcode_13.2.app
       - name: test
         run: bazelisk test //...
-  linux-test:
-    name: Linux test
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@v1
-      - uses: fwal/setup-swift@9b115e243bda8c144c113b8cb26fe3d48e9c47bf
-        with:
-          swift-version: "5.6"
-      - name: Get swift version
-        run: swift --version
-      - name: test
-        run: CC=clang bazelisk test --build_tests_only //test:swift_binary_test //test:swift_test
+  # TODO: Re-enable once Swift 5.7 is released
+  # linux-test:
+  #   name: Linux test
+  #   runs-on: ubuntu-20.04
+  #   steps:
+  #     - uses: actions/checkout@v1
+  #     - uses: fwal/setup-swift@9b115e243bda8c144c113b8cb26fe3d48e9c47bf
+  #       with:
+  #         swift-version: "5.7"
+  #     - name: Get swift version
+  #       run: swift --version
+  #     - name: test
+  #       run: CC=clang bazelisk test --build_tests_only //test:swift_binary_test //test:swift_test

SwiftSyntax.BUILD

@@ -26,6 +26,12 @@ swift_library(
     name = "SwiftSyntaxParser",
     srcs = glob(["Sources/SwiftSyntaxParser/**/*.swift"]),
     module_name = "SwiftSyntaxParser",
+    private_deps = select({
+        "@platforms//os:macos": [
+            "@StaticInternalSwiftSyntaxParser//:lib_InternalSwiftSyntaxParser",
+        ],
+        "//conditions:default": [],
+    }),
     visibility = ["//visibility:public"],
     deps = [":SwiftSyntax"],
 )

WORKSPACE

@@ -2,17 +2,10 @@ workspace(name = "com_github_keith_swift_syntax_bazel")
 
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
-# TODO: Remove once rules_apple requires 0.26.0 or newer
-http_archive(
-    name = "build_bazel_rules_swift",
-    sha256 = "3e52a508cdc47a7adbad36a3d2b712e282cc39cc211b0d63efcaf608961eb36b",
-    url = "https://github.com/bazelbuild/rules_swift/releases/download/0.26.0/rules_swift.0.26.0.tar.gz",
-)
-
 http_archive(
     name = "build_bazel_rules_apple",
-    sha256 = "a5f00fd89eff67291f6cd3efdc8fad30f4727e6ebb90718f3f05bbf3c3dd5ed7",
-    url = "https://github.com/bazelbuild/rules_apple/releases/download/0.33.0/rules_apple.0.33.0.tar.gz",
+    sha256 = "36072d4f3614d309d6a703da0dfe48684ec4c65a89611aeb9590b45af7a3e592",
+    url = "https://github.com/bazelbuild/rules_apple/releases/download/1.0.1/rules_apple.1.0.1.tar.gz",
 )
 
 load(

deps.bzl

@@ -14,14 +14,17 @@ def swift_syntax_deps():
 
     http_archive(
         name = "StaticInternalSwiftSyntaxParser",
-        url = "https://github.com/keith/StaticInternalSwiftSyntaxParser/releases/download/5.6/lib_InternalSwiftSyntaxParser.xcframework.zip",
-        sha256 = "88d748f76ec45880a8250438bd68e5d6ba716c8042f520998a438db87083ae9d",
+        url = "https://github.com/keith/StaticInternalSwiftSyntaxParser/releases/download/5.7-beta5-fix/lib_InternalSwiftSyntaxParser.xcframework.zip",
+        sha256 = "272468a50ae7d479b78ed924d677510c73fa872ebb55fe39e031f29d38a3c8d6",
         build_file_content = """
 load("@build_bazel_rules_apple//apple:apple.bzl", "apple_static_framework_import")
 
 apple_static_framework_import(
     name = "lib_InternalSwiftSyntaxParser",
-    framework_imports = ["lib_InternalSwiftSyntaxParser.xcframework/macos-arm64_x86_64/lib_InternalSwiftSyntaxParser.framework/lib_InternalSwiftSyntaxParser"],
+    framework_imports = glob(
+        ["lib_InternalSwiftSyntaxParser.xcframework/macos-arm64_x86_64/lib_InternalSwiftSyntaxParser.framework/**"],
+        allow_empty = False,
+    ),
     visibility = ["//visibility:public"],
 )
 """,
@@ -30,7 +33,7 @@ apple_static_framework_import(
     http_archive(
         name = "com_github_keith_swift_syntax",
         build_file = "@com_github_keith_swift_syntax_bazel//:SwiftSyntax.BUILD",
-        sha256 = "1326d193f78251e85153550e0383f2c85bd7a5a7b1bc1b789be4399596c8e3f5",
-        strip_prefix = "swift-syntax-0.50600.0",
-        url = "https://github.com/apple/swift-syntax/archive/refs/tags/0.50600.0.tar.gz",
+        sha256 = "bb9b5bb3a169f1fd6a3a025ac19b22c88060ef3bfe3d41aa349f330f5cb5f310",
+        strip_prefix = "swift-syntax-swift-5.7-DEVELOPMENT-SNAPSHOT-2022-08-02-a",
+        url = "https://github.com/apple/swift-syntax/archive/refs/tags/swift-5.7-DEVELOPMENT-SNAPSHOT-2022-08-02-a.tar.gz",
     )