Skip to content

Commit b1e0476

Browse files
committed
🔀️ Merge branch 'release/LekaApp/1.9.0'
2 parents 45433d8 + d02bff8 commit b1e0476

74 files changed

Lines changed: 692 additions & 327 deletions

File tree

Some content is hidden

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

.github/workflows/ci-tuist-build.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,12 @@ on:
1010
- develop
1111
paths:
1212
- "**/*.swift"
13+
- ".mise.toml"
1314
pull_request:
1415
types: [opened, synchronize, reopened]
1516
paths:
1617
- "**/*.swift"
18+
- ".mise.toml"
1719

1820
concurrency:
1921
group: ${{ github.workflow }}-${{ github.ref }}
@@ -55,7 +57,7 @@ jobs:
5557
TUIST_TURN_OFF_LINTERS=${{ env.TUIST_TURN_OFF_LINTERS }} \
5658
TUIST_GENERATE_MODULES_AS_FRAMEWORKS_FOR_DEBUG=${{ env.TUIST_GENERATE_MODULES_AS_FRAMEWORKS_FOR_DEBUG }} \
5759
TUIST_DEVELOPER_MODE=${{ matrix.TUIST_DEVELOPER_MODE }} \
58-
tuist generate -n
60+
tuist generate --no-open
5961
6062
- name: tuist build
6163
run: |

.github/workflows/ci-tuist-unit_tests.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,12 @@ on:
1010
- develop
1111
paths:
1212
- "**/*.swift"
13+
- ".mise.toml"
1314
pull_request:
1415
types: [opened, synchronize, reopened]
1516
paths:
1617
- "**/*.swift"
18+
- ".mise.toml"
1719

1820
concurrency:
1921
group: ${{ github.workflow }}-${{ github.ref }}
@@ -44,7 +46,7 @@ jobs:
4446
4547
- name: tuist generate
4648
run: |
47-
tuist generate -n
49+
tuist generate --no-open
4850
4951
- name: tuist test
5052
run: |

.mise.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
[tools]
2-
tuist = "4.15.0"
2+
tuist = "4.20.0"
33
swiftlint = "0.55.1"
4-
swiftformat = "0.53.10"
4+
swiftformat = "0.54.0"

Apps/LekaApp/Project.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ let kLekaAppVersion: String = {
1313
}
1414

1515
// ? App version
16-
return "1.8.1"
16+
return "1.9.0"
1717
}()
1818

1919
let project = Project.app(

Apps/LekaApp/Sources/Navigation/Navigation+Category.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ extension Navigation {
1818
case caregivers
1919
case carereceivers
2020

21-
// ? DEVELOPER_MODE
21+
// ? DEVELOPER_MODE + TESTFLIGHT_BUILD
2222
case allPublishedActivities
2323
case allDraftActivities
2424
case allTemplateActivities

Apps/LekaApp/Sources/Views/MainView/MainView.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ struct MainView: View {
7878
}
7979
}
8080

81-
#if DEVELOPER_MODE
81+
#if DEVELOPER_MODE || TESTFLIGHT_BUILD
8282
Section("Developer Mode") {
8383
CategoryLabel(category: .allTemplateActivities)
8484
CategoryLabel(category: .allDraftActivities)
@@ -143,7 +143,7 @@ struct MainView: View {
143143
case .carereceivers:
144144
CarereceiverList()
145145

146-
// ? DEVELOPER_MODE
146+
// ? DEVELOPER_MODE + TESTFLIGHT_BUILD
147147
case .allPublishedActivities:
148148
AllPublishedActivitiesView()
149149

Examples/iOSApp/Project.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,6 @@ let project = Project.app(
1111
name: "iOSApp",
1212
dependencies: [
1313
.project(target: "Module", path: Path("../../Examples/Module")),
14+
.external(name: "SFSymbolsMacro"),
1415
]
1516
)

Examples/iOSApp/Sources/ContentView.swift

Lines changed: 27 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,42 @@
33
// SPDX-License-Identifier: Apache-2.0
44

55
import Module
6+
import SFSymbolsMacro
67
import SwiftUI
78

9+
// MARK: - Symbols
10+
11+
@SFSymbol
12+
enum Symbols: String {
13+
case circle
14+
case circleFill = "circle.fill"
15+
case shareIcon = "square.and.arrow.up"
16+
case globe
17+
}
18+
819
// MARK: - ContentView
920

1021
struct ContentView: View {
1122
var body: some View {
12-
HelloView(color: .mint, name: "iOS App Example")
23+
ZStack {
24+
Color.teal
25+
.edgesIgnoringSafeArea(.all)
26+
27+
VStack(spacing: 20) {
28+
Image(systemName: Symbols.globe())
29+
.font(.largeTitle)
30+
.foregroundStyle(.white)
31+
32+
Text("Hello, Macros!")
33+
.font(.largeTitle)
34+
.foregroundStyle(.white)
35+
}
36+
}
1337
}
1438
}
1539

1640
// MARK: - ContentView_Previews
1741

18-
struct ContentView_Previews: PreviewProvider {
19-
static var previews: some View {
20-
ContentView()
21-
}
42+
#Preview {
43+
ContentView()
2244
}

Modules/AccountKit/Sources/Database/DatabaseDocumentProtocols.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,4 @@ public protocol ActivityCompletionDataDocument: DatabaseDocument {
2525
var carereceiverIDs: [String] { get set }
2626
var startTimestamp: Date? { get set }
2727
var endTimestamp: Date? { get set }
28-
var completionData: String { get set }
2928
}

Modules/AccountKit/Sources/Extensions/ActivityCompletionData+Codable.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ extension ActivityCompletionData: Codable {
1414
carereceiverIDs = try container.decode([String].self, forKey: .carereceiverIDs)
1515
startTimestamp = try container.decodeIfPresent(Date.self, forKey: .startTimestamp)
1616
endTimestamp = try container.decodeIfPresent(Date.self, forKey: .endTimestamp)
17-
completionData = try container.decode(String.self, forKey: .completionData)
1817
}
1918

2019
public func encode(to encoder: Encoder) throws {
@@ -26,6 +25,5 @@ extension ActivityCompletionData: Codable {
2625
try container.encode(carereceiverIDs, forKey: .carereceiverIDs)
2726
try container.encodeIfPresent(startTimestamp, forKey: .startTimestamp)
2827
try container.encodeIfPresent(endTimestamp, forKey: .endTimestamp)
29-
try container.encode(completionData, forKey: .completionData)
3028
}
3129
}

0 commit comments

Comments
 (0)