Skip to content

Commit 66ca52c

Browse files
shendy/swift6 upgrade dependencies (#7)
* upgrade AppState to 2.0.0 * fix: Call to main actor-isolated initializer * Update macOS.yml * Fix test --------- Co-authored-by: Zach <zmeriksen@icloud.com>
1 parent ad8917c commit 66ca52c

File tree

5 files changed

+26
-17
lines changed

5 files changed

+26
-17
lines changed

.github/workflows/macOS.yml

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,20 @@
1-
# This workflow will build a Swift project
2-
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-swift
3-
41
name: macOS
52

63
on:
74
push:
8-
branches: ["**"]
5+
branches: [ "main" ]
6+
pull_request:
7+
branches: [ "main" ]
98

109
jobs:
1110
build:
12-
runs-on: macos-13
13-
11+
runs-on: macos-latest
1412
steps:
15-
- uses: swift-actions/setup-swift@v1
16-
- uses: maxim-lobanov/setup-xcode@v1
17-
with:
18-
xcode-version: latest-stable
19-
- uses: actions/checkout@v3
20-
- name: Build for release
21-
run: swift build -v -c release
22-
- name: Test
23-
run: swift test -v
13+
- uses: maxim-lobanov/setup-xcode@v1
14+
with:
15+
xcode-version: 16.0
16+
- uses: actions/checkout@v3
17+
- name: Build
18+
run: swift build -v
19+
- name: Run tests
20+
run: swift test -v

Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ let package = Package(
1818
)
1919
],
2020
dependencies: [
21-
.package(url: "https://github.com/0xLeif/AppState.git", from: "1.0.0")
21+
.package(url: "https://github.com/0xLeif/AppState.git", from: "2.0.0")
2222
],
2323
targets: [
2424
.target(

Sources/FeedbackKit/FeedbackStore.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import Cache
33
import Foundation
44

55
extension Application {
6+
@MainActor
67
fileprivate var storedFeedback: FileState<[UUID: Feedback]> {
78
fileState(initial: [:], filename: "storedFeedback")
89
}

Sources/FeedbackKit/FeedbackViewModel.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import Combine
22
import SwiftUI
33

4+
@MainActor
45
class FeedbackViewModel: ObservableObject {
56
private var bag: Set<AnyCancellable>
67

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,20 @@
11
import XCTest
22
@testable import FeedbackKit
33

4+
@MainActor
45
final class FeedbackKitTests: XCTestCase {
56
func testExample() throws {
67
let store = FeedbackStore()
78

8-
9+
let feedback = Feedback(type: .comment, title: "Cool", description: "Feedback", state: .open)
10+
11+
store.set(feedback: feedback)
12+
13+
let storedFeedback = try XCTUnwrap(store.get(id: feedback.id))
14+
15+
XCTAssertEqual(storedFeedback.type, storedFeedback.type)
16+
XCTAssertEqual(storedFeedback.title, storedFeedback.title)
17+
XCTAssertEqual(storedFeedback.description, storedFeedback.description)
18+
XCTAssertEqual(storedFeedback.state, storedFeedback.state)
919
}
1020
}

0 commit comments

Comments
 (0)