Release 6.3

[andriydruk]

Bump all version references from 6.2 to 6.3 and sync build scripts with upstream swift-docker changes while keeping Readdle patches on top. Upstream additions: trunk/dev NDK 28c support, skip-clean build flags, and extra sysroot cleanup after Swift build.

---

Note

Medium Risk
Medium risk because it upgrades the Swift toolchain to 6.3 and changes build/NDK behavior for trunk/dev builds, which can affect SDK reproducibility and CI build outputs.

Overview
Updates the Android Swift SDK release from 6.2.x to 6.3 across CI (SWIFT_VERSION), documentation (install URLs, Gradle plugin version), and source-fetch defaults (release branch 6.3).

Syncs build scripts with upstream changes: trunk/dev builds now use NDK r28c with Android API 24 and remove a small set of known-failing trunk tests, build.sh adds --skip-clean-* flags for faster/less destructive rebuilds, and performs additional sysroot cleanup after Swift builds.

Adds a new Foundation patch that avoids a crash by ignoring late redirect callbacks in HTTPURLProtocol.didCompleteRedirectCallback when a timeout has already completed the task.

^{Reviewed by Cursor Bugbot for commit b2e77b6. Bugbot is set up for automated code reviews on this repo. Configure here.}

[cursor]

Hardcoded clang version wrong for NDK r28c builds

Low Severity

The new trunk/dev NDK r28c support sets ANDROID_NDK_VERSION=android-ndk-r28c, but scripts/build.sh hardcodes ndk_clang_version=18 (line 272). NDK r28c ships clang 19 (resource dir lib/clang/19), so the placeholder symlink created during SDK bundling at line 706 of build.sh would point to a non-existent lib/clang/18 path. The setup-android-sdk.sh install script fixes this at install time via a glob, but the bundled artifact would contain a broken symlink for trunk builds.

Additional Locations (1)

• build-local#L28-L31

 

^{Reviewed by Cursor Bugbot for commit db49527. Configure here.}

[digitalby]

Took this for a spin. Mostly looks good, but flagging three things I think are blockers

[digitalby]

<CHECKSUM> is still a literal placeholder here. Anyone who copypastes this install snippet on day one of the release is going to get a confusing error. Fill it in before merging (or at least before tagging 6.3-r1).

[andriydruk]

Thank you, I’ll paste the final checksum when it’s ready

[digitalby]

These five rms run under set -ex, so the moment upstream renames or moves any of these test files the whole build aborts before it even starts. The intent here is "nuke these if they happen to be present", not "assert they exist", so rm -f is what you want. Same thing in build-local L82-86.

[andriydruk]

Cherry-picked from
https://github.com/swiftlang/swift-docker/blob/main/swift-ci/sdks/android/build-docker#L68-L72

[digitalby]

These .. traversals are a footgun. Line 517 resolves to $ndk_installation/sysroot/usr/lib/swift_static/android. Just write it that way?

Line 518 is the one that actually worries me: sysroot/usr/lib/swift/../../../swift-linux-x86_64/... walks three levels up from sysroot/usr/lib/swift, which lands at sysroot/, so the final path is $ndk_installation/sysroot/swift-linux-x86_64/lib/swift{,_static}/android. That is a pretty unusual place to find stale swift modules inside an NDK sysroot. Is that really where they end up, or is the intended target $ndk_installation/../swift-linux-x86_64/... (i.e. a sibling of the NDK in the build tree)? If that is the case, this rm -rf is silently a no-op and the actual stale dir is never cleaned.

[andriydruk]

Cherry-picked from:
https://github.com/swiftlang/swift-docker/blob/main/swift-ci/sdks/android/scripts/build.sh#L508-L510

[cursor]

Cursor Bugbot has reviewed your changes and found 2 potential issues.

There are 3 total unresolved issues (including 1 from previous review).

Bugbot Autofix prepared a fix for 1 of the 2 issues found in the latest run.

• ✅ Fixed: Bare rm aborts build on missing test files
  • Replaced all five trunk test cleanup commands with rm -f in both build-docker and build-local so missing files no longer abort set -e scripts.

Or push these changes by commenting:

@cursor push 83c8d9e19d

Preview (83c8d9e19d)

diff --git a/build-docker b/build-docker
--- a/build-docker
+++ b/build-docker
@@ -54,11 +54,11 @@
     ANDROID_NDK_VERSION=android-ndk-r28c
     ANDROID_API=24
 
-    rm ${WORKDIR}/source/swift-project/swift/test/Interop/Cxx/class/invalid-members/stdlib-containers-of-incomplete.swift
-    rm ${WORKDIR}/source/swift-project/swift/test/Interop/SwiftToCxx/stdlib/stdlib-in-cxx-no-diagnostics-generated-header.cpp
-    rm ${WORKDIR}/source/swift-project/swift/test/Reflection/typeref_decoding_packs.swift
-    rm ${WORKDIR}/source/swift-project/swift/test/Reflection/typeref_lowering.swift
-    rm ${WORKDIR}/source/swift-project/swift/test/Reflection/typeref_lowering_packs.swift
+    rm -f ${WORKDIR}/source/swift-project/swift/test/Interop/Cxx/class/invalid-members/stdlib-containers-of-incomplete.swift
+    rm -f ${WORKDIR}/source/swift-project/swift/test/Interop/SwiftToCxx/stdlib/stdlib-in-cxx-no-diagnostics-generated-header.cpp
+    rm -f ${WORKDIR}/source/swift-project/swift/test/Reflection/typeref_decoding_packs.swift
+    rm -f ${WORKDIR}/source/swift-project/swift/test/Reflection/typeref_lowering.swift
+    rm -f ${WORKDIR}/source/swift-project/swift/test/Reflection/typeref_lowering_packs.swift
 fi
 
 pushd ${WORKDIR}/source/swift-project

diff --git a/build-local b/build-local
--- a/build-local
+++ b/build-local
@@ -79,11 +79,11 @@
 
 # Disable failing trunk tests when building against NDK 28c
 if [[ -n "${SWIFT_VERSION}" && ($SWIFT_VERSION == scheme:main || $SWIFT_VERSION == tag:swift-DEV*) ]]; then
-    rm ${WORKDIR}/source/swift-project/swift/test/Interop/Cxx/class/invalid-members/stdlib-containers-of-incomplete.swift
-    rm ${WORKDIR}/source/swift-project/swift/test/Interop/SwiftToCxx/stdlib/stdlib-in-cxx-no-diagnostics-generated-header.cpp
-    rm ${WORKDIR}/source/swift-project/swift/test/Reflection/typeref_decoding_packs.swift
-    rm ${WORKDIR}/source/swift-project/swift/test/Reflection/typeref_lowering.swift
-    rm ${WORKDIR}/source/swift-project/swift/test/Reflection/typeref_lowering_packs.swift
+    rm -f ${WORKDIR}/source/swift-project/swift/test/Interop/Cxx/class/invalid-members/stdlib-containers-of-incomplete.swift
+    rm -f ${WORKDIR}/source/swift-project/swift/test/Interop/SwiftToCxx/stdlib/stdlib-in-cxx-no-diagnostics-generated-header.cpp
+    rm -f ${WORKDIR}/source/swift-project/swift/test/Reflection/typeref_decoding_packs.swift
+    rm -f ${WORKDIR}/source/swift-project/swift/test/Reflection/typeref_lowering.swift
+    rm -f ${WORKDIR}/source/swift-project/swift/test/Reflection/typeref_lowering_packs.swift
 fi
 
 mkdir -p ${WORKDIR}/products

_{This Bugbot Autofix run was free. To enable autofix for future PRs, go to the Cursor dashboard.}

^{Reviewed by Cursor Bugbot for commit 6e3845d. Configure here.}

[andriydruk]

Took this for a spin. Mostly looks good, but flagging three things I think are blockers

Thank you for your review. Most of these scripts are just cherry-picked from the official CI, so issues with them are probably better raised there:
https://github.com/swiftlang/swift-docker/tree/main/swift-ci/sdks/android

Maybe it’s not clear from the documentation. I’ll add a note about it at the beginning.