Merged
Conversation
- Update package to Swift 6.0, macOS v15 - Remove dependency on SwiftNIO (used only for `NIOLockedValueBox`, replaced by `Mutex`) - Add Android CI
…210) * Start migration to Swift Testing * Remove deprecated * Update `ActivityIndicator` for async/await * Add `withActivityIndicator` * Remove integration tests * Improve DocC * Adopt `swift-format`
* Remove Foundation * Use `Android` instead of `Bionic` * Add `"InternalImportsByDefault"` * Add `@preconcurrency` to imports and check `#if canImport(Darwin)`
* Make `stylize` public * Add `consoleText(_:)` to `Character` * Update parameter label * Move activity tests * Add new `center()` overload * Add `output(key:value:) * Improve `output(key:value:)` * Add `output()` for array of `ConsoleText` * Add `center()` for a single `ConsoleText` * Improve `stylized()` name * Add a lot of tests * Make the linter happy * Fix DocC * Remove `Character.consoleText()` * Remove test for `Character.consoleText()` * Rename `stylized()` to `consoleStylized()` * Remove superfluous APIs * Remove superfluous tests * Remove `output(key:value:)` * Improve APIs * Revert dumb idea
* Fail the activity indicator when the task fails * Add a title to CustomActivity * Fix activity indicator bug * Remove `@testable` * Add `titleAfterIndicator` to `CustomActivity` * Add `withActivityIndicator` convenience wrapper to `ProgressBar`
* Remove `ConsoleFragmentLogger` and add `ConsoleLogger` package trait * Move `LogRecord` to its own file * Move `ConsoleLogger` to its own target * Update README and DocC * Small fix in DocC * Move the default `LoggerFragment`s inside an extension * Revert `ConsoleLoggerExample` * Enable Windows CI * Apply suggestion from @gwynne Co-authored-by: Gwynne Raskind <gwynne@darkrainfall.org> * Apply suggestion from @gwynne Co-authored-by: Gwynne Raskind <gwynne@darkrainfall.org> * Apply suggestion from @gwynne Co-authored-by: Gwynne Raskind <gwynne@darkrainfall.org> * Apply suggestion from @gwynne Co-authored-by: Gwynne Raskind <gwynne@darkrainfall.org> * Apply suggestion from @gwynne Co-authored-by: Gwynne Raskind <gwynne@darkrainfall.org> * Apply suggestion from @gwynne Co-authored-by: Gwynne Raskind <gwynne@darkrainfall.org> * Apply suggestion from @gwynne Co-authored-by: Gwynne Raskind <gwynne@darkrainfall.org> * Apply suggestion from @gwynne Co-authored-by: Gwynne Raskind <gwynne@darkrainfall.org> * Duplicate `TestConsole`, formatting and typo fixes * Update Sources/ConsoleLogger/ConsoleLogger.swift Co-authored-by: Gwynne Raskind <gwynne@darkrainfall.org> * Update Sources/ConsoleLogger/ConsoleLogger.swift Co-authored-by: Gwynne Raskind <gwynne@darkrainfall.org> * Update Sources/ConsoleLogger/ConsoleLogger.swift Co-authored-by: Gwynne Raskind <gwynne@darkrainfall.org> * Fix tests and `NonisolatedNonsendingByDefault` --------- Co-authored-by: Gwynne Raskind <gwynne@darkrainfall.org>
* Add Benchmarks for ConsoleLogger * Address requested changes * Remove `.gitignore` symlink * Add `.gitignore` to Benchmarks
* Remove `ConsoleFragmentLogger` and add `ConsoleLogger` package trait * Move `LogRecord` to its own file * Move `ConsoleLogger` to its own target * Update README and DocC * Small fix in DocC * Move the default `LoggerFragment`s inside an extension * Revert `ConsoleLoggerExample` * Introducing `LoggerFragmentBuilder` * Enable Windows CI * Enable Windows CI * Apply suggestion from @gwynne Co-authored-by: Gwynne Raskind <gwynne@darkrainfall.org> * Apply suggestion from @gwynne Co-authored-by: Gwynne Raskind <gwynne@darkrainfall.org> * Apply suggestion from @gwynne Co-authored-by: Gwynne Raskind <gwynne@darkrainfall.org> * Apply suggestion from @gwynne Co-authored-by: Gwynne Raskind <gwynne@darkrainfall.org> * Apply suggestion from @gwynne Co-authored-by: Gwynne Raskind <gwynne@darkrainfall.org> * Apply suggestion from @gwynne Co-authored-by: Gwynne Raskind <gwynne@darkrainfall.org> * Apply suggestion from @gwynne Co-authored-by: Gwynne Raskind <gwynne@darkrainfall.org> * Apply suggestion from @gwynne Co-authored-by: Gwynne Raskind <gwynne@darkrainfall.org> * Duplicate `TestConsole`, formatting and typo fixes * Update Sources/ConsoleLogger/ConsoleLogger.swift Co-authored-by: Gwynne Raskind <gwynne@darkrainfall.org> * Update Sources/ConsoleLogger/ConsoleLogger.swift Co-authored-by: Gwynne Raskind <gwynne@darkrainfall.org> * Update Sources/ConsoleLogger/ConsoleLogger.swift Co-authored-by: Gwynne Raskind <gwynne@darkrainfall.org> * Fix tests and `NonisolatedNonsendingByDefault` * Add benchmarks for `LoggerFragmentBuilder` * Fix DocC * Add DocC article on ConsoleLogger * Relocate `SpacedFragment` --------- Co-authored-by: Gwynne Raskind <gwynne@darkrainfall.org>
* Remove `ConsoleKit` from `ConsoleLogger` * Enable testing via `ConsoleLoggerPrinter` protocol * Make `ConsoleLoggerPrinter` public
* Adopt Swift Configuration * Update to Swift 6.2
* Use supsending clock in ActivityIndicator * Add test for task cancellation
Remove duplicate Swift features
* Add a default `ConfigReader` to `bootstrapWithConfigReader` * Add default ConfigReader package trait
* Cherry-pick the update for swift-log 1.11.0 from main * Add Windows and Android CI
Co-authored-by: Tim Condon <0xTim@users.noreply.github.com>
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
Member
Author
|
@fpseverino any idea what we need to do to get this mergeable? |
Member
I’m away from my machine, so I can’t see the conflicts, but I doubt my Git skills are up to scratch. We removed a lot of code and refactored the repo a lot |
Member
|
I can take a whack at it. |
# Conflicts: # .github/workflows/test.yml # Package.swift # README.md # Sources/ConsoleKit/Terminal/ANSI.swift # Sources/ConsoleKit/Terminal/Terminal.swift # Sources/ConsoleKitCommands/Async/GenerateAsyncAutocompleteCommand.swift # Sources/ConsoleKitCommands/Completion/Completion.swift # Sources/ConsoleKitCommands/Completion/GenerateAutocompleteCommand.swift # Sources/ConsoleKitCommands/Docs.docc/images/vapor-consolekit-logo.svg # Sources/ConsoleKitTerminal/Docs.docc/images/vapor-consolekit-logo.svg # Sources/ConsoleKitTerminal/Docs.docc/theme-settings.json # Sources/ConsoleKitTerminal/Terminal/Console.swift # Sources/ConsoleKitTerminal/Utilities/ConsoleLogger.swift # Sources/ConsoleLogger/Docs.docc/theme-settings.json # Sources/ConsoleLogger/LoggerFragments/LoggerFragment.swift # Tests/AsyncConsoleKitTests/AsyncUtilities.swift # Tests/ConsoleKitTests/LoggingTests.swift # Tests/ConsoleKitTests/Utilities.swift
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.