From 9f498df9fa78d298d1dd8bf4d74290857726ec88 Mon Sep 17 00:00:00 2001 From: Jeroen Ketema Date: Wed, 29 Oct 2025 10:42:59 +0100 Subject: [PATCH 1/5] Swift: Do not include the embedded resources --- swift/third_party/load.bzl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/swift/third_party/load.bzl b/swift/third_party/load.bzl index d19345a18803..d13c127102d6 100644 --- a/swift/third_party/load.bzl +++ b/swift/third_party/load.bzl @@ -5,6 +5,8 @@ load("//misc/bazel:lfs.bzl", "lfs_archive", "lfs_files") _override = { # these are used to test new artifacts. Must be empty before merging to main + "resource-dir-macOS-swift-6.2-RELEASE-128.zip": "64ac7f77b2d8b9112e0126ff69afb1a033ae940ff18bb8732be982a723610f2e", + "resource-dir-Linux-swift-6.2-RELEASE-128.zip": "44888a0c944227bfcfa47f0e052f59c93b947e56ab070da877b0b0b4d79cdecb", } _staging_url = "https://github.com/dsp-testing/codeql-swift-artifacts/releases/download/staging-{}/{}" From 2505c8f3e39dc75f417e74dedb151d6431c80c07 Mon Sep 17 00:00:00 2001 From: Jeroen Ketema Date: Wed, 29 Oct 2025 11:06:50 +0100 Subject: [PATCH 2/5] Swift: Improve docs --- docs/codeql/codeql-overview/system-requirements.rst | 4 ++++ docs/codeql/reusables/supported-versions-compilers.rst | 7 ++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/docs/codeql/codeql-overview/system-requirements.rst b/docs/codeql/codeql-overview/system-requirements.rst index 100b75445b2e..6ade30b49013 100644 --- a/docs/codeql/codeql-overview/system-requirements.rst +++ b/docs/codeql/codeql-overview/system-requirements.rst @@ -46,6 +46,10 @@ For Rust extraction: - ``rustup`` and ``cargo`` must be installed. +For Swift extraction: + +- Only macOS is supported. + For Java extraction: - There must be a ``java`` or ``java.exe`` executable available on the ``PATH``, and the ``JAVA_HOME`` environment variable must point to the corresponding JDK's home directory. diff --git a/docs/codeql/reusables/supported-versions-compilers.rst b/docs/codeql/reusables/supported-versions-compilers.rst index 0c729748dd40..fb204bc4685e 100644 --- a/docs/codeql/reusables/supported-versions-compilers.rst +++ b/docs/codeql/reusables/supported-versions-compilers.rst @@ -26,8 +26,8 @@ Python [9]_,"2.7, 3.5, 3.6, 3.7, 3.8, 3.9, 3.10, 3.11, 3.12, 3.13",Not applicable,``.py`` Ruby [10]_,"up to 3.3",Not applicable,"``.rb``, ``.erb``, ``.gemspec``, ``Gemfile``" Rust [11]_,"Rust editions 2021 and 2024","Rust compiler","``.rs``, ``Cargo.toml``" - Swift [12]_,"Swift 5.4-6.1","Swift compiler","``.swift``" - TypeScript [13]_,"2.6-5.9",Standard TypeScript compiler,"``.ts``, ``.tsx``, ``.mts``, ``.cts``" + Swift [12]_ [13]_,"Swift 5.4-6.1","Swift compiler","``.swift``" + TypeScript [14]_,"2.6-5.9",Standard TypeScript compiler,"``.ts``, ``.tsx``, ``.mts``, ``.cts``" .. container:: footnote-group @@ -43,4 +43,5 @@ .. [10] Requires glibc 2.17. .. [11] Requires ``rustup`` and ``cargo`` to be installed. Features from nightly toolchains are not supported. .. [12] Support for the analysis of Swift requires macOS. - .. [13] TypeScript analysis is performed by running the JavaScript extractor with TypeScript enabled. This is the default. + .. [13] Embedded Swift is not supported. + .. [14] TypeScript analysis is performed by running the JavaScript extractor with TypeScript enabled. This is the default. From 6906c88781dc2ad268345359cebdb536c9f28652 Mon Sep 17 00:00:00 2001 From: Jeroen Ketema Date: Wed, 29 Oct 2025 11:08:16 +0100 Subject: [PATCH 3/5] Swift: Update change note --- swift/ql/lib/change-notes/2025-10-22-swift-6.2.md | 1 + 1 file changed, 1 insertion(+) diff --git a/swift/ql/lib/change-notes/2025-10-22-swift-6.2.md b/swift/ql/lib/change-notes/2025-10-22-swift-6.2.md index 145037125dd6..97f3e45d6f84 100644 --- a/swift/ql/lib/change-notes/2025-10-22-swift-6.2.md +++ b/swift/ql/lib/change-notes/2025-10-22-swift-6.2.md @@ -2,3 +2,4 @@ category: majorAnalysis --- * Upgraded to allow analysis of Swift 6.2. +* Support for experimental Embedded Swift has been dropped. From ea6b05eda3a3a176de90076f8fdaab7c16efc868 Mon Sep 17 00:00:00 2001 From: Jeroen Ketema <93738568+jketema@users.noreply.github.com> Date: Wed, 29 Oct 2025 15:49:53 +0100 Subject: [PATCH 4/5] Update docs/codeql/codeql-overview/system-requirements.rst --- docs/codeql/codeql-overview/system-requirements.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/codeql/codeql-overview/system-requirements.rst b/docs/codeql/codeql-overview/system-requirements.rst index 6ade30b49013..9f477a9b39bf 100644 --- a/docs/codeql/codeql-overview/system-requirements.rst +++ b/docs/codeql/codeql-overview/system-requirements.rst @@ -48,7 +48,7 @@ For Rust extraction: For Swift extraction: -- Only macOS is supported. +- Only macOS is supported as a host platform. For Java extraction: From cf2cd2088403dda9994de737b6c58f7deb908754 Mon Sep 17 00:00:00 2001 From: Jeroen Ketema Date: Wed, 29 Oct 2025 15:54:17 +0100 Subject: [PATCH 5/5] Swift: Update resources --- swift/third_party/load.bzl | 2 -- swift/third_party/resources/resource-dir-linux.zip | 2 +- swift/third_party/resources/resource-dir-macos.zip | 4 ++-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/swift/third_party/load.bzl b/swift/third_party/load.bzl index d13c127102d6..d19345a18803 100644 --- a/swift/third_party/load.bzl +++ b/swift/third_party/load.bzl @@ -5,8 +5,6 @@ load("//misc/bazel:lfs.bzl", "lfs_archive", "lfs_files") _override = { # these are used to test new artifacts. Must be empty before merging to main - "resource-dir-macOS-swift-6.2-RELEASE-128.zip": "64ac7f77b2d8b9112e0126ff69afb1a033ae940ff18bb8732be982a723610f2e", - "resource-dir-Linux-swift-6.2-RELEASE-128.zip": "44888a0c944227bfcfa47f0e052f59c93b947e56ab070da877b0b0b4d79cdecb", } _staging_url = "https://github.com/dsp-testing/codeql-swift-artifacts/releases/download/staging-{}/{}" diff --git a/swift/third_party/resources/resource-dir-linux.zip b/swift/third_party/resources/resource-dir-linux.zip index b8e0393bee14..6029e7657c01 100644 --- a/swift/third_party/resources/resource-dir-linux.zip +++ b/swift/third_party/resources/resource-dir-linux.zip @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d58eaae17536e26586df9aa8333637859d3b79daf2c3694cd75aad94d8fcce8e +oid sha256:44888a0c944227bfcfa47f0e052f59c93b947e56ab070da877b0b0b4d79cdecb size 385205623 diff --git a/swift/third_party/resources/resource-dir-macos.zip b/swift/third_party/resources/resource-dir-macos.zip index b7f8f4df10c5..368fcc2551dc 100644 --- a/swift/third_party/resources/resource-dir-macos.zip +++ b/swift/third_party/resources/resource-dir-macos.zip @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:258a766c51fcce31839c4f6ff823ef9909350e00c62c78de4c75d58ede3b45da -size 815605040 +oid sha256:64ac7f77b2d8b9112e0126ff69afb1a033ae940ff18bb8732be982a723610f2e +size 614058230