t_a6ad7840: Update third-party dependencies to latest compatible versions
Migrate MarkdownUI 0.5.1 -> 2.4.1 (upToNextMajorVersion). This single
direct-upgrade collapses the 7-package resolved graph to 3 packages,
dropping four archived/retired transitive dependencies:
Dropped (was pulled in by MarkdownUI 0.5.1):
- AttributedText 0.3.0 (archived 2023-01)
- SwiftCommonMark 0.1.1 (archived 2023-01)
- combine-schedulers 0.4.1 (Point-Free; iOS 16+ requirement)
- xctest-dynamic-overlay 0.1.0 (unused in source; superseded by
swift-issue-reporting; no longer
needed as MarkdownUI test-only)
- SwiftDocOrg/swift-cmark 0.29.0 (archived; replaced by
swiftlang/swift-cmark 0.8.0)
Pinned (MarkdownUI 2.4.1 transitive graph):
- MarkdownUI 2.4.1 (gonzalezreal/MarkdownUI @ 5f61335)
- NetworkImage 6.0.1 (gonzalezreal/NetworkImage @ 2849f53)
replaces NetworkImage 2.1.0 (iOS 14 baseline, compatible with
the iOS 15.0 target set by t_fe859d8e)
- swift-cmark 0.8.0 (swiftlang/swift-cmark @ 924936d)
Call-site migration (MarkdownUI 0.5.1 -> 2.x):
MarkdownUI 2.x replaced 'Markdown(Document(_:))' (a CommonMark
Document) with 'Markdown(_ string:)' / 'Markdown(_ content:
MarkdownContent)'. Two call-sites in MonsterDetailView.swift
updated to pass the rendered Markdown string directly.
Package.resolved regenerated against the resolved graph (version 2
format). Verified clean SPM resolution and that the call-site
pattern compiles against MarkdownUI 2.4.1 on swift 6.3.3.
No changes to Xcode project-level settings (delegated to t_fe859d8e).
This commit is contained in:
@@ -1086,8 +1086,8 @@
|
||||
isa = XCRemoteSwiftPackageReference;
|
||||
repositoryURL = "https://github.com/gonzalezreal/MarkdownUI";
|
||||
requirement = {
|
||||
kind = upToNextMinorVersion;
|
||||
minimumVersion = 0.5.1;
|
||||
kind = upToNextMajorVersion;
|
||||
minimumVersion = 2.4.1;
|
||||
};
|
||||
};
|
||||
/* End XCRemoteSwiftPackageReference section */
|
||||
|
||||
@@ -1,70 +1,32 @@
|
||||
{
|
||||
"object": {
|
||||
"pins": [
|
||||
"pins" : [
|
||||
{
|
||||
"package": "AttributedText",
|
||||
"repositoryURL": "https://github.com/gonzalezreal/AttributedText",
|
||||
"state": {
|
||||
"branch": null,
|
||||
"revision": "bf076de48dbb2172525486936d512e1bba062642",
|
||||
"version": "0.3.0"
|
||||
"identity" : "markdownui",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/gonzalezreal/MarkdownUI",
|
||||
"state" : {
|
||||
"revision" : "5f613358148239d0292c0cef674a3c2314737f9e",
|
||||
"version" : "2.4.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
"package": "combine-schedulers",
|
||||
"repositoryURL": "https://github.com/pointfreeco/combine-schedulers",
|
||||
"state": {
|
||||
"branch": null,
|
||||
"revision": "f1250faa1c1436ca83950ce676a4fe97a309a457",
|
||||
"version": "0.4.1"
|
||||
"identity" : "networkimage",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/gonzalezreal/NetworkImage",
|
||||
"state" : {
|
||||
"revision" : "2849f5323265386e200484b0d0f896e73c3411b9",
|
||||
"version" : "6.0.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
"package": "MarkdownUI",
|
||||
"repositoryURL": "https://github.com/gonzalezreal/MarkdownUI",
|
||||
"state": {
|
||||
"branch": null,
|
||||
"revision": "e8931e37dcf777b4c03ca76aa09c10cf246a2ced",
|
||||
"version": "0.5.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
"package": "NetworkImage",
|
||||
"repositoryURL": "https://github.com/gonzalezreal/NetworkImage",
|
||||
"state": {
|
||||
"branch": null,
|
||||
"revision": "15582b821cb097012b41b83d6219717926ec4ed6",
|
||||
"version": "2.1.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
"package": "cmark",
|
||||
"repositoryURL": "https://github.com/SwiftDocOrg/swift-cmark.git",
|
||||
"state": {
|
||||
"branch": null,
|
||||
"revision": "9c8096a23f44794bde297452d87c455fc4f76d42",
|
||||
"version": "0.29.0+20210102.9c8096a"
|
||||
}
|
||||
},
|
||||
{
|
||||
"package": "SwiftCommonMark",
|
||||
"repositoryURL": "https://github.com/gonzalezreal/SwiftCommonMark",
|
||||
"state": {
|
||||
"branch": null,
|
||||
"revision": "f1575c37110a386e50da3208a04266b398bcefaa",
|
||||
"version": "0.1.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
"package": "xctest-dynamic-overlay",
|
||||
"repositoryURL": "https://github.com/pointfreeco/xctest-dynamic-overlay",
|
||||
"state": {
|
||||
"branch": null,
|
||||
"revision": "603974e3909ad4b48ba04aad7e0ceee4f077a518",
|
||||
"version": "0.1.0"
|
||||
"identity" : "swift-cmark",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/swiftlang/swift-cmark",
|
||||
"state" : {
|
||||
"revision" : "924936d0427cb25a61169739a7660230bffa6ea6",
|
||||
"version" : "0.8.0"
|
||||
}
|
||||
}
|
||||
]
|
||||
},
|
||||
"version": 1
|
||||
],
|
||||
"version" : 2
|
||||
}
|
||||
|
||||
@@ -216,7 +216,7 @@ struct TraitList: View {
|
||||
.font(.system(size: 20, weight: .bold))
|
||||
ForEach(traits) { action in
|
||||
VStack {
|
||||
Markdown(Document(action.renderedText(viewModel)))
|
||||
Markdown(action.renderedText(viewModel))
|
||||
Divider()
|
||||
}
|
||||
}
|
||||
@@ -271,7 +271,7 @@ struct MonsterDetailView: View {
|
||||
if (viewModel.abilities.count > 0) {
|
||||
ForEach(viewModel.abilities) { ability in
|
||||
VStack {
|
||||
Markdown(Document(ability.renderedText(viewModel)))
|
||||
Markdown(ability.renderedText(viewModel))
|
||||
Divider()
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user