From 4fb13c2facb2b3414278dc249f714d4c1102f2d9 Mon Sep 17 00:00:00 2001 From: John Nguyen Date: Sun, 28 Feb 2021 14:26:02 +0100 Subject: [PATCH] [Chore] Reorganize project structure for SPM (#248) * Adjust folder structure to match Swift package structure * Update package manifest * Add bundle helper # Conflicts: # Sources/Down/Views/DownView.swift * Add bundle helper to xcode proj * Update codecov config * Update build phase script * Update podspec * Try to fix podspec * Try to fix podspec again --- Down.podspec | 22 ++-- Down.xcodeproj/project.pbxproj | 102 +++++++++++------- Package.swift | 23 ++-- .../Down}/AST/Nodes/BaseNode.swift | 0 .../Down}/AST/Nodes/BlockQuote.swift | 0 .../Down}/AST/Nodes/ChildSequence.swift | 0 {Source => Sources/Down}/AST/Nodes/Code.swift | 0 .../Down}/AST/Nodes/CodeBlock.swift | 0 .../Down}/AST/Nodes/CustomBlock.swift | 0 .../Down}/AST/Nodes/CustomInline.swift | 0 .../Down}/AST/Nodes/Document.swift | 0 .../Down}/AST/Nodes/Emphasis.swift | 0 .../Down}/AST/Nodes/Heading.swift | 0 .../Down}/AST/Nodes/HtmlBlock.swift | 0 .../Down}/AST/Nodes/HtmlInline.swift | 0 .../Down}/AST/Nodes/Image.swift | 0 {Source => Sources/Down}/AST/Nodes/Item.swift | 0 .../Down}/AST/Nodes/LineBreak.swift | 0 {Source => Sources/Down}/AST/Nodes/Link.swift | 0 {Source => Sources/Down}/AST/Nodes/List.swift | 0 {Source => Sources/Down}/AST/Nodes/Node.swift | 0 .../Down}/AST/Nodes/Paragraph.swift | 0 .../Down}/AST/Nodes/SoftBreak.swift | 0 .../Down}/AST/Nodes/Strong.swift | 0 {Source => Sources/Down}/AST/Nodes/Text.swift | 0 .../Down}/AST/Nodes/ThematicBreak.swift | 0 .../ColorCollection.swift | 0 .../FontCollection.swift | 0 .../ParagraphStyleCollection.swift | 0 .../BlockBackgroundColorAttribute.swift | 0 .../QuoteStripeAttribute.swift | 0 .../ThematicBreakAttribute.swift | 0 .../Extensions/CGPoint+Translate.swift | 0 .../Helpers/Extensions/CGRect+Helpers.swift | 0 .../NSAttributedString+Helpers.swift | 0 ...NSMutableAttributedString+Attributes.swift | 0 .../Helpers/Extensions/UIFont+Traits.swift | 0 .../Helpers/ListItemParagraphStyler.swift | 0 .../DownDebugLayoutManager.swift | 0 .../Layout Managers/DownLayoutManager.swift | 0 .../Styling/Options/CodeBlockOptions.swift | 0 .../AST/Styling/Options/ListItemOptions.swift | 0 .../Styling/Options/QuoteStripeOptions.swift | 0 .../Options/ThematicBreakOptions.swift | 0 .../AST/Styling/Stylers/DownStyler.swift | 0 .../Stylers/DownStylerConfiguration.swift | 0 .../Down}/AST/Styling/Stylers/Styler.swift | 0 .../Text Views/DownDebugTextView.swift | 0 .../AST/Styling/Text Views/DownTextView.swift | 0 .../Visitors/AttributedStringVisitor.swift | 0 .../Down}/AST/Visitors/DebugVisitor.swift | 0 .../Visitors/ListItemPrefixGenerator.swift | 0 .../Down}/AST/Visitors/Visitor.swift | 0 {Source => Sources/Down}/Down.h | 0 {Source => Sources/Down}/Down.swift | 0 .../Down}/Enums & Options/DownErrors.swift | 0 .../Down}/Enums & Options/DownOptions.swift | 0 .../Extensions/NSAttributedString+HTML.swift | 0 .../Down}/Extensions/String+ToHTML.swift | 0 .../Down}/Renderers/DownASTRenderable.swift | 0 .../DownAttributedStringRenderable.swift | 0 .../Renderers/DownCommonMarkRenderable.swift | 0 .../Down}/Renderers/DownGroffRenderable.swift | 0 .../Down}/Renderers/DownHTMLRenderable.swift | 0 .../Down}/Renderers/DownLaTeXRenderable.swift | 0 .../Down}/Renderers/DownRenderable.swift | 0 .../Down}/Renderers/DownXMLRenderable.swift | 0 .../DownView (macOS).bundle/css/down.min.css | 0 .../DownView (macOS).bundle/index.html | 0 .../DownView (macOS).bundle/js/down.js | 0 .../js/highlight.min.js | 0 .../DownView.bundle/css/down.min.css | 0 .../Resources}/DownView.bundle/index.html | 0 .../Resources}/DownView.bundle/js/down.js | 0 .../DownView.bundle/js/highlight.min.js | 0 Sources/Down/Views/BundleHelper.swift | 34 ++++++ {Source => Sources/Down}/Views/DownView.swift | 4 +- {Source => Sources}/cmark/COPYING | 0 {Source => Sources}/cmark/blocks.c | 0 {Source => Sources}/cmark/buffer.c | 0 {Source => Sources}/cmark/buffer.h | 0 .../cmark/case_fold_switch.inc | 0 {Source => Sources}/cmark/chunk.h | 0 {Source => Sources}/cmark/cmark.c | 0 {Source => Sources}/cmark/cmark.h | 0 {Source => Sources}/cmark/cmark_ctype.c | 0 {Source => Sources}/cmark/cmark_ctype.h | 0 {Source => Sources}/cmark/cmark_export.h | 0 {Source => Sources}/cmark/cmark_version.h | 0 {Source => Sources}/cmark/commonmark.c | 0 {Source => Sources}/cmark/config.h | 0 {Source => Sources}/cmark/entities.inc | 0 {Source => Sources}/cmark/houdini.h | 0 {Source => Sources}/cmark/houdini_href_e.c | 0 {Source => Sources}/cmark/houdini_html_e.c | 0 {Source => Sources}/cmark/houdini_html_u.c | 0 {Source => Sources}/cmark/html.c | 0 .../cmark/include/module.modulemap | 0 {Source => Sources}/cmark/inlines.c | 0 {Source => Sources}/cmark/inlines.h | 0 {Source => Sources}/cmark/iterator.c | 0 {Source => Sources}/cmark/iterator.h | 0 {Source => Sources}/cmark/latex.c | 0 {Source => Sources}/cmark/man.c | 0 {Source => Sources}/cmark/node.c | 0 {Source => Sources}/cmark/node.h | 0 {Source => Sources}/cmark/parser.h | 0 {Source => Sources}/cmark/references.c | 0 {Source => Sources}/cmark/references.h | 0 {Source => Sources}/cmark/render.c | 0 {Source => Sources}/cmark/render.h | 0 {Source => Sources}/cmark/scanners.c | 0 {Source => Sources}/cmark/scanners.h | 0 {Source => Sources}/cmark/utf8.c | 0 {Source => Sources}/cmark/utf8.h | 0 {Source => Sources}/cmark/xml.c | 0 .../Deployment-Targets.xcconfig | 0 .../Universal-Framework-Target.xcconfig | 0 .../Universal-Target-Base.xcconfig | 0 .../Down-Info.plist | 0 .../DownTests-Info.plist | 0 .../AST/ListItemPrefixGeneratorTests.swift | 0 Tests/{ => DownTests}/AST/NodeTests.swift | 0 Tests/{ => DownTests}/AST/VisitorTests.swift | 0 .../testAttributedStringVisitor.1.txt | 0 .../VisitorTests/testBlockQuote.1.txt | 0 .../VisitorTests/testBlockQuote.2.txt | 0 .../VisitorTests/testCodeBlock.1.txt | 0 .../VisitorTests/testCodeBlock.2.txt | 0 .../VisitorTests/testHeading.1.txt | 0 .../VisitorTests/testHeading.2.txt | 0 .../VisitorTests/testHtmlBlock.1.txt | 0 .../VisitorTests/testHtmlBlock.2.txt | 0 .../VisitorTests/testInline.1.txt | 0 .../VisitorTests/testInline.2.txt | 0 .../VisitorTests/testLineBreak.1.txt | 0 .../VisitorTests/testLineBreak.2.txt | 0 .../__Snapshots__/VisitorTests/testLink.1.txt | 0 .../__Snapshots__/VisitorTests/testLink.2.txt | 0 .../__Snapshots__/VisitorTests/testList.1.txt | 0 .../__Snapshots__/VisitorTests/testList.2.txt | 0 .../VisitorTests/testParagraph.1.txt | 0 .../VisitorTests/testParagraph.2.txt | 0 .../VisitorTests/testSimpleMarkdown.1.txt | 0 .../VisitorTests/testSoftBreak.1.txt | 0 .../VisitorTests/testSoftBreak.2.txt | 0 .../VisitorTests/testThematicBreak.1.txt | 0 .../VisitorTests/testThematicBreak.2.txt | 0 Tests/{ => DownTests}/BindingTests.swift | 0 Tests/{ => DownTests}/DownViewTests.swift | 0 .../TestDownView.bundle/css/down.min.css | 0 .../Fixtures/TestDownView.bundle/index.html | 0 .../Fixtures/TestDownView.bundle/js/down.js | 0 .../TestDownView.bundle/js/highlight.min.js | 0 .../NSAttributedStringTests.swift | 0 Tests/{ => DownTests}/StringTests.swift | 0 .../Styler/BlockQuoteStyleTests.swift | 0 .../Styler/CodeBlockStyleTests.swift | 0 .../Styler/DownDebugLayoutManagerTests.swift | 0 .../Styler/HeadingStyleTests.swift | 0 .../Helpers/CGPoint_TranslateTests.swift | 0 .../Styler/Helpers/CGRect_HelpersTests.swift | 0 .../NSAttributedString+HelpersTests.swift | 0 ...ableAttributedString+AttributesTests.swift | 0 .../Styler/InlineStyleTests.swift | 0 .../Styler/LinkStyleTests.swift | 0 .../Styler/ListItemStyleTests.swift | 0 .../Styler/StylerTestSuite.swift | 0 .../Styler/ThematicBreakSyleTests.swift | 0 ...at_NestedQuotes_Have_TheirOwnStripes.1.png | Bin ...eAlignment_Obeys_TextContainerOffset.1.png | Bin .../testThat_QuoteContent_Aligns.1.png | Bin ...QuoteContent_Preserves_BlockElements.1.png | Bin ...uoteContent_Preserves_InlineElements.1.png | Bin ...uoteContent_Preserves_ListFormatting.1.png | Bin ...QuoteContent_Preserves_ThematicBreak.1.png | Bin ...testThat_QuoteStripe_AlignsTo_Margin.1.png | Bin ...ist_WithinA_ListItem_AlignsCorrectly.1.png | Bin ...nA_ListItem_AlignsTo_ListItemContent.1.png | Bin .../testThat_CodeBlock_IsStyled.1.png | Bin .../testThat_HtmlBlock_IsStyled.1.png | Bin .../testThat_LineFragments_AreDrawn.1.png | Bin ...ves_StrongEmphasisAndMonospaceTraits.1.png | Bin .../testThat_Heading_LevelOne_IsStyled.1.png | Bin ...testThat_Heading_LevelThree_IsStyled.1.png | Bin .../testThat_Heading_LevelTwo_IsStyled.1.png | Bin ...ng_LevelsThreeToSix_AreStyledEqually.1.png | Bin .../testThat_CodeText_IsStyled.1.png | Bin .../testThat_EmphasizedCode_IsStyled.1.png | Bin ...stThat_EmphasizedStrongCode_IsStyled.1.png | Bin ...stThat_EmphasizedStrongText_IsStyled.1.png | Bin .../testThat_EmphasizedText_IsStyled.1.png | Bin .../testThat_StrongCode_IsStyled.1.png | Bin ...stThat_StrongEmphasizedCode_IsStyled.1.png | Bin ...stThat_StrongEmphasizedText_IsStyled.1.png | Bin .../testThat_StrongText_IsStyled.1.png | Bin .../testThat_Link_IsStyled.1.png | Bin ...testThat_Link_Preserves_InlineStyles.1.png | Bin ...estThat_DigitAndBulletPrefixes_Align.1.png | Bin ...axPrefixLength_DontPush_WrappedLines.1.png | Bin ...eedingMaxPrefixLength_Push_FirstLine.1.png | Bin ...itPrefixes_UpToMaxPrefixLength_Align.1.png | Bin ...aph_WithLineBreaks_AlignTo_FirstLine.1.png | Bin ...graph_WrappedLines_AlignTo_FirstLine.1.png | Bin ...hat_ListItems_Preseve_InlineElements.1.png | Bin ...stThat_NestedList_AlignsTo_OuterList.1.png | Bin ...InMiddleParagraph_AlignsTo_OuterList.1.png | Bin ...TrailingParagraph_AlignsTo_OuterList.1.png | Bin ...edList_With_MultipleParagraphs_Align.1.png | Bin ...That_NestedLists_AlignTo_ParentLists.1.png | Bin ...hs_FirstLines_AlignTo_FirstParagraph.1.png | Bin ...aphs_WrappedLines_AlignTo_FirstLines.1.png | Bin ...estThat_ThematicBreak_CanBe_Indented.1.png | Bin ...Break_InOffsetTextContainer_IsStyled.1.png | Bin .../testThat_ThematicBreak_IsStyled.1.png | Bin codecov.yml | 4 +- 216 files changed, 132 insertions(+), 57 deletions(-) rename {Source => Sources/Down}/AST/Nodes/BaseNode.swift (100%) rename {Source => Sources/Down}/AST/Nodes/BlockQuote.swift (100%) rename {Source => Sources/Down}/AST/Nodes/ChildSequence.swift (100%) rename {Source => Sources/Down}/AST/Nodes/Code.swift (100%) rename {Source => Sources/Down}/AST/Nodes/CodeBlock.swift (100%) rename {Source => Sources/Down}/AST/Nodes/CustomBlock.swift (100%) rename {Source => Sources/Down}/AST/Nodes/CustomInline.swift (100%) rename {Source => Sources/Down}/AST/Nodes/Document.swift (100%) rename {Source => Sources/Down}/AST/Nodes/Emphasis.swift (100%) rename {Source => Sources/Down}/AST/Nodes/Heading.swift (100%) rename {Source => Sources/Down}/AST/Nodes/HtmlBlock.swift (100%) rename {Source => Sources/Down}/AST/Nodes/HtmlInline.swift (100%) rename {Source => Sources/Down}/AST/Nodes/Image.swift (100%) rename {Source => Sources/Down}/AST/Nodes/Item.swift (100%) rename {Source => Sources/Down}/AST/Nodes/LineBreak.swift (100%) rename {Source => Sources/Down}/AST/Nodes/Link.swift (100%) rename {Source => Sources/Down}/AST/Nodes/List.swift (100%) rename {Source => Sources/Down}/AST/Nodes/Node.swift (100%) rename {Source => Sources/Down}/AST/Nodes/Paragraph.swift (100%) rename {Source => Sources/Down}/AST/Nodes/SoftBreak.swift (100%) rename {Source => Sources/Down}/AST/Nodes/Strong.swift (100%) rename {Source => Sources/Down}/AST/Nodes/Text.swift (100%) rename {Source => Sources/Down}/AST/Nodes/ThematicBreak.swift (100%) rename {Source => Sources/Down}/AST/Styling/Attribute Collections/ColorCollection.swift (100%) rename {Source => Sources/Down}/AST/Styling/Attribute Collections/FontCollection.swift (100%) rename {Source => Sources/Down}/AST/Styling/Attribute Collections/ParagraphStyleCollection.swift (100%) rename {Source => Sources/Down}/AST/Styling/Custom Attributes/BlockBackgroundColorAttribute.swift (100%) rename {Source => Sources/Down}/AST/Styling/Custom Attributes/QuoteStripeAttribute.swift (100%) rename {Source => Sources/Down}/AST/Styling/Custom Attributes/ThematicBreakAttribute.swift (100%) rename {Source => Sources/Down}/AST/Styling/Helpers/Extensions/CGPoint+Translate.swift (100%) rename {Source => Sources/Down}/AST/Styling/Helpers/Extensions/CGRect+Helpers.swift (100%) rename {Source => Sources/Down}/AST/Styling/Helpers/Extensions/NSAttributedString+Helpers.swift (100%) rename {Source => Sources/Down}/AST/Styling/Helpers/Extensions/NSMutableAttributedString+Attributes.swift (100%) rename {Source => Sources/Down}/AST/Styling/Helpers/Extensions/UIFont+Traits.swift (100%) rename {Source => Sources/Down}/AST/Styling/Helpers/ListItemParagraphStyler.swift (100%) rename {Source => Sources/Down}/AST/Styling/Layout Managers/DownDebugLayoutManager.swift (100%) rename {Source => Sources/Down}/AST/Styling/Layout Managers/DownLayoutManager.swift (100%) rename {Source => Sources/Down}/AST/Styling/Options/CodeBlockOptions.swift (100%) rename {Source => Sources/Down}/AST/Styling/Options/ListItemOptions.swift (100%) rename {Source => Sources/Down}/AST/Styling/Options/QuoteStripeOptions.swift (100%) rename {Source => Sources/Down}/AST/Styling/Options/ThematicBreakOptions.swift (100%) rename {Source => Sources/Down}/AST/Styling/Stylers/DownStyler.swift (100%) rename {Source => Sources/Down}/AST/Styling/Stylers/DownStylerConfiguration.swift (100%) rename {Source => Sources/Down}/AST/Styling/Stylers/Styler.swift (100%) rename {Source => Sources/Down}/AST/Styling/Text Views/DownDebugTextView.swift (100%) rename {Source => Sources/Down}/AST/Styling/Text Views/DownTextView.swift (100%) rename {Source => Sources/Down}/AST/Visitors/AttributedStringVisitor.swift (100%) rename {Source => Sources/Down}/AST/Visitors/DebugVisitor.swift (100%) rename {Source => Sources/Down}/AST/Visitors/ListItemPrefixGenerator.swift (100%) rename {Source => Sources/Down}/AST/Visitors/Visitor.swift (100%) rename {Source => Sources/Down}/Down.h (100%) rename {Source => Sources/Down}/Down.swift (100%) rename {Source => Sources/Down}/Enums & Options/DownErrors.swift (100%) rename {Source => Sources/Down}/Enums & Options/DownOptions.swift (100%) rename {Source => Sources/Down}/Extensions/NSAttributedString+HTML.swift (100%) rename {Source => Sources/Down}/Extensions/String+ToHTML.swift (100%) rename {Source => Sources/Down}/Renderers/DownASTRenderable.swift (100%) rename {Source => Sources/Down}/Renderers/DownAttributedStringRenderable.swift (100%) rename {Source => Sources/Down}/Renderers/DownCommonMarkRenderable.swift (100%) rename {Source => Sources/Down}/Renderers/DownGroffRenderable.swift (100%) rename {Source => Sources/Down}/Renderers/DownHTMLRenderable.swift (100%) rename {Source => Sources/Down}/Renderers/DownLaTeXRenderable.swift (100%) rename {Source => Sources/Down}/Renderers/DownRenderable.swift (100%) rename {Source => Sources/Down}/Renderers/DownXMLRenderable.swift (100%) rename {Resources => Sources/Down/Resources}/DownView (macOS).bundle/css/down.min.css (100%) rename {Resources => Sources/Down/Resources}/DownView (macOS).bundle/index.html (100%) rename {Resources => Sources/Down/Resources}/DownView (macOS).bundle/js/down.js (100%) rename {Resources => Sources/Down/Resources}/DownView (macOS).bundle/js/highlight.min.js (100%) rename {Resources => Sources/Down/Resources}/DownView.bundle/css/down.min.css (100%) rename {Resources => Sources/Down/Resources}/DownView.bundle/index.html (100%) rename {Resources => Sources/Down/Resources}/DownView.bundle/js/down.js (100%) rename {Resources => Sources/Down/Resources}/DownView.bundle/js/highlight.min.js (100%) create mode 100644 Sources/Down/Views/BundleHelper.swift rename {Source => Sources/Down}/Views/DownView.swift (97%) rename {Source => Sources}/cmark/COPYING (100%) rename {Source => Sources}/cmark/blocks.c (100%) rename {Source => Sources}/cmark/buffer.c (100%) rename {Source => Sources}/cmark/buffer.h (100%) rename {Source => Sources}/cmark/case_fold_switch.inc (100%) rename {Source => Sources}/cmark/chunk.h (100%) rename {Source => Sources}/cmark/cmark.c (100%) rename {Source => Sources}/cmark/cmark.h (100%) rename {Source => Sources}/cmark/cmark_ctype.c (100%) rename {Source => Sources}/cmark/cmark_ctype.h (100%) rename {Source => Sources}/cmark/cmark_export.h (100%) rename {Source => Sources}/cmark/cmark_version.h (100%) rename {Source => Sources}/cmark/commonmark.c (100%) rename {Source => Sources}/cmark/config.h (100%) rename {Source => Sources}/cmark/entities.inc (100%) rename {Source => Sources}/cmark/houdini.h (100%) rename {Source => Sources}/cmark/houdini_href_e.c (100%) rename {Source => Sources}/cmark/houdini_html_e.c (100%) rename {Source => Sources}/cmark/houdini_html_u.c (100%) rename {Source => Sources}/cmark/html.c (100%) rename {Source => Sources}/cmark/include/module.modulemap (100%) rename {Source => Sources}/cmark/inlines.c (100%) rename {Source => Sources}/cmark/inlines.h (100%) rename {Source => Sources}/cmark/iterator.c (100%) rename {Source => Sources}/cmark/iterator.h (100%) rename {Source => Sources}/cmark/latex.c (100%) rename {Source => Sources}/cmark/man.c (100%) rename {Source => Sources}/cmark/node.c (100%) rename {Source => Sources}/cmark/node.h (100%) rename {Source => Sources}/cmark/parser.h (100%) rename {Source => Sources}/cmark/references.c (100%) rename {Source => Sources}/cmark/references.h (100%) rename {Source => Sources}/cmark/render.c (100%) rename {Source => Sources}/cmark/render.h (100%) rename {Source => Sources}/cmark/scanners.c (100%) rename {Source => Sources}/cmark/scanners.h (100%) rename {Source => Sources}/cmark/utf8.c (100%) rename {Source => Sources}/cmark/utf8.h (100%) rename {Source => Sources}/cmark/xml.c (100%) rename {Resources => Supporting Files}/Configurations/Deployment-Targets.xcconfig (100%) rename {Resources => Supporting Files}/Configurations/Universal-Framework-Target.xcconfig (100%) rename {Resources => Supporting Files}/Configurations/Universal-Target-Base.xcconfig (100%) rename {Resources => Supporting Files}/Down-Info.plist (100%) rename {Resources => Supporting Files}/DownTests-Info.plist (100%) rename Tests/{ => DownTests}/AST/ListItemPrefixGeneratorTests.swift (100%) rename Tests/{ => DownTests}/AST/NodeTests.swift (100%) rename Tests/{ => DownTests}/AST/VisitorTests.swift (100%) rename Tests/{ => DownTests}/AST/__Snapshots__/VisitorTests/testAttributedStringVisitor.1.txt (100%) rename Tests/{ => DownTests}/AST/__Snapshots__/VisitorTests/testBlockQuote.1.txt (100%) rename Tests/{ => DownTests}/AST/__Snapshots__/VisitorTests/testBlockQuote.2.txt (100%) rename Tests/{ => DownTests}/AST/__Snapshots__/VisitorTests/testCodeBlock.1.txt (100%) rename Tests/{ => DownTests}/AST/__Snapshots__/VisitorTests/testCodeBlock.2.txt (100%) rename Tests/{ => DownTests}/AST/__Snapshots__/VisitorTests/testHeading.1.txt (100%) rename Tests/{ => DownTests}/AST/__Snapshots__/VisitorTests/testHeading.2.txt (100%) rename Tests/{ => DownTests}/AST/__Snapshots__/VisitorTests/testHtmlBlock.1.txt (100%) rename Tests/{ => DownTests}/AST/__Snapshots__/VisitorTests/testHtmlBlock.2.txt (100%) rename Tests/{ => DownTests}/AST/__Snapshots__/VisitorTests/testInline.1.txt (100%) rename Tests/{ => DownTests}/AST/__Snapshots__/VisitorTests/testInline.2.txt (100%) rename Tests/{ => DownTests}/AST/__Snapshots__/VisitorTests/testLineBreak.1.txt (100%) rename Tests/{ => DownTests}/AST/__Snapshots__/VisitorTests/testLineBreak.2.txt (100%) rename Tests/{ => DownTests}/AST/__Snapshots__/VisitorTests/testLink.1.txt (100%) rename Tests/{ => DownTests}/AST/__Snapshots__/VisitorTests/testLink.2.txt (100%) rename Tests/{ => DownTests}/AST/__Snapshots__/VisitorTests/testList.1.txt (100%) rename Tests/{ => DownTests}/AST/__Snapshots__/VisitorTests/testList.2.txt (100%) rename Tests/{ => DownTests}/AST/__Snapshots__/VisitorTests/testParagraph.1.txt (100%) rename Tests/{ => DownTests}/AST/__Snapshots__/VisitorTests/testParagraph.2.txt (100%) rename Tests/{ => DownTests}/AST/__Snapshots__/VisitorTests/testSimpleMarkdown.1.txt (100%) rename Tests/{ => DownTests}/AST/__Snapshots__/VisitorTests/testSoftBreak.1.txt (100%) rename Tests/{ => DownTests}/AST/__Snapshots__/VisitorTests/testSoftBreak.2.txt (100%) rename Tests/{ => DownTests}/AST/__Snapshots__/VisitorTests/testThematicBreak.1.txt (100%) rename Tests/{ => DownTests}/AST/__Snapshots__/VisitorTests/testThematicBreak.2.txt (100%) rename Tests/{ => DownTests}/BindingTests.swift (100%) rename Tests/{ => DownTests}/DownViewTests.swift (100%) rename Tests/{ => DownTests}/Fixtures/TestDownView.bundle/css/down.min.css (100%) rename Tests/{ => DownTests}/Fixtures/TestDownView.bundle/index.html (100%) rename Tests/{ => DownTests}/Fixtures/TestDownView.bundle/js/down.js (100%) rename Tests/{ => DownTests}/Fixtures/TestDownView.bundle/js/highlight.min.js (100%) rename Tests/{ => DownTests}/NSAttributedStringTests.swift (100%) rename Tests/{ => DownTests}/StringTests.swift (100%) rename Tests/{ => DownTests}/Styler/BlockQuoteStyleTests.swift (100%) rename Tests/{ => DownTests}/Styler/CodeBlockStyleTests.swift (100%) rename Tests/{ => DownTests}/Styler/DownDebugLayoutManagerTests.swift (100%) rename Tests/{ => DownTests}/Styler/HeadingStyleTests.swift (100%) rename Tests/{ => DownTests}/Styler/Helpers/CGPoint_TranslateTests.swift (100%) rename Tests/{ => DownTests}/Styler/Helpers/CGRect_HelpersTests.swift (100%) rename Tests/{ => DownTests}/Styler/Helpers/NSAttributedString+HelpersTests.swift (100%) rename Tests/{ => DownTests}/Styler/Helpers/NSMutableAttributedString+AttributesTests.swift (100%) rename Tests/{ => DownTests}/Styler/InlineStyleTests.swift (100%) rename Tests/{ => DownTests}/Styler/LinkStyleTests.swift (100%) rename Tests/{ => DownTests}/Styler/ListItemStyleTests.swift (100%) rename Tests/{ => DownTests}/Styler/StylerTestSuite.swift (100%) rename Tests/{ => DownTests}/Styler/ThematicBreakSyleTests.swift (100%) rename Tests/{ => DownTests}/Styler/__Snapshots__/BlockQuoteStyleTests/testThat_NestedQuotes_Have_TheirOwnStripes.1.png (100%) rename Tests/{ => DownTests}/Styler/__Snapshots__/BlockQuoteStyleTests/testThat_QuoteAlignment_Obeys_TextContainerOffset.1.png (100%) rename Tests/{ => DownTests}/Styler/__Snapshots__/BlockQuoteStyleTests/testThat_QuoteContent_Aligns.1.png (100%) rename Tests/{ => DownTests}/Styler/__Snapshots__/BlockQuoteStyleTests/testThat_QuoteContent_Preserves_BlockElements.1.png (100%) rename Tests/{ => DownTests}/Styler/__Snapshots__/BlockQuoteStyleTests/testThat_QuoteContent_Preserves_InlineElements.1.png (100%) rename Tests/{ => DownTests}/Styler/__Snapshots__/BlockQuoteStyleTests/testThat_QuoteContent_Preserves_ListFormatting.1.png (100%) rename Tests/{ => DownTests}/Styler/__Snapshots__/BlockQuoteStyleTests/testThat_QuoteContent_Preserves_ThematicBreak.1.png (100%) rename Tests/{ => DownTests}/Styler/__Snapshots__/BlockQuoteStyleTests/testThat_QuoteStripe_AlignsTo_Margin.1.png (100%) rename Tests/{ => DownTests}/Styler/__Snapshots__/BlockQuoteStyleTests/testThat_QuotedList_WithinA_ListItem_AlignsCorrectly.1.png (100%) rename Tests/{ => DownTests}/Styler/__Snapshots__/BlockQuoteStyleTests/testThat_Quotes_WithinA_ListItem_AlignsTo_ListItemContent.1.png (100%) rename Tests/{ => DownTests}/Styler/__Snapshots__/CodeBlockStyleTests/testThat_CodeBlock_IsStyled.1.png (100%) rename Tests/{ => DownTests}/Styler/__Snapshots__/CodeBlockStyleTests/testThat_HtmlBlock_IsStyled.1.png (100%) rename Tests/{ => DownTests}/Styler/__Snapshots__/DownDebugLayoutManagerTests/testThat_LineFragments_AreDrawn.1.png (100%) rename Tests/{ => DownTests}/Styler/__Snapshots__/HeadingStyleTests/testThat_HeadingStyle_Preserves_StrongEmphasisAndMonospaceTraits.1.png (100%) rename Tests/{ => DownTests}/Styler/__Snapshots__/HeadingStyleTests/testThat_Heading_LevelOne_IsStyled.1.png (100%) rename Tests/{ => DownTests}/Styler/__Snapshots__/HeadingStyleTests/testThat_Heading_LevelThree_IsStyled.1.png (100%) rename Tests/{ => DownTests}/Styler/__Snapshots__/HeadingStyleTests/testThat_Heading_LevelTwo_IsStyled.1.png (100%) rename Tests/{ => DownTests}/Styler/__Snapshots__/HeadingStyleTests/testThat_Heading_LevelsThreeToSix_AreStyledEqually.1.png (100%) rename Tests/{ => DownTests}/Styler/__Snapshots__/InlineStyleTests/testThat_CodeText_IsStyled.1.png (100%) rename Tests/{ => DownTests}/Styler/__Snapshots__/InlineStyleTests/testThat_EmphasizedCode_IsStyled.1.png (100%) rename Tests/{ => DownTests}/Styler/__Snapshots__/InlineStyleTests/testThat_EmphasizedStrongCode_IsStyled.1.png (100%) rename Tests/{ => DownTests}/Styler/__Snapshots__/InlineStyleTests/testThat_EmphasizedStrongText_IsStyled.1.png (100%) rename Tests/{ => DownTests}/Styler/__Snapshots__/InlineStyleTests/testThat_EmphasizedText_IsStyled.1.png (100%) rename Tests/{ => DownTests}/Styler/__Snapshots__/InlineStyleTests/testThat_StrongCode_IsStyled.1.png (100%) rename Tests/{ => DownTests}/Styler/__Snapshots__/InlineStyleTests/testThat_StrongEmphasizedCode_IsStyled.1.png (100%) rename Tests/{ => DownTests}/Styler/__Snapshots__/InlineStyleTests/testThat_StrongEmphasizedText_IsStyled.1.png (100%) rename Tests/{ => DownTests}/Styler/__Snapshots__/InlineStyleTests/testThat_StrongText_IsStyled.1.png (100%) rename Tests/{ => DownTests}/Styler/__Snapshots__/LinkStyleTests/testThat_Link_IsStyled.1.png (100%) rename Tests/{ => DownTests}/Styler/__Snapshots__/LinkStyleTests/testThat_Link_Preserves_InlineStyles.1.png (100%) rename Tests/{ => DownTests}/Styler/__Snapshots__/ListItemStyleTests/testThat_DigitAndBulletPrefixes_Align.1.png (100%) rename Tests/{ => DownTests}/Styler/__Snapshots__/ListItemStyleTests/testThat_DigitPrefixes_ExceedingMaxPrefixLength_DontPush_WrappedLines.1.png (100%) rename Tests/{ => DownTests}/Styler/__Snapshots__/ListItemStyleTests/testThat_DigitPrefixes_ExceedingMaxPrefixLength_Push_FirstLine.1.png (100%) rename Tests/{ => DownTests}/Styler/__Snapshots__/ListItemStyleTests/testThat_DigitPrefixes_UpToMaxPrefixLength_Align.1.png (100%) rename Tests/{ => DownTests}/Styler/__Snapshots__/ListItemStyleTests/testThat_FirstParagraph_WithLineBreaks_AlignTo_FirstLine.1.png (100%) rename Tests/{ => DownTests}/Styler/__Snapshots__/ListItemStyleTests/testThat_FirstParagraph_WrappedLines_AlignTo_FirstLine.1.png (100%) rename Tests/{ => DownTests}/Styler/__Snapshots__/ListItemStyleTests/testThat_ListItems_Preseve_InlineElements.1.png (100%) rename Tests/{ => DownTests}/Styler/__Snapshots__/ListItemStyleTests/testThat_NestedList_AlignsTo_OuterList.1.png (100%) rename Tests/{ => DownTests}/Styler/__Snapshots__/ListItemStyleTests/testThat_NestedList_InMiddleParagraph_AlignsTo_OuterList.1.png (100%) rename Tests/{ => DownTests}/Styler/__Snapshots__/ListItemStyleTests/testThat_NestedList_InTrailingParagraph_AlignsTo_OuterList.1.png (100%) rename Tests/{ => DownTests}/Styler/__Snapshots__/ListItemStyleTests/testThat_NestedList_With_MultipleParagraphs_Align.1.png (100%) rename Tests/{ => DownTests}/Styler/__Snapshots__/ListItemStyleTests/testThat_NestedLists_AlignTo_ParentLists.1.png (100%) rename Tests/{ => DownTests}/Styler/__Snapshots__/ListItemStyleTests/testThat_TrailingParagraphs_FirstLines_AlignTo_FirstParagraph.1.png (100%) rename Tests/{ => DownTests}/Styler/__Snapshots__/ListItemStyleTests/testThat_TrailingParagraphs_WrappedLines_AlignTo_FirstLines.1.png (100%) rename Tests/{ => DownTests}/Styler/__Snapshots__/ThematicBreakSyleTests/testThat_ThematicBreak_CanBe_Indented.1.png (100%) rename Tests/{ => DownTests}/Styler/__Snapshots__/ThematicBreakSyleTests/testThat_ThematicBreak_InOffsetTextContainer_IsStyled.1.png (100%) rename Tests/{ => DownTests}/Styler/__Snapshots__/ThematicBreakSyleTests/testThat_ThematicBreak_IsStyled.1.png (100%) diff --git a/Down.podspec b/Down.podspec index dfd6ca23..33c77b6e 100644 --- a/Down.podspec +++ b/Down.podspec @@ -2,22 +2,22 @@ Pod::Spec.new do |spec| spec.name = "Down" spec.summary = "Blazing fast Markdown rendering in Swift, built upon cmark." spec.version = "0.9.5" - spec.homepage = "https://github.com/iwasrobbed/Down" + spec.homepage = "https://github.com/johnxnguyen/Down" spec.license = { :type => "MIT", :file => "LICENSE" } - spec.authors = { "Rob Phillips" => "rob@robphillips.me" } - spec.source = { :git => "https://github.com/iwasrobbed/Down.git", :tag => "v" + spec.version.to_s } - spec.source_files = "Source/{AST,cmark,Enums & Options,Extensions,Renderers}/**/*.{h,c,swift}", "Source/*" - spec.ios.source_files = "Source/Views/**" - spec.osx.source_files = "Source/Views/**" - spec.public_header_files = "Source/*.h" + spec.authors = { "John Nguyen" => "polyxo@protonmail.com" } + spec.source = { :git => "https://github.com/johnxnguyen/Down.git", :tag => "v" + spec.version.to_s } + spec.source_files = "Sources/Down/{AST,Enums & Options,Extensions,Renderers}/**/*.swift", "Sources/cmark/*.{h,c}", "Sources/Down/*" + spec.ios.source_files = "Sources/Down/Views/**" + spec.osx.source_files = "Sources/Down/Views/**" + spec.public_header_files = "Sources/Down/*.h" spec.ios.deployment_target = "9.0" spec.tvos.deployment_target = "9.0" spec.osx.deployment_target = "10.11" spec.requires_arc = true spec.module_name = "Down" - spec.preserve_paths = "Source/cmark/include/module.modulemap", "Source/cmark/*.inc", "Source/cmark/COPYING" - spec.pod_target_xcconfig = { 'SWIFT_INCLUDE_PATHS' => '$(SRCROOT)/Down/Source/cmark/**' } - spec.ios.resource = 'Resources/DownView.bundle' - spec.osx.resource = 'Resources/DownView.bundle' + spec.preserve_paths = "Sources/cmark/include/module.modulemap", "Sources/cmark/*.inc", "Sources/cmark/COPYING" + spec.pod_target_xcconfig = { 'SWIFT_INCLUDE_PATHS' => '$(SRCROOT)/Down/Sources/cmark/**' } + spec.ios.resource = 'Sources/Down/Resources/DownView.bundle' + spec.osx.resource = 'Sources/Down/Resources/DownView.bundle' spec.swift_versions = ['5.0', '5.1'] end diff --git a/Down.xcodeproj/project.pbxproj b/Down.xcodeproj/project.pbxproj index 5d3a3c56..4dd8f078 100644 --- a/Down.xcodeproj/project.pbxproj +++ b/Down.xcodeproj/project.pbxproj @@ -77,7 +77,6 @@ EE48C7DB22EC946F004815ED /* ColorCollection.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE48C7DA22EC946F004815ED /* ColorCollection.swift */; }; EE4F77C322FF3F170026A983 /* DownStylerConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE4F77C222FF3F170026A983 /* DownStylerConfiguration.swift */; }; EE5F2BA42262564A00B7C0F3 /* Styler.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE5F2BA32262564A00B7C0F3 /* Styler.swift */; }; - EE641A9125E29D4B0025879A /* SnapshotTesting in Frameworks */ = {isa = PBXBuildFile; productRef = EE641A9025E29D4B0025879A /* SnapshotTesting */; }; EE8F38CC22BFB2420056270E /* NodeTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE8F38CB22BFB2420056270E /* NodeTests.swift */; }; EE8F38CE22BFEDE50056270E /* ListItemPrefixGenerator.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE8F38CD22BFEDE50056270E /* ListItemPrefixGenerator.swift */; }; EE97253E22C130D8004D3B3A /* NSMutableAttributedString+AttributesTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE97253D22C130D8004D3B3A /* NSMutableAttributedString+AttributesTests.swift */; }; @@ -98,6 +97,9 @@ EEBA154D234484BF00B54ECB /* ListItemStyleTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE335C4922EDC85900648842 /* ListItemStyleTests.swift */; }; EEBA154E234484BF00B54ECB /* StylerTestSuite.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE59C30122ECF0BD006EE8A8 /* StylerTestSuite.swift */; }; EEBA154F234484C300B54ECB /* VisitorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE64FEEF225BEB3900A35B34 /* VisitorTests.swift */; }; + EEBE62F025E28F3D005CCAD6 /* BundleHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEBE62EF25E28F3D005CCAD6 /* BundleHelper.swift */; }; + EED7FED725E303000033E33A /* SnapshotTesting in Frameworks */ = {isa = PBXBuildFile; productRef = EED7FED625E303000033E33A /* SnapshotTesting */; }; + EED7FED825E3133C0033E33A /* DownView (macOS).bundle in Resources */ = {isa = PBXBuildFile; fileRef = 14C5E33621877FCD00D5380C /* DownView (macOS).bundle */; }; EED8DA8E22BE404F00E54492 /* DownStyler.swift in Sources */ = {isa = PBXBuildFile; fileRef = EED8DA8D22BE404F00E54492 /* DownStyler.swift */; }; EED8DA9022BECBAE00E54492 /* NSAttributedString+Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = EED8DA8F22BECBAE00E54492 /* NSAttributedString+Helpers.swift */; }; EED8DA9222BECBF200E54492 /* NSMutableAttributedString+Attributes.swift in Sources */ = {isa = PBXBuildFile; fileRef = EED8DA9122BECBF200E54492 /* NSMutableAttributedString+Attributes.swift */; }; @@ -299,6 +301,7 @@ EEBA153A2344845500B54ECB /* DownSnapshotTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = DownSnapshotTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; EEBA153C2344845500B54ECB /* DownSnapshotTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DownSnapshotTests.swift; sourceTree = ""; }; EEBA153E2344845500B54ECB /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + EEBE62EF25E28F3D005CCAD6 /* BundleHelper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BundleHelper.swift; sourceTree = ""; }; EED8DA8D22BE404F00E54492 /* DownStyler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DownStyler.swift; sourceTree = ""; }; EED8DA8F22BECBAE00E54492 /* NSAttributedString+Helpers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSAttributedString+Helpers.swift"; sourceTree = ""; }; EED8DA9122BECBF200E54492 /* NSMutableAttributedString+Attributes.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSMutableAttributedString+Attributes.swift"; sourceTree = ""; }; @@ -349,7 +352,7 @@ buildActionMask = 2147483647; files = ( EEBA15422344849600B54ECB /* Down.framework in Frameworks */, - EE641A9125E29D4B0025879A /* SnapshotTesting in Frameworks */, + EED7FED725E303000033E33A /* SnapshotTesting in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -382,23 +385,21 @@ path = Configurations; sourceTree = ""; }; - D41689B41CFFE6BB00E5802B /* Resources */ = { + D41689B41CFFE6BB00E5802B /* Supporting Files */ = { isa = PBXGroup; children = ( 90A40A971EC0309A004F2E91 /* Configurations */, 90A40A951EC02FF6004F2E91 /* Down-Info.plist */, 90A40A961EC02FF6004F2E91 /* DownTests-Info.plist */, - D41689B51CFFE6BB00E5802B /* DownView.bundle */, - 14C5E33621877FCD00D5380C /* DownView (macOS).bundle */, ); - path = Resources; + path = "Supporting Files"; sourceTree = ""; }; D4201E761CFA5151008EEC6E = { isa = PBXGroup; children = ( - D4201E9B1CFA59A5008EEC6E /* Source */, - D41689B41CFFE6BB00E5802B /* Resources */, + D4201E9B1CFA59A5008EEC6E /* Sources */, + D41689B41CFFE6BB00E5802B /* Supporting Files */, D4201EC41CFA59A5008EEC6E /* Tests */, EEBA153B2344845500B54ECB /* DownSnapshotTests */, D4201E811CFA5151008EEC6E /* Products */, @@ -418,31 +419,19 @@ name = Products; sourceTree = ""; }; - D4201E9B1CFA59A5008EEC6E /* Source */ = { + D4201E9B1CFA59A5008EEC6E /* Sources */ = { isa = PBXGroup; children = ( - D4CF88961CFF94B300F07FD1 /* Down.h */, - D4201EF01CFA59F2008EEC6E /* Down.swift */, - EEF1376D2259E4BA00D7DDE0 /* AST */, - D44875E71CFA6CF30037A624 /* Enums & Options */, - D43AE5C81CFFAE39006E1522 /* Extensions */, - D44875E21CFA6B120037A624 /* Renderers */, - D43AE5CB1CFFD068006E1522 /* Views */, + EED7D92025C6DA4300E52D18 /* Down */, D4201EF61CFA5D63008EEC6E /* cmark */, ); - path = Source; + path = Sources; sourceTree = ""; }; D4201EC41CFA59A5008EEC6E /* Tests */ = { isa = PBXGroup; children = ( - EE59C30022ECF08E006EE8A8 /* Styler */, - 907C64611EC120530095FEE1 /* Fixtures */, - D4201EC51CFA59A5008EEC6E /* BindingTests.swift */, - D41689B21CFFE28200E5802B /* DownViewTests.swift */, - D4F948DB1D00A4A800C9C0F6 /* NSAttributedStringTests.swift */, - D438696B1D00D27700E95A1F /* StringTests.swift */, - EEC752BE22C4AE1300EC729C /* AST */, + EED7D92725C6DB9100E52D18 /* DownTests */, ); path = Tests; sourceTree = ""; @@ -503,6 +492,7 @@ isa = PBXGroup; children = ( D43AE5D91CFFD0D0006E1522 /* DownView.swift */, + EEBE62EF25E28F3D005CCAD6 /* BundleHelper.swift */, ); path = Views; sourceTree = ""; @@ -661,6 +651,44 @@ path = AST; sourceTree = ""; }; + EED7D92025C6DA4300E52D18 /* Down */ = { + isa = PBXGroup; + children = ( + EED7D94425C6DF2D00E52D18 /* Resources */, + D4CF88961CFF94B300F07FD1 /* Down.h */, + D4201EF01CFA59F2008EEC6E /* Down.swift */, + EEF1376D2259E4BA00D7DDE0 /* AST */, + D44875E71CFA6CF30037A624 /* Enums & Options */, + D43AE5C81CFFAE39006E1522 /* Extensions */, + D44875E21CFA6B120037A624 /* Renderers */, + D43AE5CB1CFFD068006E1522 /* Views */, + ); + path = Down; + sourceTree = ""; + }; + EED7D92725C6DB9100E52D18 /* DownTests */ = { + isa = PBXGroup; + children = ( + EE59C30022ECF08E006EE8A8 /* Styler */, + 907C64611EC120530095FEE1 /* Fixtures */, + D4201EC51CFA59A5008EEC6E /* BindingTests.swift */, + D41689B21CFFE28200E5802B /* DownViewTests.swift */, + D4F948DB1D00A4A800C9C0F6 /* NSAttributedStringTests.swift */, + D438696B1D00D27700E95A1F /* StringTests.swift */, + EEC752BE22C4AE1300EC729C /* AST */, + ); + path = DownTests; + sourceTree = ""; + }; + EED7D94425C6DF2D00E52D18 /* Resources */ = { + isa = PBXGroup; + children = ( + D41689B51CFFE6BB00E5802B /* DownView.bundle */, + 14C5E33621877FCD00D5380C /* DownView (macOS).bundle */, + ); + path = Resources; + sourceTree = ""; + }; EED8DA9522BECCF000E54492 /* Helpers */ = { isa = PBXGroup; children = ( @@ -814,7 +842,7 @@ ); name = DownSnapshotTests; packageProductDependencies = ( - EE641A9025E29D4B0025879A /* SnapshotTesting */, + EED7FED625E303000033E33A /* SnapshotTesting */, ); productName = DownSnapshotTests; productReference = EEBA153A2344845500B54ECB /* DownSnapshotTests.xctest */; @@ -856,7 +884,7 @@ ); mainGroup = D4201E761CFA5151008EEC6E; packageReferences = ( - EE641A8F25E29D4B0025879A /* XCRemoteSwiftPackageReference "swift-snapshot-testing" */, + EED7FED525E303000033E33A /* XCRemoteSwiftPackageReference "swift-snapshot-testing" */, ); productRefGroup = D4201E811CFA5151008EEC6E /* Products */; projectDirPath = ""; @@ -874,6 +902,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + EED7FED825E3133C0033E33A /* DownView (macOS).bundle in Resources */, 14C5E33521877CE900D5380C /* DownView.bundle in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -912,7 +941,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "# Type a script or drag a script file from your workspace to insert its path.\nRESOURCE_PATH=$SRCROOT/Resources\n\nFILENAME_IN_BUNDLE=DownView.bundle\n\nBUILD_APP_DIR=${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.framework/Resources\n\necho \"$RESOURCE_PATH\"\necho \"$BUILD_APP_DIR\"\n\nif [ \"$PLATFORM_NAME\" == \"macosx\" ]; then\n echo $BUILD_APP_DIR\n rm -r \"$BUILD_APP_DIR/$FILENAME_IN_BUNDLE/\"\n cp -R \"$RESOURCE_PATH/DownView (macOS).bundle\" \"$BUILD_APP_DIR/$FILENAME_IN_BUNDLE/\"\nfi\n"; + shellScript = "# Type a script or drag a script file from your workspace to insert its path.\nRESOURCE_PATH=$SRCROOT/Sources/Down/Resources\n\nFILENAME_IN_BUNDLE=DownView.bundle\n\nBUILD_APP_DIR=${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.framework/Resources\n\necho \"$RESOURCE_PATH\"\necho \"$BUILD_APP_DIR\"\n\nif [ \"$PLATFORM_NAME\" == \"macosx\" ]; then\n echo $BUILD_APP_DIR\n rm -r \"$BUILD_APP_DIR/$FILENAME_IN_BUNDLE/\"\n cp -R \"$RESOURCE_PATH/DownView (macOS).bundle\" \"$BUILD_APP_DIR/$FILENAME_IN_BUNDLE/\"\nfi\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ @@ -941,6 +970,7 @@ EEF8580F22FA101C0025370B /* DownDebugLayoutManager.swift in Sources */, 8A569F6F1E6B3EDE008BE2AC /* DownAttributedStringRenderable.swift in Sources */, EEEBEE55225D2A4E00AE438D /* Paragraph.swift in Sources */, + EEBE62F025E28F3D005CCAD6 /* BundleHelper.swift in Sources */, 8A569F721E6B3EDE008BE2AC /* DownHTMLRenderable.swift in Sources */, EED8DA9422BECC2100E54492 /* UIFont+Traits.swift in Sources */, EE44848B2301E51C0065C836 /* CodeBlockOptions.swift in Sources */, @@ -1066,11 +1096,11 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = "Resources/Down-Info.plist"; + INFOPLIST_FILE = "Supporting Files/Down-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; PROVISIONING_PROFILE_SPECIFIER = ""; SKIP_INSTALL = YES; - SWIFT_INCLUDE_PATHS = "${SRCROOT}/Source/cmark"; + SWIFT_INCLUDE_PATHS = "${SRCROOT}/Sources/cmark"; "VALID_ARCHS[sdk=iphonesimulator*]" = "i386 x86_64 arm64"; }; name = Debug; @@ -1088,11 +1118,11 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = "Resources/Down-Info.plist"; + INFOPLIST_FILE = "Supporting Files/Down-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; PROVISIONING_PROFILE_SPECIFIER = ""; SKIP_INSTALL = YES; - SWIFT_INCLUDE_PATHS = "${SRCROOT}/Source/cmark"; + SWIFT_INCLUDE_PATHS = "${SRCROOT}/Sources/cmark"; "VALID_ARCHS[sdk=iphonesimulator*]" = "i386 x86_64 arm64"; }; name = Release; @@ -1106,7 +1136,7 @@ "$(inherited)", "$(PROJECT_DIR)/Carthage/Build/iOS", ); - INFOPLIST_FILE = "Resources/DownTests-Info.plist"; + INFOPLIST_FILE = "Supporting Files/DownTests-Info.plist"; PRODUCT_BUNDLE_IDENTIFIER = com.downMarkdown.DownTests; "TARGETED_DEVICE_FAMILY[sdk=appletvos*]" = 3; "TARGETED_DEVICE_FAMILY[sdk=appletvsimulator*]" = 3; @@ -1122,7 +1152,7 @@ "$(inherited)", "$(PROJECT_DIR)/Carthage/Build/iOS", ); - INFOPLIST_FILE = "Resources/DownTests-Info.plist"; + INFOPLIST_FILE = "Supporting Files/DownTests-Info.plist"; PRODUCT_BUNDLE_IDENTIFIER = com.downMarkdown.DownTests; "TARGETED_DEVICE_FAMILY[sdk=appletvos*]" = 3; "TARGETED_DEVICE_FAMILY[sdk=appletvsimulator*]" = 3; @@ -1351,7 +1381,7 @@ /* End XCConfigurationList section */ /* Begin XCRemoteSwiftPackageReference section */ - EE641A8F25E29D4B0025879A /* XCRemoteSwiftPackageReference "swift-snapshot-testing" */ = { + EED7FED525E303000033E33A /* XCRemoteSwiftPackageReference "swift-snapshot-testing" */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/pointfreeco/swift-snapshot-testing.git"; requirement = { @@ -1362,9 +1392,9 @@ /* End XCRemoteSwiftPackageReference section */ /* Begin XCSwiftPackageProductDependency section */ - EE641A9025E29D4B0025879A /* SnapshotTesting */ = { + EED7FED625E303000033E33A /* SnapshotTesting */ = { isa = XCSwiftPackageProductDependency; - package = EE641A8F25E29D4B0025879A /* XCRemoteSwiftPackageReference "swift-snapshot-testing" */; + package = EED7FED525E303000033E33A /* XCRemoteSwiftPackageReference "swift-snapshot-testing" */; productName = SnapshotTesting; }; /* End XCSwiftPackageProductDependency section */ diff --git a/Package.swift b/Package.swift index 67b9a86e..ca037ee8 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.1 +// swift-tools-version:5.3 import PackageDescription @@ -19,24 +19,35 @@ let package = Package( .target( name: "libcmark", dependencies: [], - path: "Source/cmark", - exclude: ["include"], + path: "Sources/cmark", + exclude: [ + "include", + "case_fold_switch.inc", + "entities.inc", + "COPYING" + ], publicHeadersPath: "./" ), .target( name: "Down", dependencies: ["libcmark"], - path: "Source/", - exclude: ["cmark", "Down.h"] + path: "Sources/Down", + exclude: ["Down.h"], + resources: [ + .copy("Resources/DownView.bundle"), + .copy("Resources/DownView (macOS).bundle"), + ] ), .testTarget( name: "DownTests", dependencies: ["Down"], - path: "Tests/", + path: "Tests/DownTests", exclude: [ "AST/VisitorTests.swift", + "AST/__Snapshots__", "DownViewTests.swift", "Fixtures", + "Styler/__Snapshots__", "Styler/BlockQuoteStyleTests.swift", "Styler/CodeBlockStyleTests.swift", "Styler/DownDebugLayoutManagerTests.swift", diff --git a/Source/AST/Nodes/BaseNode.swift b/Sources/Down/AST/Nodes/BaseNode.swift similarity index 100% rename from Source/AST/Nodes/BaseNode.swift rename to Sources/Down/AST/Nodes/BaseNode.swift diff --git a/Source/AST/Nodes/BlockQuote.swift b/Sources/Down/AST/Nodes/BlockQuote.swift similarity index 100% rename from Source/AST/Nodes/BlockQuote.swift rename to Sources/Down/AST/Nodes/BlockQuote.swift diff --git a/Source/AST/Nodes/ChildSequence.swift b/Sources/Down/AST/Nodes/ChildSequence.swift similarity index 100% rename from Source/AST/Nodes/ChildSequence.swift rename to Sources/Down/AST/Nodes/ChildSequence.swift diff --git a/Source/AST/Nodes/Code.swift b/Sources/Down/AST/Nodes/Code.swift similarity index 100% rename from Source/AST/Nodes/Code.swift rename to Sources/Down/AST/Nodes/Code.swift diff --git a/Source/AST/Nodes/CodeBlock.swift b/Sources/Down/AST/Nodes/CodeBlock.swift similarity index 100% rename from Source/AST/Nodes/CodeBlock.swift rename to Sources/Down/AST/Nodes/CodeBlock.swift diff --git a/Source/AST/Nodes/CustomBlock.swift b/Sources/Down/AST/Nodes/CustomBlock.swift similarity index 100% rename from Source/AST/Nodes/CustomBlock.swift rename to Sources/Down/AST/Nodes/CustomBlock.swift diff --git a/Source/AST/Nodes/CustomInline.swift b/Sources/Down/AST/Nodes/CustomInline.swift similarity index 100% rename from Source/AST/Nodes/CustomInline.swift rename to Sources/Down/AST/Nodes/CustomInline.swift diff --git a/Source/AST/Nodes/Document.swift b/Sources/Down/AST/Nodes/Document.swift similarity index 100% rename from Source/AST/Nodes/Document.swift rename to Sources/Down/AST/Nodes/Document.swift diff --git a/Source/AST/Nodes/Emphasis.swift b/Sources/Down/AST/Nodes/Emphasis.swift similarity index 100% rename from Source/AST/Nodes/Emphasis.swift rename to Sources/Down/AST/Nodes/Emphasis.swift diff --git a/Source/AST/Nodes/Heading.swift b/Sources/Down/AST/Nodes/Heading.swift similarity index 100% rename from Source/AST/Nodes/Heading.swift rename to Sources/Down/AST/Nodes/Heading.swift diff --git a/Source/AST/Nodes/HtmlBlock.swift b/Sources/Down/AST/Nodes/HtmlBlock.swift similarity index 100% rename from Source/AST/Nodes/HtmlBlock.swift rename to Sources/Down/AST/Nodes/HtmlBlock.swift diff --git a/Source/AST/Nodes/HtmlInline.swift b/Sources/Down/AST/Nodes/HtmlInline.swift similarity index 100% rename from Source/AST/Nodes/HtmlInline.swift rename to Sources/Down/AST/Nodes/HtmlInline.swift diff --git a/Source/AST/Nodes/Image.swift b/Sources/Down/AST/Nodes/Image.swift similarity index 100% rename from Source/AST/Nodes/Image.swift rename to Sources/Down/AST/Nodes/Image.swift diff --git a/Source/AST/Nodes/Item.swift b/Sources/Down/AST/Nodes/Item.swift similarity index 100% rename from Source/AST/Nodes/Item.swift rename to Sources/Down/AST/Nodes/Item.swift diff --git a/Source/AST/Nodes/LineBreak.swift b/Sources/Down/AST/Nodes/LineBreak.swift similarity index 100% rename from Source/AST/Nodes/LineBreak.swift rename to Sources/Down/AST/Nodes/LineBreak.swift diff --git a/Source/AST/Nodes/Link.swift b/Sources/Down/AST/Nodes/Link.swift similarity index 100% rename from Source/AST/Nodes/Link.swift rename to Sources/Down/AST/Nodes/Link.swift diff --git a/Source/AST/Nodes/List.swift b/Sources/Down/AST/Nodes/List.swift similarity index 100% rename from Source/AST/Nodes/List.swift rename to Sources/Down/AST/Nodes/List.swift diff --git a/Source/AST/Nodes/Node.swift b/Sources/Down/AST/Nodes/Node.swift similarity index 100% rename from Source/AST/Nodes/Node.swift rename to Sources/Down/AST/Nodes/Node.swift diff --git a/Source/AST/Nodes/Paragraph.swift b/Sources/Down/AST/Nodes/Paragraph.swift similarity index 100% rename from Source/AST/Nodes/Paragraph.swift rename to Sources/Down/AST/Nodes/Paragraph.swift diff --git a/Source/AST/Nodes/SoftBreak.swift b/Sources/Down/AST/Nodes/SoftBreak.swift similarity index 100% rename from Source/AST/Nodes/SoftBreak.swift rename to Sources/Down/AST/Nodes/SoftBreak.swift diff --git a/Source/AST/Nodes/Strong.swift b/Sources/Down/AST/Nodes/Strong.swift similarity index 100% rename from Source/AST/Nodes/Strong.swift rename to Sources/Down/AST/Nodes/Strong.swift diff --git a/Source/AST/Nodes/Text.swift b/Sources/Down/AST/Nodes/Text.swift similarity index 100% rename from Source/AST/Nodes/Text.swift rename to Sources/Down/AST/Nodes/Text.swift diff --git a/Source/AST/Nodes/ThematicBreak.swift b/Sources/Down/AST/Nodes/ThematicBreak.swift similarity index 100% rename from Source/AST/Nodes/ThematicBreak.swift rename to Sources/Down/AST/Nodes/ThematicBreak.swift diff --git a/Source/AST/Styling/Attribute Collections/ColorCollection.swift b/Sources/Down/AST/Styling/Attribute Collections/ColorCollection.swift similarity index 100% rename from Source/AST/Styling/Attribute Collections/ColorCollection.swift rename to Sources/Down/AST/Styling/Attribute Collections/ColorCollection.swift diff --git a/Source/AST/Styling/Attribute Collections/FontCollection.swift b/Sources/Down/AST/Styling/Attribute Collections/FontCollection.swift similarity index 100% rename from Source/AST/Styling/Attribute Collections/FontCollection.swift rename to Sources/Down/AST/Styling/Attribute Collections/FontCollection.swift diff --git a/Source/AST/Styling/Attribute Collections/ParagraphStyleCollection.swift b/Sources/Down/AST/Styling/Attribute Collections/ParagraphStyleCollection.swift similarity index 100% rename from Source/AST/Styling/Attribute Collections/ParagraphStyleCollection.swift rename to Sources/Down/AST/Styling/Attribute Collections/ParagraphStyleCollection.swift diff --git a/Source/AST/Styling/Custom Attributes/BlockBackgroundColorAttribute.swift b/Sources/Down/AST/Styling/Custom Attributes/BlockBackgroundColorAttribute.swift similarity index 100% rename from Source/AST/Styling/Custom Attributes/BlockBackgroundColorAttribute.swift rename to Sources/Down/AST/Styling/Custom Attributes/BlockBackgroundColorAttribute.swift diff --git a/Source/AST/Styling/Custom Attributes/QuoteStripeAttribute.swift b/Sources/Down/AST/Styling/Custom Attributes/QuoteStripeAttribute.swift similarity index 100% rename from Source/AST/Styling/Custom Attributes/QuoteStripeAttribute.swift rename to Sources/Down/AST/Styling/Custom Attributes/QuoteStripeAttribute.swift diff --git a/Source/AST/Styling/Custom Attributes/ThematicBreakAttribute.swift b/Sources/Down/AST/Styling/Custom Attributes/ThematicBreakAttribute.swift similarity index 100% rename from Source/AST/Styling/Custom Attributes/ThematicBreakAttribute.swift rename to Sources/Down/AST/Styling/Custom Attributes/ThematicBreakAttribute.swift diff --git a/Source/AST/Styling/Helpers/Extensions/CGPoint+Translate.swift b/Sources/Down/AST/Styling/Helpers/Extensions/CGPoint+Translate.swift similarity index 100% rename from Source/AST/Styling/Helpers/Extensions/CGPoint+Translate.swift rename to Sources/Down/AST/Styling/Helpers/Extensions/CGPoint+Translate.swift diff --git a/Source/AST/Styling/Helpers/Extensions/CGRect+Helpers.swift b/Sources/Down/AST/Styling/Helpers/Extensions/CGRect+Helpers.swift similarity index 100% rename from Source/AST/Styling/Helpers/Extensions/CGRect+Helpers.swift rename to Sources/Down/AST/Styling/Helpers/Extensions/CGRect+Helpers.swift diff --git a/Source/AST/Styling/Helpers/Extensions/NSAttributedString+Helpers.swift b/Sources/Down/AST/Styling/Helpers/Extensions/NSAttributedString+Helpers.swift similarity index 100% rename from Source/AST/Styling/Helpers/Extensions/NSAttributedString+Helpers.swift rename to Sources/Down/AST/Styling/Helpers/Extensions/NSAttributedString+Helpers.swift diff --git a/Source/AST/Styling/Helpers/Extensions/NSMutableAttributedString+Attributes.swift b/Sources/Down/AST/Styling/Helpers/Extensions/NSMutableAttributedString+Attributes.swift similarity index 100% rename from Source/AST/Styling/Helpers/Extensions/NSMutableAttributedString+Attributes.swift rename to Sources/Down/AST/Styling/Helpers/Extensions/NSMutableAttributedString+Attributes.swift diff --git a/Source/AST/Styling/Helpers/Extensions/UIFont+Traits.swift b/Sources/Down/AST/Styling/Helpers/Extensions/UIFont+Traits.swift similarity index 100% rename from Source/AST/Styling/Helpers/Extensions/UIFont+Traits.swift rename to Sources/Down/AST/Styling/Helpers/Extensions/UIFont+Traits.swift diff --git a/Source/AST/Styling/Helpers/ListItemParagraphStyler.swift b/Sources/Down/AST/Styling/Helpers/ListItemParagraphStyler.swift similarity index 100% rename from Source/AST/Styling/Helpers/ListItemParagraphStyler.swift rename to Sources/Down/AST/Styling/Helpers/ListItemParagraphStyler.swift diff --git a/Source/AST/Styling/Layout Managers/DownDebugLayoutManager.swift b/Sources/Down/AST/Styling/Layout Managers/DownDebugLayoutManager.swift similarity index 100% rename from Source/AST/Styling/Layout Managers/DownDebugLayoutManager.swift rename to Sources/Down/AST/Styling/Layout Managers/DownDebugLayoutManager.swift diff --git a/Source/AST/Styling/Layout Managers/DownLayoutManager.swift b/Sources/Down/AST/Styling/Layout Managers/DownLayoutManager.swift similarity index 100% rename from Source/AST/Styling/Layout Managers/DownLayoutManager.swift rename to Sources/Down/AST/Styling/Layout Managers/DownLayoutManager.swift diff --git a/Source/AST/Styling/Options/CodeBlockOptions.swift b/Sources/Down/AST/Styling/Options/CodeBlockOptions.swift similarity index 100% rename from Source/AST/Styling/Options/CodeBlockOptions.swift rename to Sources/Down/AST/Styling/Options/CodeBlockOptions.swift diff --git a/Source/AST/Styling/Options/ListItemOptions.swift b/Sources/Down/AST/Styling/Options/ListItemOptions.swift similarity index 100% rename from Source/AST/Styling/Options/ListItemOptions.swift rename to Sources/Down/AST/Styling/Options/ListItemOptions.swift diff --git a/Source/AST/Styling/Options/QuoteStripeOptions.swift b/Sources/Down/AST/Styling/Options/QuoteStripeOptions.swift similarity index 100% rename from Source/AST/Styling/Options/QuoteStripeOptions.swift rename to Sources/Down/AST/Styling/Options/QuoteStripeOptions.swift diff --git a/Source/AST/Styling/Options/ThematicBreakOptions.swift b/Sources/Down/AST/Styling/Options/ThematicBreakOptions.swift similarity index 100% rename from Source/AST/Styling/Options/ThematicBreakOptions.swift rename to Sources/Down/AST/Styling/Options/ThematicBreakOptions.swift diff --git a/Source/AST/Styling/Stylers/DownStyler.swift b/Sources/Down/AST/Styling/Stylers/DownStyler.swift similarity index 100% rename from Source/AST/Styling/Stylers/DownStyler.swift rename to Sources/Down/AST/Styling/Stylers/DownStyler.swift diff --git a/Source/AST/Styling/Stylers/DownStylerConfiguration.swift b/Sources/Down/AST/Styling/Stylers/DownStylerConfiguration.swift similarity index 100% rename from Source/AST/Styling/Stylers/DownStylerConfiguration.swift rename to Sources/Down/AST/Styling/Stylers/DownStylerConfiguration.swift diff --git a/Source/AST/Styling/Stylers/Styler.swift b/Sources/Down/AST/Styling/Stylers/Styler.swift similarity index 100% rename from Source/AST/Styling/Stylers/Styler.swift rename to Sources/Down/AST/Styling/Stylers/Styler.swift diff --git a/Source/AST/Styling/Text Views/DownDebugTextView.swift b/Sources/Down/AST/Styling/Text Views/DownDebugTextView.swift similarity index 100% rename from Source/AST/Styling/Text Views/DownDebugTextView.swift rename to Sources/Down/AST/Styling/Text Views/DownDebugTextView.swift diff --git a/Source/AST/Styling/Text Views/DownTextView.swift b/Sources/Down/AST/Styling/Text Views/DownTextView.swift similarity index 100% rename from Source/AST/Styling/Text Views/DownTextView.swift rename to Sources/Down/AST/Styling/Text Views/DownTextView.swift diff --git a/Source/AST/Visitors/AttributedStringVisitor.swift b/Sources/Down/AST/Visitors/AttributedStringVisitor.swift similarity index 100% rename from Source/AST/Visitors/AttributedStringVisitor.swift rename to Sources/Down/AST/Visitors/AttributedStringVisitor.swift diff --git a/Source/AST/Visitors/DebugVisitor.swift b/Sources/Down/AST/Visitors/DebugVisitor.swift similarity index 100% rename from Source/AST/Visitors/DebugVisitor.swift rename to Sources/Down/AST/Visitors/DebugVisitor.swift diff --git a/Source/AST/Visitors/ListItemPrefixGenerator.swift b/Sources/Down/AST/Visitors/ListItemPrefixGenerator.swift similarity index 100% rename from Source/AST/Visitors/ListItemPrefixGenerator.swift rename to Sources/Down/AST/Visitors/ListItemPrefixGenerator.swift diff --git a/Source/AST/Visitors/Visitor.swift b/Sources/Down/AST/Visitors/Visitor.swift similarity index 100% rename from Source/AST/Visitors/Visitor.swift rename to Sources/Down/AST/Visitors/Visitor.swift diff --git a/Source/Down.h b/Sources/Down/Down.h similarity index 100% rename from Source/Down.h rename to Sources/Down/Down.h diff --git a/Source/Down.swift b/Sources/Down/Down.swift similarity index 100% rename from Source/Down.swift rename to Sources/Down/Down.swift diff --git a/Source/Enums & Options/DownErrors.swift b/Sources/Down/Enums & Options/DownErrors.swift similarity index 100% rename from Source/Enums & Options/DownErrors.swift rename to Sources/Down/Enums & Options/DownErrors.swift diff --git a/Source/Enums & Options/DownOptions.swift b/Sources/Down/Enums & Options/DownOptions.swift similarity index 100% rename from Source/Enums & Options/DownOptions.swift rename to Sources/Down/Enums & Options/DownOptions.swift diff --git a/Source/Extensions/NSAttributedString+HTML.swift b/Sources/Down/Extensions/NSAttributedString+HTML.swift similarity index 100% rename from Source/Extensions/NSAttributedString+HTML.swift rename to Sources/Down/Extensions/NSAttributedString+HTML.swift diff --git a/Source/Extensions/String+ToHTML.swift b/Sources/Down/Extensions/String+ToHTML.swift similarity index 100% rename from Source/Extensions/String+ToHTML.swift rename to Sources/Down/Extensions/String+ToHTML.swift diff --git a/Source/Renderers/DownASTRenderable.swift b/Sources/Down/Renderers/DownASTRenderable.swift similarity index 100% rename from Source/Renderers/DownASTRenderable.swift rename to Sources/Down/Renderers/DownASTRenderable.swift diff --git a/Source/Renderers/DownAttributedStringRenderable.swift b/Sources/Down/Renderers/DownAttributedStringRenderable.swift similarity index 100% rename from Source/Renderers/DownAttributedStringRenderable.swift rename to Sources/Down/Renderers/DownAttributedStringRenderable.swift diff --git a/Source/Renderers/DownCommonMarkRenderable.swift b/Sources/Down/Renderers/DownCommonMarkRenderable.swift similarity index 100% rename from Source/Renderers/DownCommonMarkRenderable.swift rename to Sources/Down/Renderers/DownCommonMarkRenderable.swift diff --git a/Source/Renderers/DownGroffRenderable.swift b/Sources/Down/Renderers/DownGroffRenderable.swift similarity index 100% rename from Source/Renderers/DownGroffRenderable.swift rename to Sources/Down/Renderers/DownGroffRenderable.swift diff --git a/Source/Renderers/DownHTMLRenderable.swift b/Sources/Down/Renderers/DownHTMLRenderable.swift similarity index 100% rename from Source/Renderers/DownHTMLRenderable.swift rename to Sources/Down/Renderers/DownHTMLRenderable.swift diff --git a/Source/Renderers/DownLaTeXRenderable.swift b/Sources/Down/Renderers/DownLaTeXRenderable.swift similarity index 100% rename from Source/Renderers/DownLaTeXRenderable.swift rename to Sources/Down/Renderers/DownLaTeXRenderable.swift diff --git a/Source/Renderers/DownRenderable.swift b/Sources/Down/Renderers/DownRenderable.swift similarity index 100% rename from Source/Renderers/DownRenderable.swift rename to Sources/Down/Renderers/DownRenderable.swift diff --git a/Source/Renderers/DownXMLRenderable.swift b/Sources/Down/Renderers/DownXMLRenderable.swift similarity index 100% rename from Source/Renderers/DownXMLRenderable.swift rename to Sources/Down/Renderers/DownXMLRenderable.swift diff --git a/Resources/DownView (macOS).bundle/css/down.min.css b/Sources/Down/Resources/DownView (macOS).bundle/css/down.min.css similarity index 100% rename from Resources/DownView (macOS).bundle/css/down.min.css rename to Sources/Down/Resources/DownView (macOS).bundle/css/down.min.css diff --git a/Resources/DownView (macOS).bundle/index.html b/Sources/Down/Resources/DownView (macOS).bundle/index.html similarity index 100% rename from Resources/DownView (macOS).bundle/index.html rename to Sources/Down/Resources/DownView (macOS).bundle/index.html diff --git a/Resources/DownView (macOS).bundle/js/down.js b/Sources/Down/Resources/DownView (macOS).bundle/js/down.js similarity index 100% rename from Resources/DownView (macOS).bundle/js/down.js rename to Sources/Down/Resources/DownView (macOS).bundle/js/down.js diff --git a/Resources/DownView (macOS).bundle/js/highlight.min.js b/Sources/Down/Resources/DownView (macOS).bundle/js/highlight.min.js similarity index 100% rename from Resources/DownView (macOS).bundle/js/highlight.min.js rename to Sources/Down/Resources/DownView (macOS).bundle/js/highlight.min.js diff --git a/Resources/DownView.bundle/css/down.min.css b/Sources/Down/Resources/DownView.bundle/css/down.min.css similarity index 100% rename from Resources/DownView.bundle/css/down.min.css rename to Sources/Down/Resources/DownView.bundle/css/down.min.css diff --git a/Resources/DownView.bundle/index.html b/Sources/Down/Resources/DownView.bundle/index.html similarity index 100% rename from Resources/DownView.bundle/index.html rename to Sources/Down/Resources/DownView.bundle/index.html diff --git a/Resources/DownView.bundle/js/down.js b/Sources/Down/Resources/DownView.bundle/js/down.js similarity index 100% rename from Resources/DownView.bundle/js/down.js rename to Sources/Down/Resources/DownView.bundle/js/down.js diff --git a/Resources/DownView.bundle/js/highlight.min.js b/Sources/Down/Resources/DownView.bundle/js/highlight.min.js similarity index 100% rename from Resources/DownView.bundle/js/highlight.min.js rename to Sources/Down/Resources/DownView.bundle/js/highlight.min.js diff --git a/Sources/Down/Views/BundleHelper.swift b/Sources/Down/Views/BundleHelper.swift new file mode 100644 index 00000000..6d0dcdb0 --- /dev/null +++ b/Sources/Down/Views/BundleHelper.swift @@ -0,0 +1,34 @@ +import class Foundation.Bundle + +// This helps us find the bundle when imported through the Swift Package Manager. + +private class BundleFinder {} + +extension Foundation.Bundle { + + /// Returns the resource bundle associated with the current Swift module. + + static var moduleBundle: Bundle? = { + let bundleName = "Down_Down" + + let candidates = [ + // Bundle should be present here when the package is linked into an App. + Bundle.main.resourceURL, + + // Bundle should be present here when the package is linked into a framework. + Bundle(for: BundleFinder.self).resourceURL, + + // For command-line tools. + Bundle.main.bundleURL, + ] + + for candidate in candidates { + let bundlePath = candidate?.appendingPathComponent(bundleName + ".bundle") + if let bundle = bundlePath.flatMap(Bundle.init(url:)) { + return bundle + } + } + return nil + }() + +} diff --git a/Source/Views/DownView.swift b/Sources/Down/Views/DownView.swift similarity index 97% rename from Source/Views/DownView.swift rename to Sources/Down/Views/DownView.swift index e570ab57..ca33beec 100644 --- a/Source/Views/DownView.swift +++ b/Sources/Down/Views/DownView.swift @@ -38,8 +38,8 @@ open class DownView: WKWebView { if let templateBundle = templateBundle { self.bundle = templateBundle } else { - let classBundle = Bundle(for: DownView.self) - let url = classBundle.url(forResource: "DownView", withExtension: "bundle")! + let moduleBundle = Bundle.moduleBundle ?? Bundle(for: DownView.self) + let url = moduleBundle.url(forResource: "DownView", withExtension: "bundle")! self.bundle = Bundle(url: url)! } diff --git a/Source/cmark/COPYING b/Sources/cmark/COPYING similarity index 100% rename from Source/cmark/COPYING rename to Sources/cmark/COPYING diff --git a/Source/cmark/blocks.c b/Sources/cmark/blocks.c similarity index 100% rename from Source/cmark/blocks.c rename to Sources/cmark/blocks.c diff --git a/Source/cmark/buffer.c b/Sources/cmark/buffer.c similarity index 100% rename from Source/cmark/buffer.c rename to Sources/cmark/buffer.c diff --git a/Source/cmark/buffer.h b/Sources/cmark/buffer.h similarity index 100% rename from Source/cmark/buffer.h rename to Sources/cmark/buffer.h diff --git a/Source/cmark/case_fold_switch.inc b/Sources/cmark/case_fold_switch.inc similarity index 100% rename from Source/cmark/case_fold_switch.inc rename to Sources/cmark/case_fold_switch.inc diff --git a/Source/cmark/chunk.h b/Sources/cmark/chunk.h similarity index 100% rename from Source/cmark/chunk.h rename to Sources/cmark/chunk.h diff --git a/Source/cmark/cmark.c b/Sources/cmark/cmark.c similarity index 100% rename from Source/cmark/cmark.c rename to Sources/cmark/cmark.c diff --git a/Source/cmark/cmark.h b/Sources/cmark/cmark.h similarity index 100% rename from Source/cmark/cmark.h rename to Sources/cmark/cmark.h diff --git a/Source/cmark/cmark_ctype.c b/Sources/cmark/cmark_ctype.c similarity index 100% rename from Source/cmark/cmark_ctype.c rename to Sources/cmark/cmark_ctype.c diff --git a/Source/cmark/cmark_ctype.h b/Sources/cmark/cmark_ctype.h similarity index 100% rename from Source/cmark/cmark_ctype.h rename to Sources/cmark/cmark_ctype.h diff --git a/Source/cmark/cmark_export.h b/Sources/cmark/cmark_export.h similarity index 100% rename from Source/cmark/cmark_export.h rename to Sources/cmark/cmark_export.h diff --git a/Source/cmark/cmark_version.h b/Sources/cmark/cmark_version.h similarity index 100% rename from Source/cmark/cmark_version.h rename to Sources/cmark/cmark_version.h diff --git a/Source/cmark/commonmark.c b/Sources/cmark/commonmark.c similarity index 100% rename from Source/cmark/commonmark.c rename to Sources/cmark/commonmark.c diff --git a/Source/cmark/config.h b/Sources/cmark/config.h similarity index 100% rename from Source/cmark/config.h rename to Sources/cmark/config.h diff --git a/Source/cmark/entities.inc b/Sources/cmark/entities.inc similarity index 100% rename from Source/cmark/entities.inc rename to Sources/cmark/entities.inc diff --git a/Source/cmark/houdini.h b/Sources/cmark/houdini.h similarity index 100% rename from Source/cmark/houdini.h rename to Sources/cmark/houdini.h diff --git a/Source/cmark/houdini_href_e.c b/Sources/cmark/houdini_href_e.c similarity index 100% rename from Source/cmark/houdini_href_e.c rename to Sources/cmark/houdini_href_e.c diff --git a/Source/cmark/houdini_html_e.c b/Sources/cmark/houdini_html_e.c similarity index 100% rename from Source/cmark/houdini_html_e.c rename to Sources/cmark/houdini_html_e.c diff --git a/Source/cmark/houdini_html_u.c b/Sources/cmark/houdini_html_u.c similarity index 100% rename from Source/cmark/houdini_html_u.c rename to Sources/cmark/houdini_html_u.c diff --git a/Source/cmark/html.c b/Sources/cmark/html.c similarity index 100% rename from Source/cmark/html.c rename to Sources/cmark/html.c diff --git a/Source/cmark/include/module.modulemap b/Sources/cmark/include/module.modulemap similarity index 100% rename from Source/cmark/include/module.modulemap rename to Sources/cmark/include/module.modulemap diff --git a/Source/cmark/inlines.c b/Sources/cmark/inlines.c similarity index 100% rename from Source/cmark/inlines.c rename to Sources/cmark/inlines.c diff --git a/Source/cmark/inlines.h b/Sources/cmark/inlines.h similarity index 100% rename from Source/cmark/inlines.h rename to Sources/cmark/inlines.h diff --git a/Source/cmark/iterator.c b/Sources/cmark/iterator.c similarity index 100% rename from Source/cmark/iterator.c rename to Sources/cmark/iterator.c diff --git a/Source/cmark/iterator.h b/Sources/cmark/iterator.h similarity index 100% rename from Source/cmark/iterator.h rename to Sources/cmark/iterator.h diff --git a/Source/cmark/latex.c b/Sources/cmark/latex.c similarity index 100% rename from Source/cmark/latex.c rename to Sources/cmark/latex.c diff --git a/Source/cmark/man.c b/Sources/cmark/man.c similarity index 100% rename from Source/cmark/man.c rename to Sources/cmark/man.c diff --git a/Source/cmark/node.c b/Sources/cmark/node.c similarity index 100% rename from Source/cmark/node.c rename to Sources/cmark/node.c diff --git a/Source/cmark/node.h b/Sources/cmark/node.h similarity index 100% rename from Source/cmark/node.h rename to Sources/cmark/node.h diff --git a/Source/cmark/parser.h b/Sources/cmark/parser.h similarity index 100% rename from Source/cmark/parser.h rename to Sources/cmark/parser.h diff --git a/Source/cmark/references.c b/Sources/cmark/references.c similarity index 100% rename from Source/cmark/references.c rename to Sources/cmark/references.c diff --git a/Source/cmark/references.h b/Sources/cmark/references.h similarity index 100% rename from Source/cmark/references.h rename to Sources/cmark/references.h diff --git a/Source/cmark/render.c b/Sources/cmark/render.c similarity index 100% rename from Source/cmark/render.c rename to Sources/cmark/render.c diff --git a/Source/cmark/render.h b/Sources/cmark/render.h similarity index 100% rename from Source/cmark/render.h rename to Sources/cmark/render.h diff --git a/Source/cmark/scanners.c b/Sources/cmark/scanners.c similarity index 100% rename from Source/cmark/scanners.c rename to Sources/cmark/scanners.c diff --git a/Source/cmark/scanners.h b/Sources/cmark/scanners.h similarity index 100% rename from Source/cmark/scanners.h rename to Sources/cmark/scanners.h diff --git a/Source/cmark/utf8.c b/Sources/cmark/utf8.c similarity index 100% rename from Source/cmark/utf8.c rename to Sources/cmark/utf8.c diff --git a/Source/cmark/utf8.h b/Sources/cmark/utf8.h similarity index 100% rename from Source/cmark/utf8.h rename to Sources/cmark/utf8.h diff --git a/Source/cmark/xml.c b/Sources/cmark/xml.c similarity index 100% rename from Source/cmark/xml.c rename to Sources/cmark/xml.c diff --git a/Resources/Configurations/Deployment-Targets.xcconfig b/Supporting Files/Configurations/Deployment-Targets.xcconfig similarity index 100% rename from Resources/Configurations/Deployment-Targets.xcconfig rename to Supporting Files/Configurations/Deployment-Targets.xcconfig diff --git a/Resources/Configurations/Universal-Framework-Target.xcconfig b/Supporting Files/Configurations/Universal-Framework-Target.xcconfig similarity index 100% rename from Resources/Configurations/Universal-Framework-Target.xcconfig rename to Supporting Files/Configurations/Universal-Framework-Target.xcconfig diff --git a/Resources/Configurations/Universal-Target-Base.xcconfig b/Supporting Files/Configurations/Universal-Target-Base.xcconfig similarity index 100% rename from Resources/Configurations/Universal-Target-Base.xcconfig rename to Supporting Files/Configurations/Universal-Target-Base.xcconfig diff --git a/Resources/Down-Info.plist b/Supporting Files/Down-Info.plist similarity index 100% rename from Resources/Down-Info.plist rename to Supporting Files/Down-Info.plist diff --git a/Resources/DownTests-Info.plist b/Supporting Files/DownTests-Info.plist similarity index 100% rename from Resources/DownTests-Info.plist rename to Supporting Files/DownTests-Info.plist diff --git a/Tests/AST/ListItemPrefixGeneratorTests.swift b/Tests/DownTests/AST/ListItemPrefixGeneratorTests.swift similarity index 100% rename from Tests/AST/ListItemPrefixGeneratorTests.swift rename to Tests/DownTests/AST/ListItemPrefixGeneratorTests.swift diff --git a/Tests/AST/NodeTests.swift b/Tests/DownTests/AST/NodeTests.swift similarity index 100% rename from Tests/AST/NodeTests.swift rename to Tests/DownTests/AST/NodeTests.swift diff --git a/Tests/AST/VisitorTests.swift b/Tests/DownTests/AST/VisitorTests.swift similarity index 100% rename from Tests/AST/VisitorTests.swift rename to Tests/DownTests/AST/VisitorTests.swift diff --git a/Tests/AST/__Snapshots__/VisitorTests/testAttributedStringVisitor.1.txt b/Tests/DownTests/AST/__Snapshots__/VisitorTests/testAttributedStringVisitor.1.txt similarity index 100% rename from Tests/AST/__Snapshots__/VisitorTests/testAttributedStringVisitor.1.txt rename to Tests/DownTests/AST/__Snapshots__/VisitorTests/testAttributedStringVisitor.1.txt diff --git a/Tests/AST/__Snapshots__/VisitorTests/testBlockQuote.1.txt b/Tests/DownTests/AST/__Snapshots__/VisitorTests/testBlockQuote.1.txt similarity index 100% rename from Tests/AST/__Snapshots__/VisitorTests/testBlockQuote.1.txt rename to Tests/DownTests/AST/__Snapshots__/VisitorTests/testBlockQuote.1.txt diff --git a/Tests/AST/__Snapshots__/VisitorTests/testBlockQuote.2.txt b/Tests/DownTests/AST/__Snapshots__/VisitorTests/testBlockQuote.2.txt similarity index 100% rename from Tests/AST/__Snapshots__/VisitorTests/testBlockQuote.2.txt rename to Tests/DownTests/AST/__Snapshots__/VisitorTests/testBlockQuote.2.txt diff --git a/Tests/AST/__Snapshots__/VisitorTests/testCodeBlock.1.txt b/Tests/DownTests/AST/__Snapshots__/VisitorTests/testCodeBlock.1.txt similarity index 100% rename from Tests/AST/__Snapshots__/VisitorTests/testCodeBlock.1.txt rename to Tests/DownTests/AST/__Snapshots__/VisitorTests/testCodeBlock.1.txt diff --git a/Tests/AST/__Snapshots__/VisitorTests/testCodeBlock.2.txt b/Tests/DownTests/AST/__Snapshots__/VisitorTests/testCodeBlock.2.txt similarity index 100% rename from Tests/AST/__Snapshots__/VisitorTests/testCodeBlock.2.txt rename to Tests/DownTests/AST/__Snapshots__/VisitorTests/testCodeBlock.2.txt diff --git a/Tests/AST/__Snapshots__/VisitorTests/testHeading.1.txt b/Tests/DownTests/AST/__Snapshots__/VisitorTests/testHeading.1.txt similarity index 100% rename from Tests/AST/__Snapshots__/VisitorTests/testHeading.1.txt rename to Tests/DownTests/AST/__Snapshots__/VisitorTests/testHeading.1.txt diff --git a/Tests/AST/__Snapshots__/VisitorTests/testHeading.2.txt b/Tests/DownTests/AST/__Snapshots__/VisitorTests/testHeading.2.txt similarity index 100% rename from Tests/AST/__Snapshots__/VisitorTests/testHeading.2.txt rename to Tests/DownTests/AST/__Snapshots__/VisitorTests/testHeading.2.txt diff --git a/Tests/AST/__Snapshots__/VisitorTests/testHtmlBlock.1.txt b/Tests/DownTests/AST/__Snapshots__/VisitorTests/testHtmlBlock.1.txt similarity index 100% rename from Tests/AST/__Snapshots__/VisitorTests/testHtmlBlock.1.txt rename to Tests/DownTests/AST/__Snapshots__/VisitorTests/testHtmlBlock.1.txt diff --git a/Tests/AST/__Snapshots__/VisitorTests/testHtmlBlock.2.txt b/Tests/DownTests/AST/__Snapshots__/VisitorTests/testHtmlBlock.2.txt similarity index 100% rename from Tests/AST/__Snapshots__/VisitorTests/testHtmlBlock.2.txt rename to Tests/DownTests/AST/__Snapshots__/VisitorTests/testHtmlBlock.2.txt diff --git a/Tests/AST/__Snapshots__/VisitorTests/testInline.1.txt b/Tests/DownTests/AST/__Snapshots__/VisitorTests/testInline.1.txt similarity index 100% rename from Tests/AST/__Snapshots__/VisitorTests/testInline.1.txt rename to Tests/DownTests/AST/__Snapshots__/VisitorTests/testInline.1.txt diff --git a/Tests/AST/__Snapshots__/VisitorTests/testInline.2.txt b/Tests/DownTests/AST/__Snapshots__/VisitorTests/testInline.2.txt similarity index 100% rename from Tests/AST/__Snapshots__/VisitorTests/testInline.2.txt rename to Tests/DownTests/AST/__Snapshots__/VisitorTests/testInline.2.txt diff --git a/Tests/AST/__Snapshots__/VisitorTests/testLineBreak.1.txt b/Tests/DownTests/AST/__Snapshots__/VisitorTests/testLineBreak.1.txt similarity index 100% rename from Tests/AST/__Snapshots__/VisitorTests/testLineBreak.1.txt rename to Tests/DownTests/AST/__Snapshots__/VisitorTests/testLineBreak.1.txt diff --git a/Tests/AST/__Snapshots__/VisitorTests/testLineBreak.2.txt b/Tests/DownTests/AST/__Snapshots__/VisitorTests/testLineBreak.2.txt similarity index 100% rename from Tests/AST/__Snapshots__/VisitorTests/testLineBreak.2.txt rename to Tests/DownTests/AST/__Snapshots__/VisitorTests/testLineBreak.2.txt diff --git a/Tests/AST/__Snapshots__/VisitorTests/testLink.1.txt b/Tests/DownTests/AST/__Snapshots__/VisitorTests/testLink.1.txt similarity index 100% rename from Tests/AST/__Snapshots__/VisitorTests/testLink.1.txt rename to Tests/DownTests/AST/__Snapshots__/VisitorTests/testLink.1.txt diff --git a/Tests/AST/__Snapshots__/VisitorTests/testLink.2.txt b/Tests/DownTests/AST/__Snapshots__/VisitorTests/testLink.2.txt similarity index 100% rename from Tests/AST/__Snapshots__/VisitorTests/testLink.2.txt rename to Tests/DownTests/AST/__Snapshots__/VisitorTests/testLink.2.txt diff --git a/Tests/AST/__Snapshots__/VisitorTests/testList.1.txt b/Tests/DownTests/AST/__Snapshots__/VisitorTests/testList.1.txt similarity index 100% rename from Tests/AST/__Snapshots__/VisitorTests/testList.1.txt rename to Tests/DownTests/AST/__Snapshots__/VisitorTests/testList.1.txt diff --git a/Tests/AST/__Snapshots__/VisitorTests/testList.2.txt b/Tests/DownTests/AST/__Snapshots__/VisitorTests/testList.2.txt similarity index 100% rename from Tests/AST/__Snapshots__/VisitorTests/testList.2.txt rename to Tests/DownTests/AST/__Snapshots__/VisitorTests/testList.2.txt diff --git a/Tests/AST/__Snapshots__/VisitorTests/testParagraph.1.txt b/Tests/DownTests/AST/__Snapshots__/VisitorTests/testParagraph.1.txt similarity index 100% rename from Tests/AST/__Snapshots__/VisitorTests/testParagraph.1.txt rename to Tests/DownTests/AST/__Snapshots__/VisitorTests/testParagraph.1.txt diff --git a/Tests/AST/__Snapshots__/VisitorTests/testParagraph.2.txt b/Tests/DownTests/AST/__Snapshots__/VisitorTests/testParagraph.2.txt similarity index 100% rename from Tests/AST/__Snapshots__/VisitorTests/testParagraph.2.txt rename to Tests/DownTests/AST/__Snapshots__/VisitorTests/testParagraph.2.txt diff --git a/Tests/AST/__Snapshots__/VisitorTests/testSimpleMarkdown.1.txt b/Tests/DownTests/AST/__Snapshots__/VisitorTests/testSimpleMarkdown.1.txt similarity index 100% rename from Tests/AST/__Snapshots__/VisitorTests/testSimpleMarkdown.1.txt rename to Tests/DownTests/AST/__Snapshots__/VisitorTests/testSimpleMarkdown.1.txt diff --git a/Tests/AST/__Snapshots__/VisitorTests/testSoftBreak.1.txt b/Tests/DownTests/AST/__Snapshots__/VisitorTests/testSoftBreak.1.txt similarity index 100% rename from Tests/AST/__Snapshots__/VisitorTests/testSoftBreak.1.txt rename to Tests/DownTests/AST/__Snapshots__/VisitorTests/testSoftBreak.1.txt diff --git a/Tests/AST/__Snapshots__/VisitorTests/testSoftBreak.2.txt b/Tests/DownTests/AST/__Snapshots__/VisitorTests/testSoftBreak.2.txt similarity index 100% rename from Tests/AST/__Snapshots__/VisitorTests/testSoftBreak.2.txt rename to Tests/DownTests/AST/__Snapshots__/VisitorTests/testSoftBreak.2.txt diff --git a/Tests/AST/__Snapshots__/VisitorTests/testThematicBreak.1.txt b/Tests/DownTests/AST/__Snapshots__/VisitorTests/testThematicBreak.1.txt similarity index 100% rename from Tests/AST/__Snapshots__/VisitorTests/testThematicBreak.1.txt rename to Tests/DownTests/AST/__Snapshots__/VisitorTests/testThematicBreak.1.txt diff --git a/Tests/AST/__Snapshots__/VisitorTests/testThematicBreak.2.txt b/Tests/DownTests/AST/__Snapshots__/VisitorTests/testThematicBreak.2.txt similarity index 100% rename from Tests/AST/__Snapshots__/VisitorTests/testThematicBreak.2.txt rename to Tests/DownTests/AST/__Snapshots__/VisitorTests/testThematicBreak.2.txt diff --git a/Tests/BindingTests.swift b/Tests/DownTests/BindingTests.swift similarity index 100% rename from Tests/BindingTests.swift rename to Tests/DownTests/BindingTests.swift diff --git a/Tests/DownViewTests.swift b/Tests/DownTests/DownViewTests.swift similarity index 100% rename from Tests/DownViewTests.swift rename to Tests/DownTests/DownViewTests.swift diff --git a/Tests/Fixtures/TestDownView.bundle/css/down.min.css b/Tests/DownTests/Fixtures/TestDownView.bundle/css/down.min.css similarity index 100% rename from Tests/Fixtures/TestDownView.bundle/css/down.min.css rename to Tests/DownTests/Fixtures/TestDownView.bundle/css/down.min.css diff --git a/Tests/Fixtures/TestDownView.bundle/index.html b/Tests/DownTests/Fixtures/TestDownView.bundle/index.html similarity index 100% rename from Tests/Fixtures/TestDownView.bundle/index.html rename to Tests/DownTests/Fixtures/TestDownView.bundle/index.html diff --git a/Tests/Fixtures/TestDownView.bundle/js/down.js b/Tests/DownTests/Fixtures/TestDownView.bundle/js/down.js similarity index 100% rename from Tests/Fixtures/TestDownView.bundle/js/down.js rename to Tests/DownTests/Fixtures/TestDownView.bundle/js/down.js diff --git a/Tests/Fixtures/TestDownView.bundle/js/highlight.min.js b/Tests/DownTests/Fixtures/TestDownView.bundle/js/highlight.min.js similarity index 100% rename from Tests/Fixtures/TestDownView.bundle/js/highlight.min.js rename to Tests/DownTests/Fixtures/TestDownView.bundle/js/highlight.min.js diff --git a/Tests/NSAttributedStringTests.swift b/Tests/DownTests/NSAttributedStringTests.swift similarity index 100% rename from Tests/NSAttributedStringTests.swift rename to Tests/DownTests/NSAttributedStringTests.swift diff --git a/Tests/StringTests.swift b/Tests/DownTests/StringTests.swift similarity index 100% rename from Tests/StringTests.swift rename to Tests/DownTests/StringTests.swift diff --git a/Tests/Styler/BlockQuoteStyleTests.swift b/Tests/DownTests/Styler/BlockQuoteStyleTests.swift similarity index 100% rename from Tests/Styler/BlockQuoteStyleTests.swift rename to Tests/DownTests/Styler/BlockQuoteStyleTests.swift diff --git a/Tests/Styler/CodeBlockStyleTests.swift b/Tests/DownTests/Styler/CodeBlockStyleTests.swift similarity index 100% rename from Tests/Styler/CodeBlockStyleTests.swift rename to Tests/DownTests/Styler/CodeBlockStyleTests.swift diff --git a/Tests/Styler/DownDebugLayoutManagerTests.swift b/Tests/DownTests/Styler/DownDebugLayoutManagerTests.swift similarity index 100% rename from Tests/Styler/DownDebugLayoutManagerTests.swift rename to Tests/DownTests/Styler/DownDebugLayoutManagerTests.swift diff --git a/Tests/Styler/HeadingStyleTests.swift b/Tests/DownTests/Styler/HeadingStyleTests.swift similarity index 100% rename from Tests/Styler/HeadingStyleTests.swift rename to Tests/DownTests/Styler/HeadingStyleTests.swift diff --git a/Tests/Styler/Helpers/CGPoint_TranslateTests.swift b/Tests/DownTests/Styler/Helpers/CGPoint_TranslateTests.swift similarity index 100% rename from Tests/Styler/Helpers/CGPoint_TranslateTests.swift rename to Tests/DownTests/Styler/Helpers/CGPoint_TranslateTests.swift diff --git a/Tests/Styler/Helpers/CGRect_HelpersTests.swift b/Tests/DownTests/Styler/Helpers/CGRect_HelpersTests.swift similarity index 100% rename from Tests/Styler/Helpers/CGRect_HelpersTests.swift rename to Tests/DownTests/Styler/Helpers/CGRect_HelpersTests.swift diff --git a/Tests/Styler/Helpers/NSAttributedString+HelpersTests.swift b/Tests/DownTests/Styler/Helpers/NSAttributedString+HelpersTests.swift similarity index 100% rename from Tests/Styler/Helpers/NSAttributedString+HelpersTests.swift rename to Tests/DownTests/Styler/Helpers/NSAttributedString+HelpersTests.swift diff --git a/Tests/Styler/Helpers/NSMutableAttributedString+AttributesTests.swift b/Tests/DownTests/Styler/Helpers/NSMutableAttributedString+AttributesTests.swift similarity index 100% rename from Tests/Styler/Helpers/NSMutableAttributedString+AttributesTests.swift rename to Tests/DownTests/Styler/Helpers/NSMutableAttributedString+AttributesTests.swift diff --git a/Tests/Styler/InlineStyleTests.swift b/Tests/DownTests/Styler/InlineStyleTests.swift similarity index 100% rename from Tests/Styler/InlineStyleTests.swift rename to Tests/DownTests/Styler/InlineStyleTests.swift diff --git a/Tests/Styler/LinkStyleTests.swift b/Tests/DownTests/Styler/LinkStyleTests.swift similarity index 100% rename from Tests/Styler/LinkStyleTests.swift rename to Tests/DownTests/Styler/LinkStyleTests.swift diff --git a/Tests/Styler/ListItemStyleTests.swift b/Tests/DownTests/Styler/ListItemStyleTests.swift similarity index 100% rename from Tests/Styler/ListItemStyleTests.swift rename to Tests/DownTests/Styler/ListItemStyleTests.swift diff --git a/Tests/Styler/StylerTestSuite.swift b/Tests/DownTests/Styler/StylerTestSuite.swift similarity index 100% rename from Tests/Styler/StylerTestSuite.swift rename to Tests/DownTests/Styler/StylerTestSuite.swift diff --git a/Tests/Styler/ThematicBreakSyleTests.swift b/Tests/DownTests/Styler/ThematicBreakSyleTests.swift similarity index 100% rename from Tests/Styler/ThematicBreakSyleTests.swift rename to Tests/DownTests/Styler/ThematicBreakSyleTests.swift diff --git a/Tests/Styler/__Snapshots__/BlockQuoteStyleTests/testThat_NestedQuotes_Have_TheirOwnStripes.1.png b/Tests/DownTests/Styler/__Snapshots__/BlockQuoteStyleTests/testThat_NestedQuotes_Have_TheirOwnStripes.1.png similarity index 100% rename from Tests/Styler/__Snapshots__/BlockQuoteStyleTests/testThat_NestedQuotes_Have_TheirOwnStripes.1.png rename to Tests/DownTests/Styler/__Snapshots__/BlockQuoteStyleTests/testThat_NestedQuotes_Have_TheirOwnStripes.1.png diff --git a/Tests/Styler/__Snapshots__/BlockQuoteStyleTests/testThat_QuoteAlignment_Obeys_TextContainerOffset.1.png b/Tests/DownTests/Styler/__Snapshots__/BlockQuoteStyleTests/testThat_QuoteAlignment_Obeys_TextContainerOffset.1.png similarity index 100% rename from Tests/Styler/__Snapshots__/BlockQuoteStyleTests/testThat_QuoteAlignment_Obeys_TextContainerOffset.1.png rename to Tests/DownTests/Styler/__Snapshots__/BlockQuoteStyleTests/testThat_QuoteAlignment_Obeys_TextContainerOffset.1.png diff --git a/Tests/Styler/__Snapshots__/BlockQuoteStyleTests/testThat_QuoteContent_Aligns.1.png b/Tests/DownTests/Styler/__Snapshots__/BlockQuoteStyleTests/testThat_QuoteContent_Aligns.1.png similarity index 100% rename from Tests/Styler/__Snapshots__/BlockQuoteStyleTests/testThat_QuoteContent_Aligns.1.png rename to Tests/DownTests/Styler/__Snapshots__/BlockQuoteStyleTests/testThat_QuoteContent_Aligns.1.png diff --git a/Tests/Styler/__Snapshots__/BlockQuoteStyleTests/testThat_QuoteContent_Preserves_BlockElements.1.png b/Tests/DownTests/Styler/__Snapshots__/BlockQuoteStyleTests/testThat_QuoteContent_Preserves_BlockElements.1.png similarity index 100% rename from Tests/Styler/__Snapshots__/BlockQuoteStyleTests/testThat_QuoteContent_Preserves_BlockElements.1.png rename to Tests/DownTests/Styler/__Snapshots__/BlockQuoteStyleTests/testThat_QuoteContent_Preserves_BlockElements.1.png diff --git a/Tests/Styler/__Snapshots__/BlockQuoteStyleTests/testThat_QuoteContent_Preserves_InlineElements.1.png b/Tests/DownTests/Styler/__Snapshots__/BlockQuoteStyleTests/testThat_QuoteContent_Preserves_InlineElements.1.png similarity index 100% rename from Tests/Styler/__Snapshots__/BlockQuoteStyleTests/testThat_QuoteContent_Preserves_InlineElements.1.png rename to Tests/DownTests/Styler/__Snapshots__/BlockQuoteStyleTests/testThat_QuoteContent_Preserves_InlineElements.1.png diff --git a/Tests/Styler/__Snapshots__/BlockQuoteStyleTests/testThat_QuoteContent_Preserves_ListFormatting.1.png b/Tests/DownTests/Styler/__Snapshots__/BlockQuoteStyleTests/testThat_QuoteContent_Preserves_ListFormatting.1.png similarity index 100% rename from Tests/Styler/__Snapshots__/BlockQuoteStyleTests/testThat_QuoteContent_Preserves_ListFormatting.1.png rename to Tests/DownTests/Styler/__Snapshots__/BlockQuoteStyleTests/testThat_QuoteContent_Preserves_ListFormatting.1.png diff --git a/Tests/Styler/__Snapshots__/BlockQuoteStyleTests/testThat_QuoteContent_Preserves_ThematicBreak.1.png b/Tests/DownTests/Styler/__Snapshots__/BlockQuoteStyleTests/testThat_QuoteContent_Preserves_ThematicBreak.1.png similarity index 100% rename from Tests/Styler/__Snapshots__/BlockQuoteStyleTests/testThat_QuoteContent_Preserves_ThematicBreak.1.png rename to Tests/DownTests/Styler/__Snapshots__/BlockQuoteStyleTests/testThat_QuoteContent_Preserves_ThematicBreak.1.png diff --git a/Tests/Styler/__Snapshots__/BlockQuoteStyleTests/testThat_QuoteStripe_AlignsTo_Margin.1.png b/Tests/DownTests/Styler/__Snapshots__/BlockQuoteStyleTests/testThat_QuoteStripe_AlignsTo_Margin.1.png similarity index 100% rename from Tests/Styler/__Snapshots__/BlockQuoteStyleTests/testThat_QuoteStripe_AlignsTo_Margin.1.png rename to Tests/DownTests/Styler/__Snapshots__/BlockQuoteStyleTests/testThat_QuoteStripe_AlignsTo_Margin.1.png diff --git a/Tests/Styler/__Snapshots__/BlockQuoteStyleTests/testThat_QuotedList_WithinA_ListItem_AlignsCorrectly.1.png b/Tests/DownTests/Styler/__Snapshots__/BlockQuoteStyleTests/testThat_QuotedList_WithinA_ListItem_AlignsCorrectly.1.png similarity index 100% rename from Tests/Styler/__Snapshots__/BlockQuoteStyleTests/testThat_QuotedList_WithinA_ListItem_AlignsCorrectly.1.png rename to Tests/DownTests/Styler/__Snapshots__/BlockQuoteStyleTests/testThat_QuotedList_WithinA_ListItem_AlignsCorrectly.1.png diff --git a/Tests/Styler/__Snapshots__/BlockQuoteStyleTests/testThat_Quotes_WithinA_ListItem_AlignsTo_ListItemContent.1.png b/Tests/DownTests/Styler/__Snapshots__/BlockQuoteStyleTests/testThat_Quotes_WithinA_ListItem_AlignsTo_ListItemContent.1.png similarity index 100% rename from Tests/Styler/__Snapshots__/BlockQuoteStyleTests/testThat_Quotes_WithinA_ListItem_AlignsTo_ListItemContent.1.png rename to Tests/DownTests/Styler/__Snapshots__/BlockQuoteStyleTests/testThat_Quotes_WithinA_ListItem_AlignsTo_ListItemContent.1.png diff --git a/Tests/Styler/__Snapshots__/CodeBlockStyleTests/testThat_CodeBlock_IsStyled.1.png b/Tests/DownTests/Styler/__Snapshots__/CodeBlockStyleTests/testThat_CodeBlock_IsStyled.1.png similarity index 100% rename from Tests/Styler/__Snapshots__/CodeBlockStyleTests/testThat_CodeBlock_IsStyled.1.png rename to Tests/DownTests/Styler/__Snapshots__/CodeBlockStyleTests/testThat_CodeBlock_IsStyled.1.png diff --git a/Tests/Styler/__Snapshots__/CodeBlockStyleTests/testThat_HtmlBlock_IsStyled.1.png b/Tests/DownTests/Styler/__Snapshots__/CodeBlockStyleTests/testThat_HtmlBlock_IsStyled.1.png similarity index 100% rename from Tests/Styler/__Snapshots__/CodeBlockStyleTests/testThat_HtmlBlock_IsStyled.1.png rename to Tests/DownTests/Styler/__Snapshots__/CodeBlockStyleTests/testThat_HtmlBlock_IsStyled.1.png diff --git a/Tests/Styler/__Snapshots__/DownDebugLayoutManagerTests/testThat_LineFragments_AreDrawn.1.png b/Tests/DownTests/Styler/__Snapshots__/DownDebugLayoutManagerTests/testThat_LineFragments_AreDrawn.1.png similarity index 100% rename from Tests/Styler/__Snapshots__/DownDebugLayoutManagerTests/testThat_LineFragments_AreDrawn.1.png rename to Tests/DownTests/Styler/__Snapshots__/DownDebugLayoutManagerTests/testThat_LineFragments_AreDrawn.1.png diff --git a/Tests/Styler/__Snapshots__/HeadingStyleTests/testThat_HeadingStyle_Preserves_StrongEmphasisAndMonospaceTraits.1.png b/Tests/DownTests/Styler/__Snapshots__/HeadingStyleTests/testThat_HeadingStyle_Preserves_StrongEmphasisAndMonospaceTraits.1.png similarity index 100% rename from Tests/Styler/__Snapshots__/HeadingStyleTests/testThat_HeadingStyle_Preserves_StrongEmphasisAndMonospaceTraits.1.png rename to Tests/DownTests/Styler/__Snapshots__/HeadingStyleTests/testThat_HeadingStyle_Preserves_StrongEmphasisAndMonospaceTraits.1.png diff --git a/Tests/Styler/__Snapshots__/HeadingStyleTests/testThat_Heading_LevelOne_IsStyled.1.png b/Tests/DownTests/Styler/__Snapshots__/HeadingStyleTests/testThat_Heading_LevelOne_IsStyled.1.png similarity index 100% rename from Tests/Styler/__Snapshots__/HeadingStyleTests/testThat_Heading_LevelOne_IsStyled.1.png rename to Tests/DownTests/Styler/__Snapshots__/HeadingStyleTests/testThat_Heading_LevelOne_IsStyled.1.png diff --git a/Tests/Styler/__Snapshots__/HeadingStyleTests/testThat_Heading_LevelThree_IsStyled.1.png b/Tests/DownTests/Styler/__Snapshots__/HeadingStyleTests/testThat_Heading_LevelThree_IsStyled.1.png similarity index 100% rename from Tests/Styler/__Snapshots__/HeadingStyleTests/testThat_Heading_LevelThree_IsStyled.1.png rename to Tests/DownTests/Styler/__Snapshots__/HeadingStyleTests/testThat_Heading_LevelThree_IsStyled.1.png diff --git a/Tests/Styler/__Snapshots__/HeadingStyleTests/testThat_Heading_LevelTwo_IsStyled.1.png b/Tests/DownTests/Styler/__Snapshots__/HeadingStyleTests/testThat_Heading_LevelTwo_IsStyled.1.png similarity index 100% rename from Tests/Styler/__Snapshots__/HeadingStyleTests/testThat_Heading_LevelTwo_IsStyled.1.png rename to Tests/DownTests/Styler/__Snapshots__/HeadingStyleTests/testThat_Heading_LevelTwo_IsStyled.1.png diff --git a/Tests/Styler/__Snapshots__/HeadingStyleTests/testThat_Heading_LevelsThreeToSix_AreStyledEqually.1.png b/Tests/DownTests/Styler/__Snapshots__/HeadingStyleTests/testThat_Heading_LevelsThreeToSix_AreStyledEqually.1.png similarity index 100% rename from Tests/Styler/__Snapshots__/HeadingStyleTests/testThat_Heading_LevelsThreeToSix_AreStyledEqually.1.png rename to Tests/DownTests/Styler/__Snapshots__/HeadingStyleTests/testThat_Heading_LevelsThreeToSix_AreStyledEqually.1.png diff --git a/Tests/Styler/__Snapshots__/InlineStyleTests/testThat_CodeText_IsStyled.1.png b/Tests/DownTests/Styler/__Snapshots__/InlineStyleTests/testThat_CodeText_IsStyled.1.png similarity index 100% rename from Tests/Styler/__Snapshots__/InlineStyleTests/testThat_CodeText_IsStyled.1.png rename to Tests/DownTests/Styler/__Snapshots__/InlineStyleTests/testThat_CodeText_IsStyled.1.png diff --git a/Tests/Styler/__Snapshots__/InlineStyleTests/testThat_EmphasizedCode_IsStyled.1.png b/Tests/DownTests/Styler/__Snapshots__/InlineStyleTests/testThat_EmphasizedCode_IsStyled.1.png similarity index 100% rename from Tests/Styler/__Snapshots__/InlineStyleTests/testThat_EmphasizedCode_IsStyled.1.png rename to Tests/DownTests/Styler/__Snapshots__/InlineStyleTests/testThat_EmphasizedCode_IsStyled.1.png diff --git a/Tests/Styler/__Snapshots__/InlineStyleTests/testThat_EmphasizedStrongCode_IsStyled.1.png b/Tests/DownTests/Styler/__Snapshots__/InlineStyleTests/testThat_EmphasizedStrongCode_IsStyled.1.png similarity index 100% rename from Tests/Styler/__Snapshots__/InlineStyleTests/testThat_EmphasizedStrongCode_IsStyled.1.png rename to Tests/DownTests/Styler/__Snapshots__/InlineStyleTests/testThat_EmphasizedStrongCode_IsStyled.1.png diff --git a/Tests/Styler/__Snapshots__/InlineStyleTests/testThat_EmphasizedStrongText_IsStyled.1.png b/Tests/DownTests/Styler/__Snapshots__/InlineStyleTests/testThat_EmphasizedStrongText_IsStyled.1.png similarity index 100% rename from Tests/Styler/__Snapshots__/InlineStyleTests/testThat_EmphasizedStrongText_IsStyled.1.png rename to Tests/DownTests/Styler/__Snapshots__/InlineStyleTests/testThat_EmphasizedStrongText_IsStyled.1.png diff --git a/Tests/Styler/__Snapshots__/InlineStyleTests/testThat_EmphasizedText_IsStyled.1.png b/Tests/DownTests/Styler/__Snapshots__/InlineStyleTests/testThat_EmphasizedText_IsStyled.1.png similarity index 100% rename from Tests/Styler/__Snapshots__/InlineStyleTests/testThat_EmphasizedText_IsStyled.1.png rename to Tests/DownTests/Styler/__Snapshots__/InlineStyleTests/testThat_EmphasizedText_IsStyled.1.png diff --git a/Tests/Styler/__Snapshots__/InlineStyleTests/testThat_StrongCode_IsStyled.1.png b/Tests/DownTests/Styler/__Snapshots__/InlineStyleTests/testThat_StrongCode_IsStyled.1.png similarity index 100% rename from Tests/Styler/__Snapshots__/InlineStyleTests/testThat_StrongCode_IsStyled.1.png rename to Tests/DownTests/Styler/__Snapshots__/InlineStyleTests/testThat_StrongCode_IsStyled.1.png diff --git a/Tests/Styler/__Snapshots__/InlineStyleTests/testThat_StrongEmphasizedCode_IsStyled.1.png b/Tests/DownTests/Styler/__Snapshots__/InlineStyleTests/testThat_StrongEmphasizedCode_IsStyled.1.png similarity index 100% rename from Tests/Styler/__Snapshots__/InlineStyleTests/testThat_StrongEmphasizedCode_IsStyled.1.png rename to Tests/DownTests/Styler/__Snapshots__/InlineStyleTests/testThat_StrongEmphasizedCode_IsStyled.1.png diff --git a/Tests/Styler/__Snapshots__/InlineStyleTests/testThat_StrongEmphasizedText_IsStyled.1.png b/Tests/DownTests/Styler/__Snapshots__/InlineStyleTests/testThat_StrongEmphasizedText_IsStyled.1.png similarity index 100% rename from Tests/Styler/__Snapshots__/InlineStyleTests/testThat_StrongEmphasizedText_IsStyled.1.png rename to Tests/DownTests/Styler/__Snapshots__/InlineStyleTests/testThat_StrongEmphasizedText_IsStyled.1.png diff --git a/Tests/Styler/__Snapshots__/InlineStyleTests/testThat_StrongText_IsStyled.1.png b/Tests/DownTests/Styler/__Snapshots__/InlineStyleTests/testThat_StrongText_IsStyled.1.png similarity index 100% rename from Tests/Styler/__Snapshots__/InlineStyleTests/testThat_StrongText_IsStyled.1.png rename to Tests/DownTests/Styler/__Snapshots__/InlineStyleTests/testThat_StrongText_IsStyled.1.png diff --git a/Tests/Styler/__Snapshots__/LinkStyleTests/testThat_Link_IsStyled.1.png b/Tests/DownTests/Styler/__Snapshots__/LinkStyleTests/testThat_Link_IsStyled.1.png similarity index 100% rename from Tests/Styler/__Snapshots__/LinkStyleTests/testThat_Link_IsStyled.1.png rename to Tests/DownTests/Styler/__Snapshots__/LinkStyleTests/testThat_Link_IsStyled.1.png diff --git a/Tests/Styler/__Snapshots__/LinkStyleTests/testThat_Link_Preserves_InlineStyles.1.png b/Tests/DownTests/Styler/__Snapshots__/LinkStyleTests/testThat_Link_Preserves_InlineStyles.1.png similarity index 100% rename from Tests/Styler/__Snapshots__/LinkStyleTests/testThat_Link_Preserves_InlineStyles.1.png rename to Tests/DownTests/Styler/__Snapshots__/LinkStyleTests/testThat_Link_Preserves_InlineStyles.1.png diff --git a/Tests/Styler/__Snapshots__/ListItemStyleTests/testThat_DigitAndBulletPrefixes_Align.1.png b/Tests/DownTests/Styler/__Snapshots__/ListItemStyleTests/testThat_DigitAndBulletPrefixes_Align.1.png similarity index 100% rename from Tests/Styler/__Snapshots__/ListItemStyleTests/testThat_DigitAndBulletPrefixes_Align.1.png rename to Tests/DownTests/Styler/__Snapshots__/ListItemStyleTests/testThat_DigitAndBulletPrefixes_Align.1.png diff --git a/Tests/Styler/__Snapshots__/ListItemStyleTests/testThat_DigitPrefixes_ExceedingMaxPrefixLength_DontPush_WrappedLines.1.png b/Tests/DownTests/Styler/__Snapshots__/ListItemStyleTests/testThat_DigitPrefixes_ExceedingMaxPrefixLength_DontPush_WrappedLines.1.png similarity index 100% rename from Tests/Styler/__Snapshots__/ListItemStyleTests/testThat_DigitPrefixes_ExceedingMaxPrefixLength_DontPush_WrappedLines.1.png rename to Tests/DownTests/Styler/__Snapshots__/ListItemStyleTests/testThat_DigitPrefixes_ExceedingMaxPrefixLength_DontPush_WrappedLines.1.png diff --git a/Tests/Styler/__Snapshots__/ListItemStyleTests/testThat_DigitPrefixes_ExceedingMaxPrefixLength_Push_FirstLine.1.png b/Tests/DownTests/Styler/__Snapshots__/ListItemStyleTests/testThat_DigitPrefixes_ExceedingMaxPrefixLength_Push_FirstLine.1.png similarity index 100% rename from Tests/Styler/__Snapshots__/ListItemStyleTests/testThat_DigitPrefixes_ExceedingMaxPrefixLength_Push_FirstLine.1.png rename to Tests/DownTests/Styler/__Snapshots__/ListItemStyleTests/testThat_DigitPrefixes_ExceedingMaxPrefixLength_Push_FirstLine.1.png diff --git a/Tests/Styler/__Snapshots__/ListItemStyleTests/testThat_DigitPrefixes_UpToMaxPrefixLength_Align.1.png b/Tests/DownTests/Styler/__Snapshots__/ListItemStyleTests/testThat_DigitPrefixes_UpToMaxPrefixLength_Align.1.png similarity index 100% rename from Tests/Styler/__Snapshots__/ListItemStyleTests/testThat_DigitPrefixes_UpToMaxPrefixLength_Align.1.png rename to Tests/DownTests/Styler/__Snapshots__/ListItemStyleTests/testThat_DigitPrefixes_UpToMaxPrefixLength_Align.1.png diff --git a/Tests/Styler/__Snapshots__/ListItemStyleTests/testThat_FirstParagraph_WithLineBreaks_AlignTo_FirstLine.1.png b/Tests/DownTests/Styler/__Snapshots__/ListItemStyleTests/testThat_FirstParagraph_WithLineBreaks_AlignTo_FirstLine.1.png similarity index 100% rename from Tests/Styler/__Snapshots__/ListItemStyleTests/testThat_FirstParagraph_WithLineBreaks_AlignTo_FirstLine.1.png rename to Tests/DownTests/Styler/__Snapshots__/ListItemStyleTests/testThat_FirstParagraph_WithLineBreaks_AlignTo_FirstLine.1.png diff --git a/Tests/Styler/__Snapshots__/ListItemStyleTests/testThat_FirstParagraph_WrappedLines_AlignTo_FirstLine.1.png b/Tests/DownTests/Styler/__Snapshots__/ListItemStyleTests/testThat_FirstParagraph_WrappedLines_AlignTo_FirstLine.1.png similarity index 100% rename from Tests/Styler/__Snapshots__/ListItemStyleTests/testThat_FirstParagraph_WrappedLines_AlignTo_FirstLine.1.png rename to Tests/DownTests/Styler/__Snapshots__/ListItemStyleTests/testThat_FirstParagraph_WrappedLines_AlignTo_FirstLine.1.png diff --git a/Tests/Styler/__Snapshots__/ListItemStyleTests/testThat_ListItems_Preseve_InlineElements.1.png b/Tests/DownTests/Styler/__Snapshots__/ListItemStyleTests/testThat_ListItems_Preseve_InlineElements.1.png similarity index 100% rename from Tests/Styler/__Snapshots__/ListItemStyleTests/testThat_ListItems_Preseve_InlineElements.1.png rename to Tests/DownTests/Styler/__Snapshots__/ListItemStyleTests/testThat_ListItems_Preseve_InlineElements.1.png diff --git a/Tests/Styler/__Snapshots__/ListItemStyleTests/testThat_NestedList_AlignsTo_OuterList.1.png b/Tests/DownTests/Styler/__Snapshots__/ListItemStyleTests/testThat_NestedList_AlignsTo_OuterList.1.png similarity index 100% rename from Tests/Styler/__Snapshots__/ListItemStyleTests/testThat_NestedList_AlignsTo_OuterList.1.png rename to Tests/DownTests/Styler/__Snapshots__/ListItemStyleTests/testThat_NestedList_AlignsTo_OuterList.1.png diff --git a/Tests/Styler/__Snapshots__/ListItemStyleTests/testThat_NestedList_InMiddleParagraph_AlignsTo_OuterList.1.png b/Tests/DownTests/Styler/__Snapshots__/ListItemStyleTests/testThat_NestedList_InMiddleParagraph_AlignsTo_OuterList.1.png similarity index 100% rename from Tests/Styler/__Snapshots__/ListItemStyleTests/testThat_NestedList_InMiddleParagraph_AlignsTo_OuterList.1.png rename to Tests/DownTests/Styler/__Snapshots__/ListItemStyleTests/testThat_NestedList_InMiddleParagraph_AlignsTo_OuterList.1.png diff --git a/Tests/Styler/__Snapshots__/ListItemStyleTests/testThat_NestedList_InTrailingParagraph_AlignsTo_OuterList.1.png b/Tests/DownTests/Styler/__Snapshots__/ListItemStyleTests/testThat_NestedList_InTrailingParagraph_AlignsTo_OuterList.1.png similarity index 100% rename from Tests/Styler/__Snapshots__/ListItemStyleTests/testThat_NestedList_InTrailingParagraph_AlignsTo_OuterList.1.png rename to Tests/DownTests/Styler/__Snapshots__/ListItemStyleTests/testThat_NestedList_InTrailingParagraph_AlignsTo_OuterList.1.png diff --git a/Tests/Styler/__Snapshots__/ListItemStyleTests/testThat_NestedList_With_MultipleParagraphs_Align.1.png b/Tests/DownTests/Styler/__Snapshots__/ListItemStyleTests/testThat_NestedList_With_MultipleParagraphs_Align.1.png similarity index 100% rename from Tests/Styler/__Snapshots__/ListItemStyleTests/testThat_NestedList_With_MultipleParagraphs_Align.1.png rename to Tests/DownTests/Styler/__Snapshots__/ListItemStyleTests/testThat_NestedList_With_MultipleParagraphs_Align.1.png diff --git a/Tests/Styler/__Snapshots__/ListItemStyleTests/testThat_NestedLists_AlignTo_ParentLists.1.png b/Tests/DownTests/Styler/__Snapshots__/ListItemStyleTests/testThat_NestedLists_AlignTo_ParentLists.1.png similarity index 100% rename from Tests/Styler/__Snapshots__/ListItemStyleTests/testThat_NestedLists_AlignTo_ParentLists.1.png rename to Tests/DownTests/Styler/__Snapshots__/ListItemStyleTests/testThat_NestedLists_AlignTo_ParentLists.1.png diff --git a/Tests/Styler/__Snapshots__/ListItemStyleTests/testThat_TrailingParagraphs_FirstLines_AlignTo_FirstParagraph.1.png b/Tests/DownTests/Styler/__Snapshots__/ListItemStyleTests/testThat_TrailingParagraphs_FirstLines_AlignTo_FirstParagraph.1.png similarity index 100% rename from Tests/Styler/__Snapshots__/ListItemStyleTests/testThat_TrailingParagraphs_FirstLines_AlignTo_FirstParagraph.1.png rename to Tests/DownTests/Styler/__Snapshots__/ListItemStyleTests/testThat_TrailingParagraphs_FirstLines_AlignTo_FirstParagraph.1.png diff --git a/Tests/Styler/__Snapshots__/ListItemStyleTests/testThat_TrailingParagraphs_WrappedLines_AlignTo_FirstLines.1.png b/Tests/DownTests/Styler/__Snapshots__/ListItemStyleTests/testThat_TrailingParagraphs_WrappedLines_AlignTo_FirstLines.1.png similarity index 100% rename from Tests/Styler/__Snapshots__/ListItemStyleTests/testThat_TrailingParagraphs_WrappedLines_AlignTo_FirstLines.1.png rename to Tests/DownTests/Styler/__Snapshots__/ListItemStyleTests/testThat_TrailingParagraphs_WrappedLines_AlignTo_FirstLines.1.png diff --git a/Tests/Styler/__Snapshots__/ThematicBreakSyleTests/testThat_ThematicBreak_CanBe_Indented.1.png b/Tests/DownTests/Styler/__Snapshots__/ThematicBreakSyleTests/testThat_ThematicBreak_CanBe_Indented.1.png similarity index 100% rename from Tests/Styler/__Snapshots__/ThematicBreakSyleTests/testThat_ThematicBreak_CanBe_Indented.1.png rename to Tests/DownTests/Styler/__Snapshots__/ThematicBreakSyleTests/testThat_ThematicBreak_CanBe_Indented.1.png diff --git a/Tests/Styler/__Snapshots__/ThematicBreakSyleTests/testThat_ThematicBreak_InOffsetTextContainer_IsStyled.1.png b/Tests/DownTests/Styler/__Snapshots__/ThematicBreakSyleTests/testThat_ThematicBreak_InOffsetTextContainer_IsStyled.1.png similarity index 100% rename from Tests/Styler/__Snapshots__/ThematicBreakSyleTests/testThat_ThematicBreak_InOffsetTextContainer_IsStyled.1.png rename to Tests/DownTests/Styler/__Snapshots__/ThematicBreakSyleTests/testThat_ThematicBreak_InOffsetTextContainer_IsStyled.1.png diff --git a/Tests/Styler/__Snapshots__/ThematicBreakSyleTests/testThat_ThematicBreak_IsStyled.1.png b/Tests/DownTests/Styler/__Snapshots__/ThematicBreakSyleTests/testThat_ThematicBreak_IsStyled.1.png similarity index 100% rename from Tests/Styler/__Snapshots__/ThematicBreakSyleTests/testThat_ThematicBreak_IsStyled.1.png rename to Tests/DownTests/Styler/__Snapshots__/ThematicBreakSyleTests/testThat_ThematicBreak_IsStyled.1.png diff --git a/codecov.yml b/codecov.yml index 0e5294f7..69e13897 100644 --- a/codecov.yml +++ b/codecov.yml @@ -1,5 +1,5 @@ ignore: - - "Source/cmark/*" + - "Sources/cmark/*" - "Down-Example/*" - - "Carthage/*" - "Tests/*" + - "DownSnapshotTests/*"