Skip to content
This repository was archived by the owner on Jun 1, 2023. It is now read-only.

Update for Swift 5.2 #17

Merged
merged 14 commits into from
Mar 28, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 9 additions & 13 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,23 @@ name: CI
on: [push]

jobs:
macos:
runs-on: macOS-latest
# macos:
# runs-on: macOS-latest

steps:
- name: Checkout
uses: actions/checkout@v1
- name: Build and Run
run: swift run swift-doc Sources
# steps:
# - name: Checkout
# uses: actions/checkout@v1
# - name: Build and Test
# run: swift test

linux:
runs-on: ubuntu-latest

strategy:
matrix:
swift: ["5.1"]

container:
image: swift:${{ matrix.swift }}
image: swiftlang/swift:nightly-5.2-xenial

steps:
- name: Checkout
uses: actions/checkout@v1
- name: Build and Run
run: swift run swift-doc Sources
run: swift run swift-doc Sources/SwiftDoc
40 changes: 20 additions & 20 deletions Package.resolved

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 11 additions & 14 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -6,34 +6,31 @@ import PackageDescription
let package = Package(
name: "swift-doc",
dependencies: [
.package(url: "https://github.com/apple/swift-syntax.git", .revision("swift-5.2-DEVELOPMENT-SNAPSHOT-2020-03-09-a")),
.package(url: "https://github.com/SwiftDocOrg/SwiftSemantics.git", .branch("swift-5.2")),
.package(url: "https://github.com/SwiftDocOrg/CommonMark.git", .branch("master")),
.package(url: "https://github.com/SwiftDocOrg/SwiftMarkup.git", .upToNextMinor(from: "0.0.4")),
.package(url: "https://github.com/SwiftDocOrg/SwiftSemantics.git", .branch("master")),
.package(url: "https://github.com/apple/swift-syntax.git", .exact("0.50100.0")),
.package(url: "https://github.com/kylef/Commander.git", .upToNextMinor(from: "0.9.1")),
.package(url: "https://github.com/SwiftDocOrg/GraphViz.git", .upToNextMinor(from: "0.0.1")),
.package(url: "https://github.com/apple/swift-argument-parser", .upToNextMinor(from: "0.0.2")),
],
targets: [
// Targets are the basic building blocks of a package. A target can define a module or a test suite.
// Targets can depend on other targets in this package, and on products in packages which this package depends on.
.target(
name: "swift-doc",
dependencies: ["SwiftDoc", "SwiftSemantics", "SwiftMarkup", "CommonMarkBuilder", "Commander"]
dependencies: ["ArgumentParser", "SwiftDoc", "SwiftSemantics", "SwiftMarkup", "CommonMarkBuilder", "DCOV", "GraphViz"]
),
.target(
name: "swift-dcov",
dependencies: ["SwiftSyntax", "SwiftSemantics", "SwiftMarkup", "SwiftDoc", "Commander"]
),
.target(
name: "swift-api-diagram",
dependencies: ["SwiftDoc", "SwiftSemantics", "Commander"]
),
.target(
name: "swift-api-inventory",
dependencies: ["SwiftDoc", "SwiftSemantics", "Commander"]
name: "DCOV",
dependencies: []
),
.target(
name: "SwiftDoc",
dependencies: ["SwiftSyntax", "SwiftSemantics", "SwiftMarkup"]
),
.testTarget(
name: "SwiftDocTests",
dependencies: ["SwiftDoc", "SwiftSyntax", "SwiftSemantics", "SwiftMarkup"]
),
]
)
Loading