Skip to content

Commit 7be7787

Browse files
authored
Merge branch 'main' into update-ci
2 parents 78a1d68 + 8ffc4df commit 7be7787

File tree

163 files changed

+962
-750
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

163 files changed

+962
-750
lines changed

.github/workflows/format.yml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,16 @@ concurrency:
1212
jobs:
1313
swift_format:
1414
name: swift-format
15-
runs-on: macos-13
15+
runs-on: macos-15
16+
permissions:
17+
contents: write
1618
steps:
1719
- uses: actions/checkout@v4
18-
- name: Select Xcode 14.3
19-
run: sudo xcode-select -s /Applications/Xcode_14.3.app
20-
- name: Install swift-format
21-
run: brew install swift-format
20+
- name: Select Xcode 16.2
21+
run: sudo xcode-select -s /Applications/Xcode_16.2.app
2222
- name: Format
2323
run: make format
24-
- uses: stefanzweifel/git-auto-commit-action@v4
24+
- uses: stefanzweifel/git-auto-commit-action@v5
2525
with:
2626
commit_message: Run swift-format
2727
branch: 'main'
28-
env:
29-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@
55
/*.swiftinterface
66
/*.xcodeproj
77
xcuserdata/
8+
.docc-build/

ComposableArchitecture.xcworkspace/xcshareddata/swiftpm/Package.resolved

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Examples/SyncUps/SyncUps/Dependencies/SpeechRecognizer.swift

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,12 @@ extension SpeechClient: DependencyKey {
3333
}
3434

3535
static var previewValue: SpeechClient {
36-
let isRecording = LockIsolated(false)
37-
return Self(
36+
Self(
3837
authorizationStatus: { .authorized },
3938
requestAuthorization: { .authorized },
4039
startTask: { _ in
4140
AsyncThrowingStream { continuation in
4241
Task { @MainActor in
43-
isRecording.setValue(true)
4442
var finalText = """
4543
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor \
4644
incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud \
@@ -50,7 +48,7 @@ extension SpeechClient: DependencyKey {
5048
officia deserunt mollit anim id est laborum.
5149
"""
5250
var text = ""
53-
while isRecording.value {
51+
while !finalText.isEmpty {
5452
let word = finalText.prefix { $0 != " " }
5553
try await Task.sleep(for: .milliseconds(word.count * 50 + .random(in: 0...200)))
5654
finalText.removeFirst(word.count)

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ format:
6464
-path '*/Documentation.docc' -prune -o \
6565
-name '*.swift' \
6666
-not -path '*/.*' -print0 \
67-
| xargs -0 swift format --ignore-unparsable-files --in-place
67+
| xargs -0 xcrun swift-format --ignore-unparsable-files --in-place
6868

6969
.PHONY: build-for-library-evolution format warm-simulator xcodebuild xcodebuild-raw
7070

Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ let package = Package(
2626
.package(url: "https://github.com/pointfreeco/swift-dependencies", from: "1.4.0"),
2727
.package(url: "https://github.com/pointfreeco/swift-identified-collections", from: "1.1.0"),
2828
.package(url: "https://github.com/pointfreeco/swift-macro-testing", from: "0.2.0"),
29-
.package(url: "https://github.com/pointfreeco/swift-navigation", from: "2.2.2"),
29+
.package(url: "https://github.com/pointfreeco/swift-navigation", from: "2.3.0"),
3030
.package(url: "https://github.com/pointfreeco/swift-perception", from: "1.3.4"),
3131
.package(url: "https://github.com/pointfreeco/swift-sharing", "0.1.2"..<"3.0.0"),
3232
.package(url: "https://github.com/pointfreeco/xctest-dynamic-overlay", from: "1.3.0"),

[email protected]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ let package = Package(
2626
.package(url: "https://github.com/pointfreeco/swift-dependencies", from: "1.4.0"),
2727
.package(url: "https://github.com/pointfreeco/swift-identified-collections", from: "1.1.0"),
2828
.package(url: "https://github.com/pointfreeco/swift-macro-testing", from: "0.2.0"),
29-
.package(url: "https://github.com/pointfreeco/swift-navigation", from: "2.2.2"),
29+
.package(url: "https://github.com/pointfreeco/swift-navigation", from: "2.3.0"),
3030
.package(url: "https://github.com/pointfreeco/swift-perception", from: "1.3.4"),
3131
.package(url: "https://github.com/pointfreeco/swift-sharing", "0.1.2"..<"3.0.0"),
3232
.package(url: "https://github.com/pointfreeco/xctest-dynamic-overlay", from: "1.3.0"),

README.md

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,14 @@
77

88
The Composable Architecture (TCA, for short) is a library for building applications in a consistent
99
and understandable way, with composition, testing, and ergonomics in mind. It can be used in
10-
SwiftUI, UIKit, and more, and on any Apple platform (iOS, macOS, visionOS, tvOS, and watchOS).
10+
SwiftUI, UIKit, and more, and on any Apple platform (iOS, macOS, iPadOS, visionOS, tvOS, and watchOS).
1111

1212
* [What is the Composable Architecture?](#what-is-the-composable-architecture)
1313
* [Learn more](#learn-more)
1414
* [Examples](#examples)
1515
* [Basic usage](#basic-usage)
1616
* [Documentation](#documentation)
17+
* [FAQ](#faq)
1718
* [Community](#community)
1819
* [Installation](#installation)
1920
* [Translations](#translations)
@@ -575,6 +576,11 @@ comfortable with the library:
575576
* [Concurrency][concurrency-article]
576577
* [Bindings][bindings-article]
577578

579+
## FAQ
580+
581+
We have a [dedicated article][faq-article] for all of the most frequently asked questions and
582+
comments people have concerning the library.
583+
578584
## Community
579585

580586
If you want to discuss the Composable Architecture or have a question about how to use it to solve
@@ -633,17 +639,13 @@ The following translations of this README have been contributed by members of th
633639
* [Russian](https://gist.github.com/SubvertDev/3317d0c3b35ed601be330d6fc0df5aba)
634640
* [Simplified Chinese](https://gist.github.com/sh3l6orrr/10c8f7c634a892a9c37214f3211242ad)
635641
* [Spanish](https://gist.github.com/pitt500/f5e32fccb575ce112ffea2827c7bf942)
642+
* [Turkish](https://gist.github.com/gokhanamal/93001244ef0c1cec58abeb1afc0de37c)
636643
* [Ukrainian](https://gist.github.com/barabashd/33b64676195ce41f4bb73c327ea512a8)
637644

638645
If you'd like to contribute a translation, please [open a
639646
PR](https://github.com/pointfreeco/swift-composable-architecture/edit/main/README.md) with a link
640647
to a [Gist](https://gist.github.com)!
641648

642-
## FAQ
643-
644-
We have a [dedicated article][faq-article] for all of the most frequently asked questions and
645-
comments people have concerning the library.
646-
647649
## Credits and thanks
648650

649651
The following people gave feedback on the library at its early stages and helped make the library

Sources/ComposableArchitecture/Documentation.docc/Articles/FAQ.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ However, one does not need to have any prior experience with these concepts. The
217217
[dependency-management-article]: <doc:DependencyManagement>
218218
[sharing-state-article]: <doc:SharingState>
219219
[navigation-article]: <doc:Navigation>
220-
[testing-article]: <doc:Testing>
220+
[testing-article]: <doc:TestingTCA>
221221
[migration-1.7-article]: <doc:MigratingTo1.7>
222222
[migration-1.10-article]: <doc:MigratingTo1.10>
223223
[sync-ups-tutorial]: <doc:BuildingSyncUps>

Sources/ComposableArchitecture/Documentation.docc/Articles/GettingStarted.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ doing much additional work.
252252

253253
## Testing your feature
254254

255-
> Note: For more in-depth information on testing, see the dedicated <doc:Testing>
255+
> Note: For more in-depth information on testing, see the dedicated <doc:TestingTCA>
256256
article.
257257

258258
To test use a `TestStore`, which can be created with the same information as the `Store`, but it
@@ -464,7 +464,7 @@ let store = TestStore(initialState: Feature.State()) {
464464

465465
That is the basics of building and testing a feature in the Composable Architecture. There are
466466
_a lot_ more things to be explored. Be sure to check out the <doc:MeetComposableArchitecture>
467-
tutorial, as well as dedicated articles on <doc:DependencyManagement>, <doc:Testing>,
467+
tutorial, as well as dedicated articles on <doc:DependencyManagement>, <doc:TestingTCA>,
468468
<doc:Navigation>, <doc:Performance>, and more. Also, the [Examples][examples] directory has
469469
a bunch of projects to explore to see more advanced usages.
470470

0 commit comments

Comments
 (0)