From 28f5f9078e470ded0fac0dde2cd548417c18a577 Mon Sep 17 00:00:00 2001 From: Gwynne Raskind Date: Fri, 11 Aug 2023 03:51:10 -0500 Subject: [PATCH 1/4] Fix Exports.swift --- Sources/Leaf/Exports.swift | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Sources/Leaf/Exports.swift b/Sources/Leaf/Exports.swift index d5afb18..7b6ecd1 100644 --- a/Sources/Leaf/Exports.swift +++ b/Sources/Leaf/Exports.swift @@ -1,4 +1,12 @@ -#if !BUILDING_DOCC +#if swift(>=5.8) + +@_documentation(visibility: internal) @_exported import protocol LeafKit.LeafTag +@_documentation(visibility: internal) @_exported import protocol LeafKit.UnsafeUnescapedLeafTag +@_documentation(visibility: internal) @_exported import struct LeafKit.LeafData +@_documentation(visibility: internal) @_exported import struct LeafKit.LeafContext +@_documentation(visibility: internal) @_exported import enum LeafKit.Syntax + +#else @_exported import protocol LeafKit.LeafTag @_exported import protocol LeafKit.UnsafeUnescapedLeafTag @@ -6,4 +14,4 @@ @_exported import struct LeafKit.LeafContext @_exported import enum LeafKit.Syntax -#endif \ No newline at end of file +#endif From 0120121555566dca02b4be44f2a4913d13944d1d Mon Sep 17 00:00:00 2001 From: Gwynne Raskind Date: Fri, 11 Aug 2023 04:01:16 -0500 Subject: [PATCH 2/4] Clean up README --- README.md | 35 +++++++++++++---------------------- 1 file changed, 13 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index 9ee17a7..b81adff 100644 --- a/README.md +++ b/README.md @@ -1,24 +1,15 @@

- Leaf -
-
- - Documentation - - - Team Chat - - - MIT License - - - Continuous Integration - - - Swift 5.2 - + + + + Leaf + +
+
+Documentation +Team Chat +MIT License +Continuous Integration +Swift 5.6

+
From 87e3373fa144b283f697d2b0f8654ea2646ed2b3 Mon Sep 17 00:00:00 2001 From: Gwynne Raskind Date: Fri, 11 Aug 2023 04:01:23 -0500 Subject: [PATCH 3/4] Fixup workflows --- .github/workflows/api-docs.yml | 2 +- .github/workflows/projectboard.yml | 2 +- .github/workflows/test.yml | 13 +++++++------ 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/api-docs.yml b/.github/workflows/api-docs.yml index ded9933..e1f7028 100644 --- a/.github/workflows/api-docs.yml +++ b/.github/workflows/api-docs.yml @@ -11,4 +11,4 @@ jobs: with: package_name: leaf modules: Leaf - pathsToInvalidate: /leaf + pathsToInvalidate: /leaf/* diff --git a/.github/workflows/projectboard.yml b/.github/workflows/projectboard.yml index a0e6d98..8c8f4bd 100644 --- a/.github/workflows/projectboard.yml +++ b/.github/workflows/projectboard.yml @@ -7,5 +7,5 @@ on: jobs: update_project_boards: name: Update project boards - uses: vapor/ci/.github/workflows/update-project-boards-for-issue.yml@reusable-workflows + uses: vapor/ci/.github/workflows/update-project-boards-for-issue.yml@main secrets: inherit diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0a10929..c81ed63 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,10 +1,11 @@ name: test +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true on: -- pull_request + pull_request: { types: [opened, reopened, synchronize, ready_for_review] } + push: { branches: [ main ] } + jobs: unit-tests: - uses: vapor/ci/.github/workflows/run-unit-tests.yml@reusable-workflows - with: - with_coverage: false - with_tsan: true - with_public_api_check: true + uses: vapor/ci/.github/workflows/run-unit-tests.yml@main From 01491adc33c04c170f6439f13090f42fab80f873 Mon Sep 17 00:00:00 2001 From: Gwynne Raskind Date: Fri, 11 Aug 2023 04:23:47 -0500 Subject: [PATCH 4/4] Clean up Package.swift, bump min Swift to 5.6 to match Vapor and LeafKit --- Package.swift | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/Package.swift b/Package.swift index 75b477e..87812d3 100644 --- a/Package.swift +++ b/Package.swift @@ -1,21 +1,20 @@ -// swift-tools-version:5.4 +// swift-tools-version:5.6 import PackageDescription let package = Package( name: "leaf", platforms: [ - .macOS(.v10_15), - .iOS(.v13) + .macOS(.v10_15), + .iOS(.v13), + .tvOS(.v13), + .watchOS(.v6) ], products: [ .library(name: "Leaf", targets: ["Leaf"]), ], dependencies: [ - .package(url: "https://github.com/vapor/leaf-kit.git", from: "1.3.1"), - + .package(url: "https://github.com/vapor/leaf-kit.git", from: "1.3.1"), .package(url: "https://github.com/vapor/vapor.git", from: "4.0.0"), - - // Swift collection algorithms .package(url: "https://github.com/apple/swift-algorithms.git", from: "1.0.0"), ], targets: [