Use SwiftCommonMark

* Use SwiftCommonMark * Update CI job * Update SwiftCommonMark dependency and README
gonzalezreal · Feb 12, 2021 · d7da53e · d7da53e
1 parent 60496a0
commit d7da53e
Show file tree

Hide file tree

Showing 18 changed files with 79 additions and 1,073 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: macos-11.0
     steps:
       - uses: actions/checkout@v2
-      - name: Select Xcode 12.3
-        run: sudo xcode-select -s /Applications/Xcode_12.3.app
+      - name: Select Xcode 12.5
+        run: sudo xcode-select -s /Applications/Xcode_12.5.app
       - name: Run tests
         run: make test
diff --git a/.spi.yml b/.spi.yml
@@ -2,4 +2,4 @@ version: 1
 builder:
   configs:
   - platform: watchos
-    scheme: MarkdownUI-Package-watchOS
+    scheme: MarkdownUI-watchOS
diff --git a/.swift-version b/.swift-version
@@ -1 +1 @@
-5.3
+5.4
diff --git a/.swiftpm/xcode/package.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/.swiftpm/xcode/package.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/CommonMark.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/CommonMark.xcscheme
diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/MarkdownUI-Package-watchOS.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/MarkdownUI-Package-watchOS.xcscheme
diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/MarkdownUI-Package.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/MarkdownUI-Package.xcscheme
diff --git a/...cshareddata/xcschemes/MarkdownUI.xcscheme → ...ata/xcschemes/MarkdownUI-watchOS.xcscheme b/...cshareddata/xcschemes/MarkdownUI.xcscheme → ...ata/xcschemes/MarkdownUI-watchOS.xcscheme
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1230"
+   LastUpgradeVersion = "1240"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
       <BuildActionEntries>
          <BuildActionEntry
-            buildForTesting = "YES"
+            buildForTesting = "NO"
             buildForRunning = "YES"
             buildForProfiling = "YES"
             buildForArchiving = "YES"

diff --git a/...UIDemo/MarkdownUIDemo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/...UIDemo/MarkdownUIDemo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -33,8 +33,8 @@
         "repositoryURL": "https://github.com/SwiftDocOrg/swift-cmark.git",
         "state": {
           "branch": null,
-          "revision": "1168665f6b36be747ffe6b7b90bc54cfc17f42b7",
-          "version": "0.28.3+20200207.1168665"
+          "revision": "9c8096a23f44794bde297452d87c455fc4f76d42",
+          "version": "0.29.0+20210102.9c8096a"
         }
       },
       {
@@ -45,6 +45,15 @@
           "revision": "c466812aa2e22898f27557e2e780d3aad7a27203",
           "version": "1.8.2"
         }
+      },
+      {
+        "package": "SwiftCommonMark",
+        "repositoryURL": "https://github.com/gonzalezreal/SwiftCommonMark",
+        "state": {
+          "branch": null,
+          "revision": "9698a3049b1fdbf64c73c75cd2ab86042d8a0f37",
+          "version": "0.1.0"
+        }
       }
     ]
   },

diff --git a/Makefile b/Makefile
@@ -8,19 +8,19 @@ default: test
 
 test:
 	xcodebuild test \
-			-scheme MarkdownUI-Package \
+			-scheme MarkdownUI \
 			-destination '$(DESTINATION_MAC)'
 	xcodebuild test \
-			-scheme MarkdownUI-Package \
+			-scheme MarkdownUI \
 			-destination '$(DESTINATION_CATALYST)'
 	xcodebuild test \
-			-scheme MarkdownUI-Package \
+			-scheme MarkdownUI \
 			-destination '$(DESTINATION_IOS)'
 	xcodebuild test \
-			-scheme MarkdownUI-Package \
+			-scheme MarkdownUI \
 			-destination '$(DESTINATION_TVOS)'
 	xcodebuild \
-			-scheme MarkdownUI-Package-watchOS \
+			-scheme MarkdownUI-watchOS \
 			-destination '$(DESTINATION_WATCHOS)'
 
 format:

diff --git a/Package.resolved b/Package.resolved
@@ -45,6 +45,15 @@
           "revision": "c466812aa2e22898f27557e2e780d3aad7a27203",
           "version": "1.8.2"
         }
+      },
+      {
+        "package": "SwiftCommonMark",
+        "repositoryURL": "https://github.com/gonzalezreal/SwiftCommonMark",
+        "state": {
+          "branch": null,
+          "revision": "9698a3049b1fdbf64c73c75cd2ab86042d8a0f37",
+          "version": "0.1.0"
+        }
       }
     ]
   },