Skip to content

Commit af4c806

Browse files
mluisbrownmluisbrown
authored
Merge pull request #10 from trading-point/michael/sync-upstream-0.5.0
Bring up to date with 0.5.0 of Pointfree TCA
2 parents 3d6ff8f + 492d1e0 commit af4c806

File tree

33 files changed

+1693
-479
lines changed

33 files changed

+1693
-479
lines changed

‎.swiftpm/xcode/xcshareddata/xcschemes/ComposableCoreMotion.xcscheme‎

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1150"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "ComposableCoreMotion"
18+
BuildableName = "ComposableCoreMotion"
19+
BlueprintName = "ComposableCoreMotion"
20+
ReferencedContainer = "container:">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
24+
</BuildAction>
25+
<TestAction
26+
buildConfiguration = "Debug"
27+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<Testables>
31+
<TestableReference
32+
skipped = "NO">
33+
<BuildableReference
34+
BuildableIdentifier = "primary"
35+
BlueprintIdentifier = "ComposableCoreMotionTests"
36+
BuildableName = "ComposableCoreMotionTests"
37+
BlueprintName = "ComposableCoreMotionTests"
38+
ReferencedContainer = "container:">
39+
</BuildableReference>
40+
</TestableReference>
41+
</Testables>
42+
</TestAction>
43+
<LaunchAction
44+
buildConfiguration = "Debug"
45+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
46+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
47+
launchStyle = "0"
48+
useCustomWorkingDirectory = "NO"
49+
ignoresPersistentStateOnLaunch = "NO"
50+
debugDocumentVersioning = "YES"
51+
debugServiceExtension = "internal"
52+
allowLocationSimulation = "YES">
53+
</LaunchAction>
54+
<ProfileAction
55+
buildConfiguration = "Release"
56+
shouldUseLaunchSchemeArgsEnv = "YES"
57+
savedToolIdentifier = ""
58+
useCustomWorkingDirectory = "NO"
59+
debugDocumentVersioning = "YES">
60+
<MacroExpansion>
61+
<BuildableReference
62+
BuildableIdentifier = "primary"
63+
BlueprintIdentifier = "ComposableCoreMotion"
64+
BuildableName = "ComposableCoreMotion"
65+
BlueprintName = "ComposableCoreMotion"
66+
ReferencedContainer = "container:">
67+
</BuildableReference>
68+
</MacroExpansion>
69+
</ProfileAction>
70+
<AnalyzeAction
71+
buildConfiguration = "Debug">
72+
</AnalyzeAction>
73+
<ArchiveAction
74+
buildConfiguration = "Release"
75+
revealArchiveInOrganizer = "YES">
76+
</ArchiveAction>
77+
</Scheme>

‎Examples/CaseStudies/UIKitCaseStudiesTests/UIKitCaseStudiesTests.swift‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,4 @@ import XCTest
33
@testable import UIKitCaseStudies
44

55
class UIKitCaseStudiesTests: XCTestCase {
6-
func testExample() {
7-
}
86
}

‎Examples/MotionManager/MotionManager.xcodeproj/project.pbxproj‎

Lines changed: 15 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,8 @@
1010
5A405A2E244F410F002D4C76 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5A405A2D244F410F002D4C76 /* SceneDelegate.swift */; };
1111
5A405A30244F410F002D4C76 /* MotionManagerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5A405A2F244F410F002D4C76 /* MotionManagerView.swift */; };
1212
5A405A32244F4110002D4C76 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 5A405A31244F4110002D4C76 /* Assets.xcassets */; };
13-
5A89A1FE244F441700EF81FA /* Client.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5A89A1FD244F441700EF81FA /* Client.swift */; };
14-
CA0F931F244FE3F000E85985 /* MotionManagerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA0F931E244FE3F000E85985 /* MotionManagerTests.swift */; };
15-
CA6AC253244FE92100C71CB3 /* Models.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA6AC252244FE92100C71CB3 /* Models.swift */; };
16-
CA6AC255244FE92E00C71CB3 /* Live.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA6AC254244FE92E00C71CB3 /* Live.swift */; };
17-
CA6AC257244FE98300C71CB3 /* Mock.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA6AC256244FE98300C71CB3 /* Mock.swift */; };
13+
CA01F8932479B2FF004C5C0D /* ComposableCoreMotion in Frameworks */ = {isa = PBXBuildFile; productRef = CA01F8922479B2FF004C5C0D /* ComposableCoreMotion */; };
14+
CA0F931F244FE3F000E85985 /* MotionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA0F931E244FE3F000E85985 /* MotionTests.swift */; };
1815
DC1394122469E2E100EE1157 /* ComposableArchitecture in Frameworks */ = {isa = PBXBuildFile; productRef = DC1394112469E2E100EE1157 /* ComposableArchitecture */; };
1916
/* End PBXBuildFile section */
2017

@@ -57,13 +54,9 @@
5754
5A405A2F244F410F002D4C76 /* MotionManagerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MotionManagerView.swift; sourceTree = "<group>"; };
5855
5A405A31244F4110002D4C76 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
5956
5A405A39244F4110002D4C76 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
60-
5A89A1FD244F441700EF81FA /* Client.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Client.swift; sourceTree = "<group>"; };
6157
CA0F931C244FE3F000E85985 /* MotionManagerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = MotionManagerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
62-
CA0F931E244FE3F000E85985 /* MotionManagerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MotionManagerTests.swift; sourceTree = "<group>"; };
58+
CA0F931E244FE3F000E85985 /* MotionTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MotionTests.swift; sourceTree = "<group>"; };
6359
CA0F9320244FE3F000E85985 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
64-
CA6AC252244FE92100C71CB3 /* Models.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Models.swift; sourceTree = "<group>"; };
65-
CA6AC254244FE92E00C71CB3 /* Live.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Live.swift; sourceTree = "<group>"; };
66-
CA6AC256244FE98300C71CB3 /* Mock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Mock.swift; sourceTree = "<group>"; };
6760
DCFC51472466F49B00A0B8CF /* swift-composable-architecture */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "swift-composable-architecture"; path = ../..; sourceTree = "<group>"; };
6861
/* End PBXFileReference section */
6962

@@ -72,6 +65,7 @@
7265
isa = PBXFrameworksBuildPhase;
7366
buildActionMask = 2147483647;
7467
files = (
68+
CA01F8932479B2FF004C5C0D /* ComposableCoreMotion in Frameworks */,
7569
DC1394122469E2E100EE1157 /* ComposableArchitecture in Frameworks */,
7670
);
7771
runOnlyForDeploymentPostprocessing = 0;
@@ -109,7 +103,6 @@
109103
5A405A2A244F410F002D4C76 /* MotionManager */ = {
110104
isa = PBXGroup;
111105
children = (
112-
CA6AC251244FE90B00C71CB3 /* MotionClient */,
113106
5A405A39244F4110002D4C76 /* Info.plist */,
114107
5A405A2F244F410F002D4C76 /* MotionManagerView.swift */,
115108
5A405A2D244F410F002D4C76 /* SceneDelegate.swift */,
@@ -128,23 +121,12 @@
128121
CA0F931D244FE3F000E85985 /* MotionManagerTests */ = {
129122
isa = PBXGroup;
130123
children = (
131-
CA0F931E244FE3F000E85985 /* MotionManagerTests.swift */,
124+
CA0F931E244FE3F000E85985 /* MotionTests.swift */,
132125
CA0F9320244FE3F000E85985 /* Info.plist */,
133126
);
134127
path = MotionManagerTests;
135128
sourceTree = "<group>";
136129
};
137-
CA6AC251244FE90B00C71CB3 /* MotionClient */ = {
138-
isa = PBXGroup;
139-
children = (
140-
5A89A1FD244F441700EF81FA /* Client.swift */,
141-
CA6AC256244FE98300C71CB3 /* Mock.swift */,
142-
CA6AC254244FE92E00C71CB3 /* Live.swift */,
143-
CA6AC252244FE92100C71CB3 /* Models.swift */,
144-
);
145-
path = MotionClient;
146-
sourceTree = "<group>";
147-
};
148130
/* End PBXGroup section */
149131

150132
/* Begin PBXNativeTarget section */
@@ -164,6 +146,7 @@
164146
name = MotionManager;
165147
packageProductDependencies = (
166148
DC1394112469E2E100EE1157 /* ComposableArchitecture */,
149+
CA01F8922479B2FF004C5C0D /* ComposableCoreMotion */,
167150
);
168151
productName = MotionManager;
169152
productReference = 5A405A28244F410F002D4C76 /* MotionManager.app */;
@@ -253,18 +236,14 @@
253236
files = (
254237
5A405A2E244F410F002D4C76 /* SceneDelegate.swift in Sources */,
255238
5A405A30244F410F002D4C76 /* MotionManagerView.swift in Sources */,
256-
5A89A1FE244F441700EF81FA /* Client.swift in Sources */,
257-
CA6AC255244FE92E00C71CB3 /* Live.swift in Sources */,
258-
CA6AC253244FE92100C71CB3 /* Models.swift in Sources */,
259-
CA6AC257244FE98300C71CB3 /* Mock.swift in Sources */,
260239
);
261240
runOnlyForDeploymentPostprocessing = 0;
262241
};
263242
CA0F9318244FE3F000E85985 /* Sources */ = {
264243
isa = PBXSourcesBuildPhase;
265244
buildActionMask = 2147483647;
266245
files = (
267-
CA0F931F244FE3F000E85985 /* MotionManagerTests.swift in Sources */,
246+
CA0F931F244FE3F000E85985 /* MotionTests.swift in Sources */,
268247
);
269248
runOnlyForDeploymentPostprocessing = 0;
270249
};
@@ -396,14 +375,15 @@
396375
buildSettings = {
397376
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
398377
CODE_SIGN_STYLE = Automatic;
399-
DEVELOPMENT_TEAM = A42K5AU657;
378+
DEVELOPMENT_TEAM = "";
400379
ENABLE_PREVIEWS = YES;
401380
INFOPLIST_FILE = MotionManager/Info.plist;
402381
LD_RUNPATH_SEARCH_PATHS = (
403382
"$(inherited)",
404383
"@executable_path/Frameworks",
405384
);
406385
PRODUCT_BUNDLE_IDENTIFIER = co.pointfree.MotionManager;
386+
PRODUCT_MODULE_NAME = "$(PRODUCT_NAME:c99extidentifier)Demo";
407387
PRODUCT_NAME = "$(TARGET_NAME)";
408388
SWIFT_VERSION = 5.0;
409389
TARGETED_DEVICE_FAMILY = "1,2";
@@ -415,14 +395,15 @@
415395
buildSettings = {
416396
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
417397
CODE_SIGN_STYLE = Automatic;
418-
DEVELOPMENT_TEAM = A42K5AU657;
398+
DEVELOPMENT_TEAM = "";
419399
ENABLE_PREVIEWS = YES;
420400
INFOPLIST_FILE = MotionManager/Info.plist;
421401
LD_RUNPATH_SEARCH_PATHS = (
422402
"$(inherited)",
423403
"@executable_path/Frameworks",
424404
);
425405
PRODUCT_BUNDLE_IDENTIFIER = co.pointfree.MotionManager;
406+
PRODUCT_MODULE_NAME = "$(PRODUCT_NAME:c99extidentifier)Demo";
426407
PRODUCT_NAME = "$(TARGET_NAME)";
427408
SWIFT_VERSION = 5.0;
428409
TARGETED_DEVICE_FAMILY = "1,2";
@@ -500,6 +481,10 @@
500481
/* End XCConfigurationList section */
501482

502483
/* Begin XCSwiftPackageProductDependency section */
484+
CA01F8922479B2FF004C5C0D /* ComposableCoreMotion */ = {
485+
isa = XCSwiftPackageProductDependency;
486+
productName = ComposableCoreMotion;
487+
};
503488
DC1394112469E2E100EE1157 /* ComposableArchitecture */ = {
504489
isa = XCSwiftPackageProductDependency;
505490
productName = ComposableArchitecture;

‎Examples/MotionManager/MotionManager/MotionClient/Client.swift‎

Lines changed: 0 additions & 30 deletions
This file was deleted.

‎Examples/MotionManager/MotionManager/MotionClient/Live.swift‎

Lines changed: 0 additions & 61 deletions
This file was deleted.

‎Examples/MotionManager/MotionManager/MotionClient/Mock.swift‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎Examples/MotionManager/MotionManager/MotionClient/Models.swift‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

0 commit comments

Comments
 (0)