Skip to content

Commit ea9b0dd

Browse files
hebertialmeidaplivesey
authored andcommitted
Add Swift Package Manager support (#61)
* Add support to SPM as primary build method * Update travis vm and build script to include more devices * Fixing simulator version according to travis availability * Revert the simulator version, travis docs was wrong... * Fixed minor compiler warnings on var -> let * Revert derived data config * One more fix for derived data path * Fix build file identation * Trying to disable concurrent testing to see if it fix the build * Fix testRetainCycle waiting for the consistency manager to finish on its queue * Remove waitOnDispatchQueue as it was happening inside addListener * Disabled testRetainCycle() for now. refer to: #62
1 parent d06101b commit ea9b0dd

File tree

14 files changed

+69
-856
lines changed

14 files changed

+69
-856
lines changed

.gitignore

+5
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ DerivedData
55
*.pbxuser
66
xcuserdata
77

8+
# SwiftPackageManager
9+
Packages
10+
.build/
11+
*.xcodeproj
12+
813
# Docs
914
docs/_build/**
1015
docs/sphinx_rtd_theme/**

ConsistencyManager.xcodeproj/xcshareddata/xcschemes/ConsistencyManager.xcscheme .swiftpm/xcode/xcshareddata/xcschemes/ConsistencyManager.xcscheme

+26-42
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1020"
3+
LastUpgradeVersion = "1130"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -14,24 +14,24 @@
1414
buildForAnalyzing = "YES">
1515
<BuildableReference
1616
BuildableIdentifier = "primary"
17-
BlueprintIdentifier = "61DBAA5319FFF64100A23A60"
18-
BuildableName = "ConsistencyManager.framework"
17+
BlueprintIdentifier = "ConsistencyManager"
18+
BuildableName = "ConsistencyManager"
1919
BlueprintName = "ConsistencyManager"
20-
ReferencedContainer = "container:ConsistencyManager.xcodeproj">
20+
ReferencedContainer = "container:">
2121
</BuildableReference>
2222
</BuildActionEntry>
2323
<BuildActionEntry
2424
buildForTesting = "YES"
25-
buildForRunning = "NO"
26-
buildForProfiling = "YES"
25+
buildForRunning = "YES"
26+
buildForProfiling = "NO"
2727
buildForArchiving = "NO"
28-
buildForAnalyzing = "NO">
28+
buildForAnalyzing = "YES">
2929
<BuildableReference
3030
BuildableIdentifier = "primary"
31-
BlueprintIdentifier = "61DBAA5E19FFF64100A23A60"
32-
BuildableName = "ConsistencyManagerTests.xctest"
31+
BlueprintIdentifier = "ConsistencyManagerTests"
32+
BuildableName = "ConsistencyManagerTests"
3333
BlueprintName = "ConsistencyManagerTests"
34-
ReferencedContainer = "container:ConsistencyManager.xcodeproj">
34+
ReferencedContainer = "container:">
3535
</BuildableReference>
3636
</BuildActionEntry>
3737
</BuildActionEntries>
@@ -40,31 +40,26 @@
4040
buildConfiguration = "Debug"
4141
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4242
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
43-
codeCoverageEnabled = "YES"
44-
shouldUseLaunchSchemeArgsEnv = "YES">
43+
shouldUseLaunchSchemeArgsEnv = "YES"
44+
codeCoverageEnabled = "YES">
4545
<Testables>
4646
<TestableReference
47-
skipped = "NO">
47+
skipped = "NO"
48+
testExecutionOrdering = "random">
4849
<BuildableReference
4950
BuildableIdentifier = "primary"
50-
BlueprintIdentifier = "61DBAA5E19FFF64100A23A60"
51-
BuildableName = "ConsistencyManagerTests.xctest"
51+
BlueprintIdentifier = "ConsistencyManagerTests"
52+
BuildableName = "ConsistencyManagerTests"
5253
BlueprintName = "ConsistencyManagerTests"
53-
ReferencedContainer = "container:ConsistencyManager.xcodeproj">
54+
ReferencedContainer = "container:">
5455
</BuildableReference>
56+
<SkippedTests>
57+
<Test
58+
Identifier = "ListenerTests/testRetainCycle()">
59+
</Test>
60+
</SkippedTests>
5561
</TestableReference>
5662
</Testables>
57-
<MacroExpansion>
58-
<BuildableReference
59-
BuildableIdentifier = "primary"
60-
BlueprintIdentifier = "61DBAA5319FFF64100A23A60"
61-
BuildableName = "ConsistencyManager.framework"
62-
BlueprintName = "ConsistencyManager"
63-
ReferencedContainer = "container:ConsistencyManager.xcodeproj">
64-
</BuildableReference>
65-
</MacroExpansion>
66-
<AdditionalOptions>
67-
</AdditionalOptions>
6863
</TestAction>
6964
<LaunchAction
7065
buildConfiguration = "Debug"
@@ -76,31 +71,20 @@
7671
debugDocumentVersioning = "YES"
7772
debugServiceExtension = "internal"
7873
allowLocationSimulation = "YES">
79-
<MacroExpansion>
80-
<BuildableReference
81-
BuildableIdentifier = "primary"
82-
BlueprintIdentifier = "61DBAA5319FFF64100A23A60"
83-
BuildableName = "ConsistencyManager.framework"
84-
BlueprintName = "ConsistencyManager"
85-
ReferencedContainer = "container:ConsistencyManager.xcodeproj">
86-
</BuildableReference>
87-
</MacroExpansion>
88-
<AdditionalOptions>
89-
</AdditionalOptions>
9074
</LaunchAction>
9175
<ProfileAction
92-
buildConfiguration = "Debug"
76+
buildConfiguration = "Release"
9377
shouldUseLaunchSchemeArgsEnv = "YES"
9478
savedToolIdentifier = ""
9579
useCustomWorkingDirectory = "NO"
9680
debugDocumentVersioning = "YES">
9781
<MacroExpansion>
9882
<BuildableReference
9983
BuildableIdentifier = "primary"
100-
BlueprintIdentifier = "61DBAA5319FFF64100A23A60"
101-
BuildableName = "ConsistencyManager.framework"
84+
BlueprintIdentifier = "ConsistencyManager"
85+
BuildableName = "ConsistencyManager"
10286
BlueprintName = "ConsistencyManager"
103-
ReferencedContainer = "container:ConsistencyManager.xcodeproj">
87+
ReferencedContainer = "container:">
10488
</BuildableReference>
10589
</MacroExpansion>
10690
</ProfileAction>

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
language: objective-c
2-
osx_image: xcode10.2
2+
osx_image: xcode11.3
33
script: sh build.sh
44
after_success:
55
- bash <(curl -s https://codecov.io/bash)

0 commit comments

Comments
 (0)