Upgrades for Xcode 13 (SourceDocs#70)

* WIP: some fixes

* Fix Xcode13 issues and dependency updates. Remove dependency on SwiftPM

* Updates for 2.0.0

* Use Swift 5.5 on workflows

* Checkout current working code

* Update checkout directory

* Unit test workflow

* Update test.yml

Author: eneko

.github/workflows/install.yml

@@ -16,10 +16,15 @@ jobs:
     name: Install from Source on macOS
     runs-on: macos-latest
     steps:
+#     - name: Setup Swift
+#       uses: fwal/setup-swift@v1.9.0
+#       with:
+#         swift-version: 5.5
+    - name: Checkout
+      uses: actions/checkout@v2.4.0
     - name: Install SourceDocs
       run: |
-        git clone --depth 1 https://github.com/eneko/SourceDocs.git
-        cd SourceDocs
+        swift --version
         make install
         sourcedocs version
 
@@ -31,9 +36,14 @@ jobs:
       run: |
         sudo apt-get update
         sudo apt-get install -y libsqlite3-dev libedit-dev
+#     - name: Setup Swift
+#       uses: fwal/setup-swift@v1.9.0
+#       with:
+#         swift-version: 5.5
+    - name: Checkout
+      uses: actions/checkout@v2.4.0
     - name: Install SourceDocs
       run: |
-        git clone --depth 1 https://github.com/eneko/SourceDocs.git
-        cd SourceDocs
+        swift --version
         sudo make install
         sourcedocs version

.github/workflows/test.yml

@@ -0,0 +1,30 @@
+name: Run Unit Tests
+
+on: [push, pull_request]
+
+jobs:
+  macOS:
+    name: Unit Test on macOS
+    runs-on: macos-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2.4.0
+    - name: Unit Test
+      run: |
+        swift --version
+        swift test
+
+  ubuntu:
+    name: Unit Test on Ubuntu
+    runs-on: ubuntu-latest
+    steps:
+    - name: Install Dependencies
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y libsqlite3-dev libedit-dev
+    - name: Checkout
+      uses: actions/checkout@v2.4.0
+    - name: Unit Test
+      run: |
+        swift --version
+        swift test

CHANGELOG.md

@@ -9,6 +9,11 @@
 #### Bug Fixes
 - None
 
+## 2.0.0
+
+- Remove dependency on SwiftPM module for package dump decoding
+- Updates required for Xcode 13
+
 
 ## 1.2.1
 

Makefile

@@ -1,5 +1,5 @@
 TOOL_NAME = sourcedocs
-VERSION = 1.2.1
+VERSION = 2.0.0
 
 PREFIX = /usr/local
 INSTALL_PATH = $(PREFIX)/bin/$(TOOL_NAME)
@@ -23,7 +23,7 @@ lint:
 	swiftlint lint --quiet --strict
 
 docs:
-	swift run sourcedocs generate -car -o docs/reference
+	swift run sourcedocs generate --clean -ar -o docs/reference
 	swift run sourcedocs package -r -o docs
 
 linuxmain:

Package.resolved

@@ -1,22 +1,22 @@
-// swift-tools-version:5.1
+// swift-tools-version:5.3
 import PackageDescription
+import Foundation
 
 let package = Package(
     name: "SourceDocs",
     platforms: [
-        .macOS(.v10_13)
+        .macOS(.v10_15)
     ],
     products: [
         .executable(name: "sourcedocs", targets: ["SourceDocsCLI"]),
         .library(name: "SourceDocsLib", targets: ["SourceDocsLib"])
     ],
     dependencies: [
-        .package(url: "https://github.com/apple/swift-argument-parser", from: "0.0.1"),
-        .package(url: "https://github.com/apple/swift-package-manager", .exact("0.4.0")),
+        .package(url: "https://github.com/apple/swift-argument-parser", from: "1.0.0"),
         .package(url: "https://github.com/jpsim/SourceKitten.git", from: "0.29.0"),
         .package(url: "https://github.com/eneko/MarkdownGenerator.git", from: "0.4.0"),
         .package(url: "https://github.com/onevcat/Rainbow", from: "3.0.0"),
-        .package(url: "https://github.com/eneko/ProcessRunner.git", .upToNextMajor(from: "1.1.0"))
+        .package(url: "https://github.com/eneko/ProcessRunner.git", from: "1.1.0")
     ],
     targets: [
         .target(name: "SourceDocsCLI", dependencies: [
@@ -26,7 +26,6 @@ let package = Package(
         ]),
         .target(name: "SourceDocsLib", dependencies: [
             .product(name: "SourceKittenFramework", package: "SourceKitten"),
-            "SwiftPM-auto",
             "MarkdownGenerator",
             "Rainbow",
             "ProcessRunner"

Package.swift

@@ -9,16 +9,18 @@ import Foundation
 import ArgumentParser
 import SourceDocsLib
 
-struct CleanCommand: ParsableCommand {
-    static var configuration = CommandConfiguration(
-        commandName: "clean",
-        abstract: "Delete the output folder and quit."
-    )
+extension SourceDocs {
+    struct CleanCommand: ParsableCommand {
+        static var configuration = CommandConfiguration(
+            commandName: "clean",
+            abstract: "Delete the output folder and quit."
+        )
 
-    @Option(name: .shortAndLong, default: SourceDocs.defaultOutputPath, help: "Output directory to clean")
-    var outputFolder: String
+        @Option(name: .shortAndLong, help: "Output directory to clean")
+        var outputFolder = SourceDocs.defaultOutputPath
 
-    func run() throws {
-        try DocumentationEraser(docsPath: outputFolder).run()
+        func run() throws {
+            try DocumentationEraser(docsPath: outputFolder).run()
+        }
     }
 }