Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Swift 5.8 #886

Merged
merged 77 commits into from
May 10, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
77 commits
Select commit Hold shift + click to select a range
0c91c84
Upgraded to Swift 5.8.
SDGGiesbrecht Apr 3, 2023
7005bf9
Updated Swift.
SDGGiesbrecht Apr 3, 2023
1b46e58
Updated Android download.
SDGGiesbrecht Apr 3, 2023
c1c950e
Refreshed.
SDGGiesbrecht Apr 3, 2023
2ef395a
Updated Xcode.
SDGGiesbrecht Apr 3, 2023
2a39a23
Debugging Windows.
SDGGiesbrecht Apr 3, 2023
859440d
...
SDGGiesbrecht Apr 3, 2023
c2b9649
Updated SDGCornerstone.
SDGGiesbrecht Apr 8, 2023
4cbc731
Removed Windows debugging.
SDGGiesbrecht Apr 8, 2023
9741804
Updated dependencies.
SDGGiesbrecht Apr 8, 2023
0924b70
Updated dependencies.
SDGGiesbrecht Apr 8, 2023
cd273e9
Resolved merge.
SDGGiesbrecht Apr 9, 2023
64eb5e9
Updated swift‐format.
SDGGiesbrecht Apr 9, 2023
8d7313f
Updated some call sites.
SDGGiesbrecht Apr 9, 2023
015e1db
Updated more call sites.
SDGGiesbrecht Apr 9, 2023
d32cfe1
Handled standard operators.
SDGGiesbrecht Apr 9, 2023
a704c66
Updated specifications.
SDGGiesbrecht Apr 9, 2023
8270236
Fixed crash.
SDGGiesbrecht Apr 9, 2023
11a9e11
Merge branch 'master' into swift‐5.8
SDGGiesbrecht Apr 11, 2023
c65730d
Merge branch 'master' into swift‐5.8
SDGGiesbrecht Apr 12, 2023
a0ea8c7
Resolved merge.
SDGGiesbrecht Apr 17, 2023
f4ec6ee
Repaired merge error.
SDGGiesbrecht Apr 17, 2023
3637fea
Attempted debug.
SDGGiesbrecht Apr 17, 2023
3aa581a
Attempted adjustment to new initialization structure.
SDGGiesbrecht Apr 17, 2023
5ce91fb
Revert "Attempted debug."
SDGGiesbrecht Apr 17, 2023
a7ee337
Updated specifications.
SDGGiesbrecht Apr 17, 2023
38de373
Debugging...
SDGGiesbrecht Apr 18, 2023
998a699
Revert "Debugging..."
SDGGiesbrecht Apr 18, 2023
b8ef1ba
Updated SDGSwift.
SDGGiesbrecht Apr 18, 2023
442b3f4
Repaired tools version.
SDGGiesbrecht Apr 18, 2023
506c385
Fixed coverage.
SDGGiesbrecht Apr 18, 2023
73895ba
Updated SDGSwift.
SDGGiesbrecht Apr 20, 2023
cd7e844
Tried adjusting linker path.
SDGGiesbrecht Apr 20, 2023
f2638b4
Adjusted library copy.
SDGGiesbrecht Apr 20, 2023
215b84d
Updated Android job generation.
SDGGiesbrecht Apr 20, 2023
5ae7b36
Updated specifications.
SDGGiesbrecht Apr 21, 2023
b86b322
Updated SDGSwift.
SDGGiesbrecht Apr 21, 2023
e0f5bf4
Merge branch 'master' into swift‐5.8
SDGGiesbrecht Apr 22, 2023
93ef6b2
Merge branch 'master' into swift‐5.8
SDGGiesbrecht Apr 22, 2023
2b9f58d
Merge branch 'master' into swift‐5.8
SDGGiesbrecht Apr 25, 2023
c5a1755
Updated macOS.
SDGGiesbrecht Apr 25, 2023
ec06668
Reverted tools version.
SDGGiesbrecht Apr 25, 2023
7671c8b
Updated specifications.
SDGGiesbrecht Apr 28, 2023
63392ed
Suppressed warning.
SDGGiesbrecht Apr 28, 2023
502ed08
Fixed build.
SDGGiesbrecht Apr 28, 2023
c628234
Updated specifications.
SDGGiesbrecht Apr 28, 2023
d09910d
Debugging...
SDGGiesbrecht Apr 28, 2023
06ff4aa
Resolved reversion conflicts.
SDGGiesbrecht Apr 29, 2023
cbdab15
Filtered meaningless watchOS error.
SDGGiesbrecht Apr 29, 2023
f00a417
Disabled another error.
SDGGiesbrecht Apr 29, 2023
420b550
Updated more specifications.
SDGGiesbrecht Apr 29, 2023
a84d8b1
Removed debugging...
SDGGiesbrecht Apr 30, 2023
e7c4104
Suppressed irrelevant warning.
SDGGiesbrecht Apr 30, 2023
22043c3
Suppressed on other Xcode platforms too.
SDGGiesbrecht Apr 30, 2023
55da695
More debugging...
SDGGiesbrecht Apr 30, 2023
2cae3da
Supressed new output.
SDGGiesbrecht Apr 30, 2023
af8e84d
Updated more specifications.
SDGGiesbrecht May 1, 2023
1b763f9
Merge branch 'master' into swift‐5.8
SDGGiesbrecht May 2, 2023
c38202c
Fixed style.
SDGGiesbrecht May 2, 2023
445156b
Debug hanging watchOS.
SDGGiesbrecht May 4, 2023
515e5d5
Tried tests with watchOS.
SDGGiesbrecht May 4, 2023
a6e1661
Restored main job.
SDGGiesbrecht May 4, 2023
13d09ab
Tried only building.
SDGGiesbrecht May 4, 2023
49f33d5
Tried stopping at header.
SDGGiesbrecht May 5, 2023
e530c16
Disabled other jobs.
SDGGiesbrecht May 5, 2023
18459ce
Adjusted to get attention sooner.
SDGGiesbrecht May 5, 2023
05596d0
Tried build.
SDGGiesbrecht May 5, 2023
b3ba341
Merge branch 'master' into swift‐5.8
SDGGiesbrecht May 5, 2023
eccf7a4
Moved to proper platform.
SDGGiesbrecht May 5, 2023
24cdcf8
Tried filtering log.
SDGGiesbrecht May 5, 2023
ae2dc41
Adjusted line reassembly.
SDGGiesbrecht May 6, 2023
b691637
Dumbified filter.
SDGGiesbrecht May 6, 2023
2304620
Removed dubugging.
SDGGiesbrecht May 6, 2023
421aa13
Restored other workflows.
SDGGiesbrecht May 6, 2023
963be16
Updated Carton.
SDGGiesbrecht May 8, 2023
5c8df61
Updated Carton.
SDGGiesbrecht May 9, 2023
af94b3b
Updated specifications.
SDGGiesbrecht May 9, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Updated swift‐format.
  • Loading branch information
SDGGiesbrecht committed Apr 9, 2023
commit 64eb5e94b18f05fd2709e4537422fe93a664711d
44 changes: 22 additions & 22 deletions Package.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/SDGGiesbrecht/SDGSwift",
"state" : {
"revision" : "b898b510e8f06aae1fbc683310e6b2d4bfda6944",
"version" : "12.0.0"
"branch" : "master",
"revision" : "ca3de49354b7577b940e7ebe69aa417538a46ef0"
}
},
{
Expand All @@ -50,8 +50,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/SDGGiesbrecht/swift-cmark",
"state" : {
"revision" : "1168665f6b36be747ffe6b7b90bc54cfc17f42b7",
"version" : "0.50302.0"
"revision" : "ba5e03be521f621fcfd29e63be2cf475b97efd5a",
"version" : "0.50700.1"
}
},
{
Expand All @@ -68,8 +68,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/SDGGiesbrecht/swift-crypto",
"state" : {
"revision" : "477051bcb0f29f01b7f22ef3dab5ebbe6962246d",
"version" : "0.10107.0"
"revision" : "0adce56a99ee26faba51407c49e399ba382b943a",
"version" : "0.20400.0"
}
},
{
Expand All @@ -86,26 +86,26 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/SDGGiesbrecht/swift-driver",
"state" : {
"revision" : "9f6b0c73f8733ac2bffb3b307fc41bb597fb82ff",
"version" : "0.50700.2"
"revision" : "2353b37ce91a0fa587e16fba1ca205353781e0ed",
"version" : "0.50800.0"
}
},
{
"identity" : "swift-format",
"kind" : "remoteSourceControl",
"location" : "https://github.com/SDGGiesbrecht/swift-format",
"state" : {
"revision" : "f07566fd4fdceafc9a74f384a964c6c74ca9b380",
"version" : "0.0.507000"
"revision" : "e725e5a10b177415b68922822544178052c89b9e",
"version" : "0.50800.0"
}
},
{
"identity" : "swift-llbuild",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-llbuild.git",
"location" : "https://github.com/SDGGiesbrecht/swift-llbuild",
"state" : {
"revision" : "5cd4df550b31301508a77064e3dfaa5c5628780e",
"version" : "0.5.0"
"revision" : "14d9618f53db8ca57ed46ed7b4587155c2a03390",
"version" : "0.50800.0"
}
},
{
Expand All @@ -122,17 +122,17 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/SDGGiesbrecht/swift-package-manager",
"state" : {
"revision" : "51a818398567b6c3000bc09c44e2e31d98d6c09f",
"version" : "0.50700.2"
"revision" : "558eda62ff7d3e12b319cadf9f3b529e2de63c68",
"version" : "0.50800.0"
}
},
{
"identity" : "swift-syntax",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-syntax",
"location" : "https://github.com/SDGGiesbrecht/swift-syntax",
"state" : {
"revision" : "04d4497be6b88e524a71778d828790e9589ae1c4",
"version" : "0.50700.0"
"revision" : "374cc240f1ef840e9872f17e6ae1f90a0a72c176",
"version" : "0.50800.0"
}
},
{
Expand All @@ -149,17 +149,17 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-tools-support-core",
"state" : {
"revision" : "4f07be3dc201f6e2ee85b6942d0c220a16926811",
"version" : "0.2.7"
"revision" : "93784c59434dbca8e8a9e4b700d0d6d94551da6a",
"version" : "0.5.2"
}
},
{
"identity" : "yams",
"kind" : "remoteSourceControl",
"location" : "https://github.com/jpsim/Yams.git",
"state" : {
"revision" : "9ff1cc9327586db4e0c8f46f064b6a82ec1566fa",
"version" : "4.0.6"
"revision" : "f47ba4838c30dbd59998a4e4c87ab620ff959e8a",
"version" : "5.0.5"
}
}
],
Expand Down
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -512,7 +512,7 @@ let package = Package(
.package(
url: "https://github.com/SDGGiesbrecht/swift\u{2D}format",
// Must also be updated in the documentation link in Sources/WorkspaceImplementation/Interface/Normalize.swift.
exact: Version(0, 0, 507000)
exact: Version(0, 50800, 0)
),
.package(
url: "https://github.com/SDGGiesbrecht/SDGWeb",
Expand Down
2 changes: 1 addition & 1 deletion Sources/WorkspaceImplementation/Interface/Normalize.swift
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@

private static let swiftFormatLink = "https://github.com/apple/swift\u{2D}format"
private static let swiftFormatConfigurationLink =
"https://github.com/apple/swift\u{2D}format/blob/0.50700.0/Sources/SwiftFormatConfiguration/Configuration.swift#L20"
"https://github.com/apple/swift\u{2D}format/blob/508.0.0/Sources/SwiftFormatConfiguration/Configuration.swift#L20"
private static let discussion = UserFacing<StrictString, InterfaceLocalization>(
{ localization in
switch localization {
Expand Down