Swift 5.10 #25

rasberik · 2024-11-21T06:59:59Z

Checklist

All tests are passed.
Added tests.
Searched existing issues to make sure not duplicated.

Motivation and Context

Version bump for dependencies to latest and package swift version 5.10

apple/swift-argument-parser 1.1.2 → 1.5.0
apple/swift-syntax 509.0.1 → 510.0.3
apple/swift-tools-support-core 0.2.3 → 0.7.1
jpsim/Yams 5.0.0 → 5.1.3

Tools & apple/swift-format 509.0 → 510.10

Impact on Existing Code

For users, expecting none (any reliable way to verify?)

rasberik · 2024-11-21T12:26:34Z

@ra1028 Do you know if its ok to use swift-syntax & swift-format 600 for swift 5.10?
No issues from my checks but not sure if there is anything I might miss or dont know..

Or does it need to strictly match to swift version used in package..?

ra1028 · 2024-11-22T08:22:34Z

@rasberik
swift-syntax doesn't depend on swift toolchains so it runs with no error but not very safe if there's syntax diff.
You should update the readme to describe the compatibility.

rasberik · 2024-11-22T09:32:18Z

@ra1028 Thanks

https://swiftpackageindex.com/swiftlang/swift-syntax/600.0.1/documentation/swiftsyntax/swift-version

We require that SwiftSyntax builds with the latest released compiler and the previous major version (e.g. with Swift 5.8 and Swift 5.7).

And has build compatibility results here: https://swiftpackageindex.com/swiftlang/swift-syntax#readme

But after your comment and deeper look, I feel there are unknown variables that are hard to verify and swift-mod is compiled with Xcode 15, may be its safer to leave it to another version & migration.

I updated the deps to use 510

rasberik · 2024-11-22T09:33:26Z

.github/workflows/publish.yml

@@ -10,7 +10,7 @@ jobs:
    strategy:
      matrix:
        xcode_version:
-          - "15.0.1"
+          - "15.4"


[note] Required to bump to get Swift 5.10

rasberik · 2024-11-22T09:33:40Z

.github/workflows/test.yml

@@ -26,11 +26,11 @@ jobs:
        run: make test
  macOS:
    name: Test on macOS
-    runs-on: macos-13
+    runs-on: macos-14


[note] Required to get Xcode 15.4 support

rasberik · 2024-11-22T09:34:33Z

Package.swift

+        .package(url: "https://github.com/apple/swift-argument-parser.git", .upToNextMinor(from: "1.5.0")),
+        .package(url: "https://github.com/apple/swift-syntax.git", .upToNextMinor(from: "510.0.3")),


Xcode 15.4 and 16.1 persistently complain with failed resolution (cannot find the repo)

Had to use xcodebuild -resolvePackageDependencies on both Package.swift

Not sure if related but the swift related repos have been migrated to under swiftlang/ from apple/ so please update them according to it.
Also, can you use exact version instead of upToNextMinor or from?

Good catch. Not related it turned out, updated: 3dbb137

rasberik · 2024-11-22T09:35:01Z

README.md

@@ -301,10 +301,10 @@ You can also install swift-mod by downloading `swift-mod.zip` from the latest Gi

 ### Swift Version Support

-`swift-mod` depends on [SwiftSyntax](https://github.com/apple/swift-syntax) that the version in use must match the toolchain version until Swift 5.7.  


[note] Very difficult sentence that I couldnt understand, simplified

until Swift 5.7 is not if important historical matter or forgotten to update

rasberik · 2024-11-22T09:36:19Z

README.md

-|5.8 and later|latest                          |
+|5.8          |0.2.0                           |
+|5.9          |0.2.0                           |
+|5.10         |0.2.1                           |


[note] To be: 0.2.1

ra1028

It mostly looks good but left some comments

ra1028 · 2024-11-26T08:19:20Z

Package.swift

+        .package(url: "https://github.com/apple/swift-argument-parser.git", .upToNextMinor(from: "1.5.0")),
+        .package(url: "https://github.com/apple/swift-syntax.git", .upToNextMinor(from: "510.0.3")),


Not sure if related but the swift related repos have been migrated to under swiftlang/ from apple/ so please update them according to it.
Also, can you use exact version instead of upToNextMinor or from?

ra1028 · 2024-11-26T08:19:29Z

Tools/Package.swift


 import PackageDescription

 let package = Package(
    name: "Tools",
    dependencies: [
-        .package(url: "https://github.com/apple/swift-format.git", .upToNextMinor(from: "509.0.0")),
+        .package(url: "https://github.com/apple/swift-format.git", .upToNextMinor(from: "510.1.0")),


ra1028

LGTM 🚀

rasberik added 5 commits November 22, 2024 18:26

Bump deps

8f11f58

Resolve issues and warnings

1ffc665

Bump tools

4accd06

Bump CI tools

c039684

Update Readme

9d0e692

rasberik force-pushed the swift-5.10 branch from 2ed2067 to 9d0e692 Compare November 22, 2024 09:29

rasberik marked this pull request as ready for review November 22, 2024 09:32

rasberik commented Nov 22, 2024

View reviewed changes

README.md

|5.8 and later|latest |

|5.8 |0.2.0 |

|5.9 |0.2.0 |

|5.10 |0.2.1 |

Copy link

Contributor Author

rasberik Nov 22, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[note] To be: 0.2.1

Revert redundant changes

46f3ab4

ra1028 reviewed Nov 26, 2024

View reviewed changes

Use exact version with updated org

3dbb137

rasberik requested a review from ra1028 November 26, 2024 08:39

ra1028 approved these changes Nov 26, 2024

View reviewed changes

ra1028 merged commit 9fc17e4 into ra1028:master Nov 26, 2024
2 checks passed

rasberik deleted the swift-5.10 branch November 26, 2024 09:14

rasberik mentioned this pull request Nov 27, 2024

CI: Publish on macos-14 #26

Merged

3 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Swift 5.10 #25

Swift 5.10 #25

rasberik commented Nov 21, 2024 •

edited

Loading

rasberik commented Nov 21, 2024 •

edited

Loading

ra1028 commented Nov 22, 2024

rasberik commented Nov 22, 2024 •

edited

Loading

rasberik Nov 22, 2024

rasberik Nov 22, 2024

rasberik Nov 22, 2024

ra1028 Nov 26, 2024

rasberik Nov 26, 2024

rasberik Nov 22, 2024 •

edited

Loading

rasberik Nov 22, 2024

rasberik Nov 22, 2024

ra1028 left a comment

ra1028 Nov 26, 2024

ra1028 Nov 26, 2024

ra1028 left a comment

		.package(url: "https://github.com/apple/swift-argument-parser.git", .upToNextMinor(from: "1.5.0")),
		.package(url: "https://github.com/apple/swift-syntax.git", .upToNextMinor(from: "510.0.3")),

		@@ -301,10 +301,10 @@ You can also install swift-mod by downloading `swift-mod.zip` from the latest Gi

		### Swift Version Support

		`swift-mod` depends on [SwiftSyntax](https://github.com/apple/swift-syntax) that the version in use must match the toolchain version until Swift 5.7.

Swift 5.10 #25

Swift 5.10 #25

Conversation

rasberik commented Nov 21, 2024 • edited Loading

Checklist

Motivation and Context

Impact on Existing Code

rasberik commented Nov 21, 2024 • edited Loading

ra1028 commented Nov 22, 2024

rasberik commented Nov 22, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rasberik Nov 22, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ra1028 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ra1028 left a comment

Choose a reason for hiding this comment

rasberik commented Nov 21, 2024 •

edited

Loading

rasberik commented Nov 21, 2024 •

edited

Loading

rasberik commented Nov 22, 2024 •

edited

Loading

rasberik Nov 22, 2024 •

edited

Loading