diff --git a/SwiftCraftLauncher.xcodeproj/project.pbxproj b/SwiftCraftLauncher.xcodeproj/project.pbxproj index a8ac7c1..9748eef 100644 --- a/SwiftCraftLauncher.xcodeproj/project.pbxproj +++ b/SwiftCraftLauncher.xcodeproj/project.pbxproj @@ -8,8 +8,8 @@ /* Begin PBXBuildFile section */ 030C47462E7F82E700A209A8 /* SkinRenderKit in Frameworks */ = {isa = PBXBuildFile; productRef = 030C47452E7F82E700A209A8 /* SkinRenderKit */; }; + 03C64DD52F0068A000D26B06 /* MarkdownView in Frameworks */ = {isa = PBXBuildFile; productRef = 03C64DD42F0068A000D26B06 /* MarkdownView */; }; 9023D91C2E313A67005A53F1 /* ZIPFoundation in Frameworks */ = {isa = PBXBuildFile; productRef = 9023D91B2E313A67005A53F1 /* ZIPFoundation */; }; - 906099592EED2CE400C7DCA5 /* MarkdownUI in Frameworks */ = {isa = PBXBuildFile; productRef = 906099582EED2CE400C7DCA5 /* MarkdownUI */; }; 90E123456789ABCD0001 /* Sparkle in Frameworks */ = {isa = PBXBuildFile; productRef = 90E123456789ABCD0002 /* Sparkle */; }; /* End PBXBuildFile section */ @@ -33,7 +33,7 @@ 9023D91C2E313A67005A53F1 /* ZIPFoundation in Frameworks */, 030C47462E7F82E700A209A8 /* SkinRenderKit in Frameworks */, 90E123456789ABCD0001 /* Sparkle in Frameworks */, - 906099592EED2CE400C7DCA5 /* MarkdownUI in Frameworks */, + 03C64DD52F0068A000D26B06 /* MarkdownView in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -72,7 +72,7 @@ 9023D91B2E313A67005A53F1 /* ZIPFoundation */, 90E123456789ABCD0002 /* Sparkle */, 030C47452E7F82E700A209A8 /* SkinRenderKit */, - 906099582EED2CE400C7DCA5 /* MarkdownUI */, + 03C64DD42F0068A000D26B06 /* MarkdownView */, ); productName = SwiftCraftLauncher; productReference = 90CE44FE2E7D65A5007C6F30 /* Swift Craft Launcher.app */; @@ -109,7 +109,7 @@ 90E123456789ABCD0003 /* XCRemoteSwiftPackageReference "Sparkle" */, 033870FA2E6059570056BDB2 /* XCRemoteSwiftPackageReference "SwiftLintPlugins" */, 030C47442E7F82E700A209A8 /* XCRemoteSwiftPackageReference "NSSkinRender" */, - 906099572EED2CE400C7DCA5 /* XCRemoteSwiftPackageReference "swift-markdown-ui" */, + 03C64DD32F0068A000D26B06 /* XCRemoteSwiftPackageReference "MarkdownView" */, ); preferredProjectObjectVersion = 77; productRefGroup = 9023D8282E3139B5005A53F1; @@ -383,20 +383,20 @@ minimumVersion = 0.59.1; }; }; - 9023D91A2E313A67005A53F1 /* XCRemoteSwiftPackageReference "ZIPFoundation" */ = { + 03C64DD32F0068A000D26B06 /* XCRemoteSwiftPackageReference "MarkdownView" */ = { isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/weichsel/ZIPFoundation.git"; + repositoryURL = "https://github.com/LiYanan2004/MarkdownView"; requirement = { - kind = upToNextMajorVersion; - minimumVersion = 0.9.19; + branch = mdv3; + kind = branch; }; }; - 906099572EED2CE400C7DCA5 /* XCRemoteSwiftPackageReference "swift-markdown-ui" */ = { + 9023D91A2E313A67005A53F1 /* XCRemoteSwiftPackageReference "ZIPFoundation" */ = { isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/gonzalezreal/swift-markdown-ui.git"; + repositoryURL = "https://github.com/weichsel/ZIPFoundation.git"; requirement = { kind = upToNextMajorVersion; - minimumVersion = 2.4.1; + minimumVersion = 0.9.19; }; }; 90E123456789ABCD0003 /* XCRemoteSwiftPackageReference "Sparkle" */ = { @@ -420,16 +420,16 @@ package = 033870FA2E6059570056BDB2 /* XCRemoteSwiftPackageReference "SwiftLintPlugins" */; productName = "plugin:SwiftLintBuildToolPlugin"; }; + 03C64DD42F0068A000D26B06 /* MarkdownView */ = { + isa = XCSwiftPackageProductDependency; + package = 03C64DD32F0068A000D26B06 /* XCRemoteSwiftPackageReference "MarkdownView" */; + productName = MarkdownView; + }; 9023D91B2E313A67005A53F1 /* ZIPFoundation */ = { isa = XCSwiftPackageProductDependency; package = 9023D91A2E313A67005A53F1 /* XCRemoteSwiftPackageReference "ZIPFoundation" */; productName = ZIPFoundation; }; - 906099582EED2CE400C7DCA5 /* MarkdownUI */ = { - isa = XCSwiftPackageProductDependency; - package = 906099572EED2CE400C7DCA5 /* XCRemoteSwiftPackageReference "swift-markdown-ui" */; - productName = MarkdownUI; - }; 90E123456789ABCD0002 /* Sparkle */ = { isa = XCSwiftPackageProductDependency; package = 90E123456789ABCD0003 /* XCRemoteSwiftPackageReference "Sparkle" */; diff --git a/SwiftCraftLauncher.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/SwiftCraftLauncher.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 5cd1d97..e2c5008 100644 --- a/SwiftCraftLauncher.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/SwiftCraftLauncher.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,13 +1,40 @@ { - "originHash" : "b2c4e82de5822927479219bcaca65922ec291604ece6f12b2da06d97396d8f9d", + "originHash" : "9c9a4cadc64a803ce6f19f8c441adf970941b8ffc40f4b379c53bf79653a16a8", "pins" : [ { - "identity" : "networkimage", + "identity" : "highlightr", "kind" : "remoteSourceControl", - "location" : "https://github.com/gonzalezreal/NetworkImage", + "location" : "https://github.com/raspu/Highlightr.git", "state" : { - "revision" : "2849f5323265386e200484b0d0f896e73c3411b9", - "version" : "6.0.1" + "revision" : "05e7fcc63b33925cd0c1faaa205cdd5681e7bbef", + "version" : "2.3.0" + } + }, + { + "identity" : "latexswiftui", + "kind" : "remoteSourceControl", + "location" : "https://github.com/colinc86/LaTeXSwiftUI.git", + "state" : { + "revision" : "c45e0fd45f64923c49c5904a9f9626bc8939f05f", + "version" : "1.5.0" + } + }, + { + "identity" : "markdownview", + "kind" : "remoteSourceControl", + "location" : "https://github.com/LiYanan2004/MarkdownView", + "state" : { + "branch" : "mdv3", + "revision" : "c2f3f6888ba5b8d45bcf9edafb93fd3cddf6ad15" + } + }, + { + "identity" : "mathjaxswift", + "kind" : "remoteSourceControl", + "location" : "https://github.com/colinc86/MathJaxSwift", + "state" : { + "revision" : "e23d6eab941da699ac4a60fb0e60f3ba5c937459", + "version" : "3.4.0" } }, { @@ -38,12 +65,30 @@ } }, { - "identity" : "swift-markdown-ui", + "identity" : "swift-html-entities", + "kind" : "remoteSourceControl", + "location" : "https://github.com/Kitura/swift-html-entities", + "state" : { + "revision" : "d8ca73197f59ce260c71bd6d7f6eb8bbdccf508b", + "version" : "4.0.1" + } + }, + { + "identity" : "swift-markdown", + "kind" : "remoteSourceControl", + "location" : "https://github.com/swiftlang/swift-markdown.git", + "state" : { + "revision" : "7d9a5ce307528578dfa777d505496bd5f544ad94", + "version" : "0.7.3" + } + }, + { + "identity" : "swiftdraw", "kind" : "remoteSourceControl", - "location" : "https://github.com/gonzalezreal/swift-markdown-ui.git", + "location" : "https://github.com/swhitty/SwiftDraw", "state" : { - "revision" : "5f613358148239d0292c0cef674a3c2314737f9e", - "version" : "2.4.1" + "revision" : "17d55c17540f3eb10685058e803d7ae73d9bf9d3", + "version" : "0.25.3" } }, { diff --git a/SwiftCraftLauncher/Views/ModrinthProjectDetail/ModrinthProjectDetailView.swift b/SwiftCraftLauncher/Views/ModrinthProjectDetail/ModrinthProjectDetailView.swift index 824362b..4ecd2db 100644 --- a/SwiftCraftLauncher/Views/ModrinthProjectDetail/ModrinthProjectDetailView.swift +++ b/SwiftCraftLauncher/Views/ModrinthProjectDetail/ModrinthProjectDetailView.swift @@ -1,4 +1,4 @@ -import MarkdownUI +import MarkdownView import SwiftUI // MARK: - Constants @@ -114,7 +114,8 @@ struct ModrinthProjectDetailView: View { } private func descriptionView(_ project: ModrinthProjectDetail) -> some View { - Markdown(project.body) + // Markdown(project.body) + MarkdownView(project.body) // EmptyView() }