Skip to content

Commit 32ad16d

Browse files
authored
Update for swift-log 1.11.0 (#232)
* Require Swift 6.1, update CI, update docs * Make ConsoleFragmentLogger fully compatible with the latest swift-log, replace ConsoleLogger with a typealias, heavily clean up inline docs
1 parent 7f953c6 commit 32ad16d

File tree

22 files changed

+233
-316
lines changed

22 files changed

+233
-316
lines changed

.github/dependabot.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,11 @@ updates:
88
dependencies:
99
patterns:
1010
- "*"
11+
- package-ecosystem: "swift"
12+
directory: "/"
13+
schedule:
14+
interval: "daily"
15+
groups:
16+
dependencies:
17+
patterns:
18+
- "*"

.github/workflows/test.yml

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,24 @@ permissions:
1010

1111
jobs:
1212
unit-tests:
13-
uses: vapor/ci/.github/workflows/run-unit-tests.yml@main
14-
with:
15-
with_windows: true
16-
with_musl: true
17-
secrets: inherit
13+
permissions:
14+
contents: read
15+
uses: vapor/ci/.github/workflows/run-unit-tests.yml@main
16+
with:
17+
with_windows: true
18+
with_musl: true
19+
secrets: inherit
20+
21+
submit-dependencies:
22+
permissions:
23+
contents: write
24+
if: ${{ github.event_name == 'push' }}
25+
uses: vapor/ci/.github/workflows/submit-deps.yml@main
26+
secrets: inherit
1827

1928
integration-check:
29+
permissions:
30+
contents: read
2031
runs-on: ubuntu-latest
2132
container: swift:noble
2233
steps:

Package.swift

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version:5.8
1+
// swift-tools-version:6.1
22
import PackageDescription
33

44
let package = Package(
@@ -15,8 +15,8 @@ let package = Package(
1515
.library(name: "ConsoleKitCommands", targets: ["ConsoleKitCommands"]),
1616
],
1717
dependencies: [
18-
.package(url: "https://github.com/apple/swift-log.git", from: "1.5.3"),
19-
.package(url: "https://github.com/apple/swift-nio.git", from: "2.62.0"),
18+
.package(url: "https://github.com/apple/swift-log.git", from: "1.11.0"),
19+
.package(url: "https://github.com/apple/swift-nio.git", from: "2.97.0"),
2020
],
2121
targets: [
2222
.target(
@@ -81,6 +81,10 @@ let package = Package(
8181
)
8282

8383
var swiftSettings: [SwiftSetting] { [
84-
.enableUpcomingFeature("ForwardTrailingClosures"),
85-
.enableUpcomingFeature("ConciseMagicFile"),
84+
.enableUpcomingFeature("ExistentialAny"),
85+
//.enableUpcomingFeature("InternalImportsByDefault"),
86+
.enableUpcomingFeature("MemberImportVisibility"),
87+
.enableUpcomingFeature("InferIsolatedConformances"),
88+
//.enableUpcomingFeature("NonisolatedNonsendingByDefault"),
89+
.enableUpcomingFeature("ImmutableWeakCaptures"),
8690
] }

Package@swift-5.9.swift

Lines changed: 0 additions & 89 deletions
This file was deleted.

README.md

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
<p align="center">
2-
<picture>
3-
<source media="(prefers-color-scheme: dark)" srcset="https://github.com/vapor/console-kit/assets/1130717/3c06f3a4-8edb-4341-8b50-eb6aacb47e0b">
4-
<source media="(prefers-color-scheme: light)" srcset="https://github.com/vapor/console-kit/assets/1130717/3bb2255d-f564-43d2-a9e9-386420005adf">
5-
<img src="https://github.com/vapor/console-kit/assets/1130717/3bb2255d-f564-43d2-a9e9-386420005adf" height="96" alt="ConsoleKit">
6-
</picture>
2+
<img src="https://design.vapor.codes/images/vapor-consolekit.svg" height="96" alt="ConsoleKit">
73
<br>
84
<br>
95
<a href="https://docs.vapor.codes/4.0/"><img src="https://design.vapor.codes/images/readthedocs.svg" alt="Documentation"></a>
106
<a href="https://discord.gg/vapor"><img src="https://design.vapor.codes/images/discordchat.svg" alt="Team Chat"></a>
117
<a href="LICENSE"><img src="https://design.vapor.codes/images/mitlicense.svg" alt="MIT License"></a>
12-
<a href="https://github.com/vapor/console-kit/actions/workflows/test.yml"><img src="https://img.shields.io/github/actions/workflow/status/vapor/console-kit/test.yml?event=push&style=plastic&logo=github&label=tests&logoColor=%23ccc" alt="Continuous Integration"></a>
13-
<a href="https://codecov.io/gh/vapor/console-kit"><img src="https://img.shields.io/codecov/c/gh/vapor/console-kit?style=plastic&logo=codecov&label=codecov&token=FroD9hgbSC"></a>
14-
<a href="https://swift.org"><img src="https://design.vapor.codes/images/swift58up.svg" alt="Swift 5.8+"></a>
8+
<a href="https://github.com/vapor/console-kit/actions/workflows/test.yml"><img src="https://img.shields.io/github/actions/workflow/status/vapor/console-kit/test.yml?event=push&style=plastic&logo=github&label=tests&logoColor=ccc" alt="Continuous Integration"></a>
9+
<a href="https://codecov.io/gh/vapor/console-kit"><img src="https://img.shields.io/codecov/c/gh/vapor/console-kit?style=plastic&logo=codecov&label=codecov" alt="Code Coverage"></a>
10+
<a href="https://swift.org"><img src="https://design.vapor.codes/images/swift61up.svg" alt="Swift 6.1+"></a>
1511
</p>
1612
<br>
13+
Utilities for interacting with a terminal and the commandline in a Swift application.
Lines changed: 17 additions & 13 deletions
Loading

Sources/ConsoleKit/Docs.docc/theme-settings.json

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,21 @@
11
{
22
"theme": {
3-
"aside": { "border-radius": "16px", "border-style": "double", "border-width": "3px" },
3+
"aside": { "border-radius": "16px", "border-width": "3px", "border-style": "double" },
44
"border-radius": "0",
55
"button": { "border-radius": "16px", "border-width": "1px", "border-style": "solid" },
66
"code": { "border-radius": "16px", "border-width": "1px", "border-style": "solid" },
77
"color": {
88
"consolekit": "#392048",
9-
"documentation-intro-fill": "radial-gradient(circle at top, var(--color-consolekit) 30%, #000 100%)",
9+
"documentation-intro-fill": "radial-gradient(circle at top, var(--color-consolekit) 30%, #000 100%)",
1010
"documentation-intro-accent": "var(--color-consolekit)",
11+
"hero-eyebrow": "white",
12+
"documentation-intro-figure": "white",
13+
"hero-title": "white",
1114
"logo-base": { "dark": "#fff", "light": "#000" },
1215
"logo-shape": { "dark": "#000", "light": "#fff" },
1316
"fill": { "dark": "#000", "light": "#fff" }
1417
},
15-
"icons": { "technology": "/consolekit/images/vapor-consolekit-logo.svg" }
18+
"icons": { "technology": "/consolekit/images/ConsoleKit/vapor-consolekit-logo.svg" }
1619
},
1720
"features": {
1821
"quickNavigation": { "enable": true },

Sources/ConsoleKitCommands/Async/GenerateAsyncAutocompleteCommand.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import ConsoleKitTerminal
12
import Foundation
23

34
struct GenerateAsyncAutocompleteCommand: AsyncCommand {

Sources/ConsoleKitCommands/Completion/Completion.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import Foundation
2+
13
/// Shell completion implementations.
24
public enum Shell: String, LosslessStringConvertible, CaseIterable, Sendable {
35
case bash

Sources/ConsoleKitCommands/Completion/GenerateAutocompleteCommand.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import ConsoleKitTerminal
12
import Foundation
23

34
struct GenerateAutocompleteCommand: Command {

0 commit comments

Comments
 (0)