From 63ef5a0cc7676d52abbb63d82e46853d5635190e Mon Sep 17 00:00:00 2001 From: Mishal Shah Date: Thu, 14 Aug 2025 23:06:49 -0700 Subject: [PATCH 1/3] Bump the Swift version to 6.3 --- cmake/SwiftVersion.cmake | 2 +- test/IRGen/objc.swift | 6 +++--- test/SourceKit/Misc/compiler_version.swift | 2 +- utils/build_swift/build_swift/defaults.py | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cmake/SwiftVersion.cmake b/cmake/SwiftVersion.cmake index 95bea344619fa..1408188dcbe40 100644 --- a/cmake/SwiftVersion.cmake +++ b/cmake/SwiftVersion.cmake @@ -2,6 +2,6 @@ # can be reused when a new version of Swift comes out (assuming the user hasn't # manually set it as part of their own CMake configuration). set(SWIFT_VERSION_MAJOR 6) -set(SWIFT_VERSION_MINOR 2) +set(SWIFT_VERSION_MINOR 3) set(SWIFT_VERSION "${SWIFT_VERSION_MAJOR}.${SWIFT_VERSION_MINOR}") diff --git a/test/IRGen/objc.swift b/test/IRGen/objc.swift index 004813e7fc04b..8c1fe001958b8 100644 --- a/test/IRGen/objc.swift +++ b/test/IRGen/objc.swift @@ -139,7 +139,7 @@ class WeakObjC { // CHECK: i32 1, !"Objective-C Version", i32 2} // CHECK: i32 1, !"Objective-C Image Info Version", i32 0} // CHECK: i32 1, !"Objective-C Image Info Section", !"__DATA,__objc_imageinfo,regular,no_dead_strip"} -// 100796160 == (6 << 24) | (2 << 16) | (7 << 8). -// 6 and 2 is the current major.minor version. 7 is the Swift ABI version. -// CHECK: i32 4, !"Objective-C Garbage Collection", i32 100796160} +// 100861696 == (6 << 24) | (3 << 16) | (7 << 8). +// 6 and 3 is the current major.minor version. 7 is the Swift ABI version. +// CHECK: i32 4, !"Objective-C Garbage Collection", i32 100861696} // CHECK: i32 1, !"Swift Version", i32 7} diff --git a/test/SourceKit/Misc/compiler_version.swift b/test/SourceKit/Misc/compiler_version.swift index 6b448a028a73d..3fa5184c4322e 100644 --- a/test/SourceKit/Misc/compiler_version.swift +++ b/test/SourceKit/Misc/compiler_version.swift @@ -1,5 +1,5 @@ // RUN: %sourcekitd-test -req=compiler-version | %FileCheck %s // CHECK: key.version_major: 6 -// CHECK: key.version_minor: 2 +// CHECK: key.version_minor: 3 // CHECK: key.version_patch: 0 diff --git a/utils/build_swift/build_swift/defaults.py b/utils/build_swift/build_swift/defaults.py index 3a155f679913d..25ce03135ef4f 100644 --- a/utils/build_swift/build_swift/defaults.py +++ b/utils/build_swift/build_swift/defaults.py @@ -47,7 +47,7 @@ CMAKE_GENERATOR = 'Ninja' COMPILER_VENDOR = 'none' -SWIFT_USER_VISIBLE_VERSION = Version('6.2') +SWIFT_USER_VISIBLE_VERSION = Version('6.3') CLANG_USER_VISIBLE_VERSION = Version('17.0.0') SWIFT_ANALYZE_CODE_COVERAGE = 'false' From e5020ed077006a3317a87521c660329e56f9a58f Mon Sep 17 00:00:00 2001 From: Mishal Shah Date: Tue, 26 Aug 2025 22:07:42 -0700 Subject: [PATCH 2/3] Update the runtime version to 6.3 --- Runtimes/Core/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Runtimes/Core/CMakeLists.txt b/Runtimes/Core/CMakeLists.txt index ba32f0f3f1a7b..66af7deb073a3 100644 --- a/Runtimes/Core/CMakeLists.txt +++ b/Runtimes/Core/CMakeLists.txt @@ -59,7 +59,7 @@ if($ENV{BUILD_NUMBER}) endif() project(SwiftCore LANGUAGES C CXX Swift - VERSION 6.1.0${BUILD_NUMBER}) + VERSION 6.3.0${BUILD_NUMBER}) # The Swift standard library is not intended for use as a sub-library as part of # another project. It is tightly coupled with the compiler version. From 8c2bc9581a99496fee9306ffa93d7413cc45c770 Mon Sep 17 00:00:00 2001 From: Mishal Shah Date: Tue, 26 Aug 2025 22:55:44 -0700 Subject: [PATCH 3/3] Update the runtime version for Supplemental and Overlay libs --- Runtimes/Overlay/CMakeLists.txt | 2 +- Runtimes/Supplemental/Differentiation/CMakeLists.txt | 2 +- Runtimes/Supplemental/Observation/CMakeLists.txt | 2 +- Runtimes/Supplemental/StringProcessing/CMakeLists.txt | 2 +- Runtimes/Supplemental/Synchronization/CMakeLists.txt | 2 +- Runtimes/Supplemental/Volatile/CMakeLists.txt | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Runtimes/Overlay/CMakeLists.txt b/Runtimes/Overlay/CMakeLists.txt index 38bb4ae54b7a6..82ac3144eee93 100644 --- a/Runtimes/Overlay/CMakeLists.txt +++ b/Runtimes/Overlay/CMakeLists.txt @@ -29,7 +29,7 @@ if($ENV{BUILD_NUMBER}) endif() project(SwiftOverlay LANGUAGES C CXX Swift - VERSION 6.1.0${BUILD_NUMBER}) + VERSION 6.3.0${BUILD_NUMBER}) set(CMAKE_Swift_LANGUAGE_VERSION 5) diff --git a/Runtimes/Supplemental/Differentiation/CMakeLists.txt b/Runtimes/Supplemental/Differentiation/CMakeLists.txt index 7890ae5219644..1b90533674b39 100644 --- a/Runtimes/Supplemental/Differentiation/CMakeLists.txt +++ b/Runtimes/Supplemental/Differentiation/CMakeLists.txt @@ -15,7 +15,7 @@ if($ENV{BUILD_NUMBER}) endif() project(SwiftDifferentiation LANGUAGES Swift C - VERSION 6.1.0${BUILD_NUMBER}) + VERSION 6.3.0${BUILD_NUMBER}) if(NOT PROJECT_IS_TOP_LEVEL) message(SEND_ERROR "Swift Differentiation must build as a standalone project") diff --git a/Runtimes/Supplemental/Observation/CMakeLists.txt b/Runtimes/Supplemental/Observation/CMakeLists.txt index ab31428cb60fc..289a4a217e333 100644 --- a/Runtimes/Supplemental/Observation/CMakeLists.txt +++ b/Runtimes/Supplemental/Observation/CMakeLists.txt @@ -15,7 +15,7 @@ if($ENV{BUILD_NUMBER}) endif() project(SwiftObservation LANGUAGES Swift CXX - VERSION 6.1.0${BUILD_NUMBER}) + VERSION 6.3.0${BUILD_NUMBER}) if(NOT PROJECT_IS_TOP_LEVEL) message(SEND_ERROR "Swift Observation must build as a standalone project") diff --git a/Runtimes/Supplemental/StringProcessing/CMakeLists.txt b/Runtimes/Supplemental/StringProcessing/CMakeLists.txt index 791c70649ea55..066378cce1848 100644 --- a/Runtimes/Supplemental/StringProcessing/CMakeLists.txt +++ b/Runtimes/Supplemental/StringProcessing/CMakeLists.txt @@ -15,7 +15,7 @@ if($ENV{BUILD_NUMBER}) endif() project(SwiftStringProcessing LANGUAGES Swift C - VERSION 6.1.0${BUILD_NUMBER}) + VERSION 6.3.0${BUILD_NUMBER}) if(NOT PROJECT_IS_TOP_LEVEL) message(FATAL_ERROR "Swift StringProcessing must build as a standalone project") diff --git a/Runtimes/Supplemental/Synchronization/CMakeLists.txt b/Runtimes/Supplemental/Synchronization/CMakeLists.txt index 78e99cd91a79f..1abba7d6d3c34 100644 --- a/Runtimes/Supplemental/Synchronization/CMakeLists.txt +++ b/Runtimes/Supplemental/Synchronization/CMakeLists.txt @@ -15,7 +15,7 @@ if($ENV{BUILD_NUMBER}) endif() project(SwiftSynchronization LANGUAGES Swift - VERSION 6.1.0${BUILD_NUMBER}) + VERSION 6.3.0${BUILD_NUMBER}) # FIXME(compnerd) this is a workaround for `GNUInstallDirs` which cannot be used # with a pure Swift project. enable_language(C) diff --git a/Runtimes/Supplemental/Volatile/CMakeLists.txt b/Runtimes/Supplemental/Volatile/CMakeLists.txt index b6a90717ca4c0..1bc4fdf6e8a98 100644 --- a/Runtimes/Supplemental/Volatile/CMakeLists.txt +++ b/Runtimes/Supplemental/Volatile/CMakeLists.txt @@ -15,7 +15,7 @@ if($ENV{BUILD_NUMBER}) endif() project(SwiftVolatile LANGUAGES Swift - VERSION 6.1.0${BUILD_NUMBER}) + VERSION 6.3.0${BUILD_NUMBER}) # FIXME(compnerd) this is a workaround for `GNUInstallDirs` which cannot be used # with a pure Swift project. enable_language(C)