From e9d42a4b7e398b0b20090e9a8469aa8c393a663a Mon Sep 17 00:00:00 2001 From: Evan Wilde Date: Fri, 27 Jun 2025 14:39:21 -0700 Subject: [PATCH 1/2] Update collections, crypto, certs, and asn1 tag Updating tags for swift-collections, swift-crypto, swift-certificates, and swift-asn1 to pick up changes needed for FreeBSD. --- .../update-checkout-config.json | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/utils/update_checkout/update-checkout-config.json b/utils/update_checkout/update-checkout-config.json index aa712ffa2e760..bc00ada961e85 100644 --- a/utils/update_checkout/update-checkout-config.json +++ b/utils/update_checkout/update-checkout-config.json @@ -139,10 +139,10 @@ "swiftpm": "main", "swift-argument-parser": "1.5.1", "swift-atomics": "1.2.0", - "swift-collections": "1.1.3", - "swift-crypto": "3.0.0", - "swift-certificates": "1.0.1", - "swift-asn1": "1.0.0", + "swift-collections": "1.1.5", + "swift-crypto": "3.12.3", + "swift-certificates": "1.10.0", + "swift-asn1": "1.3.2", "swift-async-algorithms": "1.0.1", "swift-driver": "main", "swift-log": "1.5.4", @@ -456,10 +456,10 @@ "swiftpm": "main", "swift-argument-parser": "1.4.0", "swift-atomics": "1.2.0", - "swift-collections": "1.1.3", - "swift-crypto": "3.0.0", - "swift-certificates": "1.0.1", - "swift-asn1": "1.0.0", + "swift-collections": "1.1.5", + "swift-crypto": "3.12.3", + "swift-certificates": "1.10.0", + "swift-asn1": "1.3.2", "swift-async-algorithms": "1.0.1", "swift-driver": "main", "swift-log": "1.5.4", @@ -514,10 +514,10 @@ "swift-argument-parser": "1.4.0", "swift-async-algorithms": "1.0.1", "swift-atomics": "1.2.0", - "swift-collections": "1.1.3", - "swift-crypto": "3.0.0", - "swift-certificates": "1.0.1", - "swift-asn1": "1.0.0", + "swift-collections": "1.1.5", + "swift-crypto": "3.12.3", + "swift-certificates": "1.10.0", + "swift-asn1": "1.3.2", "swift-driver": "main", "swift-log": "1.5.4", "swift-numerics": "1.0.2", From 2ff24aa0a78a47b11bfeecf5e625cb53ceabfc89 Mon Sep 17 00:00:00 2001 From: Evan Wilde Date: Tue, 8 Jul 2025 11:05:52 -0700 Subject: [PATCH 2/2] build.ps1: Update reference to CCryptoBoringSSL The CCryptoBoringSSL library changed from C to C++, which means that the static archive on Windows changed names, from `CCryptoBoringSSL.lib` to `libCCryptoBoringSSL.lib`. The SourceKit-LSP SwiftPM test invocation explicitly passed `CCryptoBoringSSL.lib` to the SwiftPM invocation, resulting in the wrong search path. Pointing it at the correct location now. --- utils/build.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/build.ps1 b/utils/build.ps1 index 6194a761c4f37..69ac53b125aac 100644 --- a/utils/build.ps1 +++ b/utils/build.ps1 @@ -3118,7 +3118,7 @@ function Test-SourceKitLSP { # swift-crypto "-Xswiftc", "-I$(Get-ProjectBinaryCache $BuildPlatform Crypto)\swift", "-Xlinker", "-L$(Get-ProjectBinaryCache $BuildPlatform Crypto)\lib", - "-Xlinker", "$(Get-ProjectBinaryCache $BuildPlatform Crypto)\lib\CCryptoBoringSSL.lib", + "-Xlinker", "$(Get-ProjectBinaryCache $BuildPlatform Crypto)\lib\libCCryptoBoringSSL.lib", # swift-asn1 "-Xswiftc", "-I$(Get-ProjectBinaryCache $BuildPlatform ASN1)\swift", "-Xlinker", "-L$(Get-ProjectBinaryCache $BuildPlatform ASN1)\lib",