Skip to content

Commit 1a0c3f9

Browse files
authored
Bump Xcode settings (pointfreeco#2042)
* Bump Xcode settings We had some warnings related to new Xcode 14.3 settings. * wip
1 parent 10c543d commit 1a0c3f9

File tree

15 files changed

+63
-56
lines changed

15 files changed

+63
-56
lines changed

ComposableArchitecture.xcworkspace/xcshareddata/swiftpm/Package.resolved

+2-2
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@
5959
"kind" : "remoteSourceControl",
6060
"location" : "https://github.com/pointfreeco/swift-custom-dump",
6161
"state" : {
62-
"revision" : "21404fead4398c148183e5eb8ba52305c4e9ca8a",
63-
"version" : "0.10.1"
62+
"revision" : "84b30e1af72e0ffe6dfbfe39d53b8173caacf224",
63+
"version" : "0.10.2"
6464
}
6565
},
6666
{

ComposableArchitecture.xcworkspace/xcshareddata/xcschemes/ComposableArchitecture.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1240"
3+
LastUpgradeVersion = "1430"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

ComposableArchitecture.xcworkspace/xcshareddata/xcschemes/swift-composable-architecture-benchmark.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1250"
3+
LastUpgradeVersion = "1430"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

Examples/CaseStudies/CaseStudies.xcodeproj/project.pbxproj

+3-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 52;
6+
objectVersion = 53;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -593,8 +593,9 @@
593593
DC89C40B24460F95006900B9 /* Project object */ = {
594594
isa = PBXProject;
595595
attributes = {
596+
BuildIndependentTargetsInParallel = YES;
596597
LastSwiftUpdateCheck = 1150;
597-
LastUpgradeCheck = 1240;
598+
LastUpgradeCheck = 1430;
598599
ORGANIZATIONNAME = "Point-Free";
599600
TargetAttributes = {
600601
CAF88E6F24B8E26D00539345 = {

Examples/CaseStudies/CaseStudies.xcodeproj/xcshareddata/xcschemes/CaseStudies (SwiftUI).xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1240"
3+
LastUpgradeVersion = "1430"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

Examples/CaseStudies/CaseStudies.xcodeproj/xcshareddata/xcschemes/CaseStudies (UIKit).xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1240"
3+
LastUpgradeVersion = "1430"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

Examples/CaseStudies/CaseStudies.xcodeproj/xcshareddata/xcschemes/tvOSCaseStudies.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1320"
3+
LastUpgradeVersion = "1430"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

Examples/Integration/Integration.xcodeproj/xcshareddata/xcschemes/Integration.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1420"
3+
LastUpgradeVersion = "1430"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

Examples/Search/Search.xcodeproj/xcshareddata/xcschemes/Search.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1240"
3+
LastUpgradeVersion = "1430"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

Examples/SpeechRecognition/SpeechRecognition.xcodeproj/xcshareddata/xcschemes/SpeechRecognition.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1240"
3+
LastUpgradeVersion = "1430"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

Examples/TicTacToe/TicTacToe.xcodeproj/xcshareddata/xcschemes/TicTacToe.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1240"
3+
LastUpgradeVersion = "1430"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

Examples/Todos/Todos.xcodeproj/xcshareddata/xcschemes/Todos.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1240"
3+
LastUpgradeVersion = "1430"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

Examples/VoiceMemos/VoiceMemos.xcodeproj/project.pbxproj

+3-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 52;
6+
objectVersion = 53;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -209,8 +209,9 @@
209209
DC5BDCA224589177009C65A3 /* Project object */ = {
210210
isa = PBXProject;
211211
attributes = {
212+
BuildIndependentTargetsInParallel = YES;
212213
LastSwiftUpdateCheck = 1140;
213-
LastUpgradeCheck = 1240;
214+
LastUpgradeCheck = 1430;
214215
ORGANIZATIONNAME = "Point-Free";
215216
TargetAttributes = {
216217
DC5BDCA924589177009C65A3 = {

Examples/VoiceMemos/VoiceMemos.xcodeproj/xcshareddata/xcschemes/VoiceMemos.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1240"
3+
LastUpgradeVersion = "1430"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

Tests/ComposableArchitectureTests/EffectRunTests.swift

+44-39
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import Combine
22
import ComposableArchitecture
3+
@_spi(Concurrency) import Dependencies
34
import XCTest
45

56
@MainActor
@@ -43,34 +44,36 @@ final class EffectRunTests: BaseTCATestCase {
4344

4445
#if DEBUG
4546
func testRunUnhandledFailure() async {
46-
var line: UInt!
47-
XCTExpectFailure(nil, enabled: nil, strict: nil) {
48-
$0.compactDescription == """
47+
await withMainSerialExecutor {
48+
var line: UInt!
49+
XCTExpectFailure(nil, enabled: nil, strict: nil) {
50+
$0.compactDescription == """
4951
An "EffectTask.run" returned from "\(#fileID):\(line+1)" threw an unhandled error. …
5052
5153
EffectRunTests.Failure()
5254
5355
All non-cancellation errors must be explicitly handled via the "catch" parameter on \
5456
"EffectTask.run", or via a "do" block.
5557
"""
56-
}
57-
struct State: Equatable {}
58-
enum Action: Equatable { case tapped, response }
59-
let reducer = Reduce<State, Action> { state, action in
60-
switch action {
61-
case .tapped:
62-
line = #line
63-
return .run { send in
64-
struct Failure: Error {}
65-
throw Failure()
58+
}
59+
struct State: Equatable {}
60+
enum Action: Equatable { case tapped, response }
61+
let reducer = Reduce<State, Action> { state, action in
62+
switch action {
63+
case .tapped:
64+
line = #line
65+
return .run { send in
66+
struct Failure: Error {}
67+
throw Failure()
68+
}
69+
case .response:
70+
return .none
6671
}
67-
case .response:
68-
return .none
6972
}
73+
let store = TestStore(initialState: State(), reducer: reducer)
74+
// NB: We wait a long time here because XCTest failures take a long time to generate
75+
await store.send(.tapped).finish(timeout: 5 * NSEC_PER_SEC)
7076
}
71-
let store = TestStore(initialState: State(), reducer: reducer)
72-
// NB: We wait a long time here because XCTest failures take a long time to generate
73-
await store.send(.tapped).finish(timeout: 5 * NSEC_PER_SEC)
7477
}
7578
#endif
7679

@@ -120,8 +123,9 @@ final class EffectRunTests: BaseTCATestCase {
120123

121124
#if DEBUG
122125
func testRunEscapeFailure() async throws {
123-
XCTExpectFailure {
124-
$0.compactDescription == """
126+
try await withMainSerialExecutor {
127+
XCTExpectFailure {
128+
$0.compactDescription == """
125129
An action was sent from a completed effect:
126130
127131
Action:
@@ -136,32 +140,33 @@ final class EffectRunTests: BaseTCATestCase {
136140
To fix this, make sure that your 'run' closure does not return until you're done calling \
137141
'send'.
138142
"""
139-
}
143+
}
140144

141-
enum Action { case tap, response }
145+
enum Action { case tap, response }
142146

143-
let queue = DispatchQueue.test
147+
let queue = DispatchQueue.test
144148

145-
let store = Store(
146-
initialState: 0,
147-
reducer: Reduce<Int, Action> { _, action in
148-
switch action {
149-
case .tap:
150-
return .run { send in
151-
Task(priority: .userInitiated) {
152-
try await queue.sleep(for: .seconds(1))
153-
await send(.response)
149+
let store = Store(
150+
initialState: 0,
151+
reducer: Reduce<Int, Action> { _, action in
152+
switch action {
153+
case .tap:
154+
return .run { send in
155+
Task(priority: .userInitiated) {
156+
try await queue.sleep(for: .seconds(1))
157+
await send(.response)
158+
}
154159
}
160+
case .response:
161+
return .none
155162
}
156-
case .response:
157-
return .none
158163
}
159-
}
160-
)
164+
)
161165

162-
let viewStore = ViewStore(store, observe: { $0 })
163-
await viewStore.send(.tap).finish()
164-
await queue.advance(by: .seconds(1))
166+
let viewStore = ViewStore(store, observe: { $0 })
167+
await viewStore.send(.tap).finish()
168+
await queue.advance(by: .seconds(1))
169+
}
165170
}
166171

167172
func testRunEscapeFailurePublisher() async throws {

0 commit comments

Comments
 (0)