Skip to content

Commit 0605057

Browse files
author
Alessio Arsuffi
committed
Merge branch 'master' of https://github.com/monksoftware/Marvin
# Conflicts: # LICENSE # Marvin.xcodeproj/project.pbxproj # Marvin.xcodeproj/project.xcworkspace/contents.xcworkspacedata # README.md
2 parents 519e19f + de39802 commit 0605057

File tree

16 files changed

+614
-3
lines changed

16 files changed

+614
-3
lines changed

‎LICENSE‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
The MIT License (MIT)
1+
MIT License
22

3-
Copyright (c) 2018 Alessio Arsuffi
3+
Copyright (c) 2017 Webmonks Srl
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal
@@ -19,4 +19,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
1919
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
2020
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2121
SOFTWARE.
22-

‎Marvin.xcodeproj/project.xcworkspace/xcuserdata/Alessio.xcuserdatad/UserInterfaceState.xcuserstate‎

27.5 KB
Binary file not shown.

‎Marvin.xcodeproj/xcshareddata/xcschemes/Marvin.xcscheme‎

Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "0910"
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 = "CA82EDDF1FBDF1310002EED5"
18+
BuildableName = "Marvin.framework"
19+
BlueprintName = "Marvin"
20+
ReferencedContainer = "container:Marvin.xcodeproj">
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+
language = ""
30+
shouldUseLaunchSchemeArgsEnv = "YES"
31+
codeCoverageEnabled = "YES">
32+
<Testables>
33+
<TestableReference
34+
skipped = "NO">
35+
<BuildableReference
36+
BuildableIdentifier = "primary"
37+
BlueprintIdentifier = "CA82EDE81FBDF1310002EED5"
38+
BuildableName = "MarvinTests.xctest"
39+
BlueprintName = "MarvinTests"
40+
ReferencedContainer = "container:Marvin.xcodeproj">
41+
</BuildableReference>
42+
</TestableReference>
43+
</Testables>
44+
<MacroExpansion>
45+
<BuildableReference
46+
BuildableIdentifier = "primary"
47+
BlueprintIdentifier = "CA82EDDF1FBDF1310002EED5"
48+
BuildableName = "Marvin.framework"
49+
BlueprintName = "Marvin"
50+
ReferencedContainer = "container:Marvin.xcodeproj">
51+
</BuildableReference>
52+
</MacroExpansion>
53+
<AdditionalOptions>
54+
</AdditionalOptions>
55+
</TestAction>
56+
<LaunchAction
57+
buildConfiguration = "Debug"
58+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
59+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
60+
language = ""
61+
launchStyle = "0"
62+
useCustomWorkingDirectory = "NO"
63+
ignoresPersistentStateOnLaunch = "NO"
64+
debugDocumentVersioning = "YES"
65+
debugServiceExtension = "internal"
66+
allowLocationSimulation = "YES">
67+
<MacroExpansion>
68+
<BuildableReference
69+
BuildableIdentifier = "primary"
70+
BlueprintIdentifier = "CA82EDDF1FBDF1310002EED5"
71+
BuildableName = "Marvin.framework"
72+
BlueprintName = "Marvin"
73+
ReferencedContainer = "container:Marvin.xcodeproj">
74+
</BuildableReference>
75+
</MacroExpansion>
76+
<AdditionalOptions>
77+
</AdditionalOptions>
78+
</LaunchAction>
79+
<ProfileAction
80+
buildConfiguration = "Release"
81+
shouldUseLaunchSchemeArgsEnv = "YES"
82+
savedToolIdentifier = ""
83+
useCustomWorkingDirectory = "NO"
84+
debugDocumentVersioning = "YES">
85+
<MacroExpansion>
86+
<BuildableReference
87+
BuildableIdentifier = "primary"
88+
BlueprintIdentifier = "CA82EDDF1FBDF1310002EED5"
89+
BuildableName = "Marvin.framework"
90+
BlueprintName = "Marvin"
91+
ReferencedContainer = "container:Marvin.xcodeproj">
92+
</BuildableReference>
93+
</MacroExpansion>
94+
</ProfileAction>
95+
<AnalyzeAction
96+
buildConfiguration = "Debug">
97+
</AnalyzeAction>
98+
<ArchiveAction
99+
buildConfiguration = "Release"
100+
revealArchiveInOrganizer = "YES">
101+
</ArchiveAction>
102+
</Scheme>

‎Marvin.xcodeproj/xcshareddata/xcschemes/MarvinUI.xcscheme‎

Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "0910"
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 = "CA82EDFE1FBDF50A0002EED5"
18+
BuildableName = "MarvinUI.framework"
19+
BlueprintName = "MarvinUI"
20+
ReferencedContainer = "container:Marvin.xcodeproj">
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+
language = ""
30+
shouldUseLaunchSchemeArgsEnv = "YES"
31+
codeCoverageEnabled = "YES">
32+
<Testables>
33+
<TestableReference
34+
skipped = "NO">
35+
<BuildableReference
36+
BuildableIdentifier = "primary"
37+
BlueprintIdentifier = "CA82EE061FBDF50B0002EED5"
38+
BuildableName = "MarvinUITests.xctest"
39+
BlueprintName = "MarvinUITests"
40+
ReferencedContainer = "container:Marvin.xcodeproj">
41+
</BuildableReference>
42+
</TestableReference>
43+
</Testables>
44+
<MacroExpansion>
45+
<BuildableReference
46+
BuildableIdentifier = "primary"
47+
BlueprintIdentifier = "CA82EDFE1FBDF50A0002EED5"
48+
BuildableName = "MarvinUI.framework"
49+
BlueprintName = "MarvinUI"
50+
ReferencedContainer = "container:Marvin.xcodeproj">
51+
</BuildableReference>
52+
</MacroExpansion>
53+
<AdditionalOptions>
54+
</AdditionalOptions>
55+
</TestAction>
56+
<LaunchAction
57+
buildConfiguration = "Debug"
58+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
59+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
60+
language = ""
61+
launchStyle = "0"
62+
useCustomWorkingDirectory = "NO"
63+
ignoresPersistentStateOnLaunch = "NO"
64+
debugDocumentVersioning = "YES"
65+
debugServiceExtension = "internal"
66+
allowLocationSimulation = "YES">
67+
<MacroExpansion>
68+
<BuildableReference
69+
BuildableIdentifier = "primary"
70+
BlueprintIdentifier = "CA82EDFE1FBDF50A0002EED5"
71+
BuildableName = "MarvinUI.framework"
72+
BlueprintName = "MarvinUI"
73+
ReferencedContainer = "container:Marvin.xcodeproj">
74+
</BuildableReference>
75+
</MacroExpansion>
76+
<AdditionalOptions>
77+
</AdditionalOptions>
78+
</LaunchAction>
79+
<ProfileAction
80+
buildConfiguration = "Release"
81+
shouldUseLaunchSchemeArgsEnv = "YES"
82+
savedToolIdentifier = ""
83+
useCustomWorkingDirectory = "NO"
84+
debugDocumentVersioning = "YES">
85+
<MacroExpansion>
86+
<BuildableReference
87+
BuildableIdentifier = "primary"
88+
BlueprintIdentifier = "CA82EDFE1FBDF50A0002EED5"
89+
BuildableName = "MarvinUI.framework"
90+
BlueprintName = "MarvinUI"
91+
ReferencedContainer = "container:Marvin.xcodeproj">
92+
</BuildableReference>
93+
</MacroExpansion>
94+
</ProfileAction>
95+
<AnalyzeAction
96+
buildConfiguration = "Debug">
97+
</AnalyzeAction>
98+
<ArchiveAction
99+
buildConfiguration = "Release"
100+
revealArchiveInOrganizer = "YES">
101+
</ArchiveAction>
102+
</Scheme>

‎Marvin.xcodeproj/xcuserdata/Alessio.xcuserdatad/xcschemes/MarvinTests.xcscheme‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "0910"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
</BuildAction>
9+
<TestAction
10+
buildConfiguration = "Debug"
11+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
12+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
13+
language = ""
14+
shouldUseLaunchSchemeArgsEnv = "YES">
15+
<Testables>
16+
<TestableReference
17+
skipped = "NO">
18+
<BuildableReference
19+
BuildableIdentifier = "primary"
20+
BlueprintIdentifier = "CA82EDE81FBDF1310002EED5"
21+
BuildableName = "MarvinTests.xctest"
22+
BlueprintName = "MarvinTests"
23+
ReferencedContainer = "container:Marvin.xcodeproj">
24+
</BuildableReference>
25+
</TestableReference>
26+
</Testables>
27+
<AdditionalOptions>
28+
</AdditionalOptions>
29+
</TestAction>
30+
<LaunchAction
31+
buildConfiguration = "Debug"
32+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
33+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
34+
language = ""
35+
launchStyle = "0"
36+
useCustomWorkingDirectory = "NO"
37+
ignoresPersistentStateOnLaunch = "NO"
38+
debugDocumentVersioning = "YES"
39+
debugServiceExtension = "internal"
40+
allowLocationSimulation = "YES">
41+
<AdditionalOptions>
42+
</AdditionalOptions>
43+
</LaunchAction>
44+
<ProfileAction
45+
buildConfiguration = "Release"
46+
shouldUseLaunchSchemeArgsEnv = "YES"
47+
savedToolIdentifier = ""
48+
useCustomWorkingDirectory = "NO"
49+
debugDocumentVersioning = "YES">
50+
</ProfileAction>
51+
<AnalyzeAction
52+
buildConfiguration = "Debug">
53+
</AnalyzeAction>
54+
<ArchiveAction
55+
buildConfiguration = "Release"
56+
revealArchiveInOrganizer = "YES">
57+
</ArchiveAction>
58+
</Scheme>

‎Marvin.xcodeproj/xcuserdata/Alessio.xcuserdatad/xcschemes/MarvinUITests.xcscheme‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "0910"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
</BuildAction>
9+
<TestAction
10+
buildConfiguration = "Debug"
11+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
12+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
13+
language = ""
14+
shouldUseLaunchSchemeArgsEnv = "YES">
15+
<Testables>
16+
<TestableReference
17+
skipped = "NO">
18+
<BuildableReference
19+
BuildableIdentifier = "primary"
20+
BlueprintIdentifier = "CA82EE061FBDF50B0002EED5"
21+
BuildableName = "MarvinUITests.xctest"
22+
BlueprintName = "MarvinUITests"
23+
ReferencedContainer = "container:Marvin.xcodeproj">
24+
</BuildableReference>
25+
</TestableReference>
26+
</Testables>
27+
<AdditionalOptions>
28+
</AdditionalOptions>
29+
</TestAction>
30+
<LaunchAction
31+
buildConfiguration = "Debug"
32+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
33+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
34+
language = ""
35+
launchStyle = "0"
36+
useCustomWorkingDirectory = "NO"
37+
ignoresPersistentStateOnLaunch = "NO"
38+
debugDocumentVersioning = "YES"
39+
debugServiceExtension = "internal"
40+
allowLocationSimulation = "YES">
41+
<AdditionalOptions>
42+
</AdditionalOptions>
43+
</LaunchAction>
44+
<ProfileAction
45+
buildConfiguration = "Release"
46+
shouldUseLaunchSchemeArgsEnv = "YES"
47+
savedToolIdentifier = ""
48+
useCustomWorkingDirectory = "NO"
49+
debugDocumentVersioning = "YES">
50+
</ProfileAction>
51+
<AnalyzeAction
52+
buildConfiguration = "Debug">
53+
</AnalyzeAction>
54+
<ArchiveAction
55+
buildConfiguration = "Release"
56+
revealArchiveInOrganizer = "YES">
57+
</ArchiveAction>
58+
</Scheme>

‎Marvin.xcodeproj/xcuserdata/Alessio.xcuserdatad/xcschemes/xcschememanagement.plist‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>SchemeUserState</key>
6+
<dict>
7+
<key>Marvin.xcscheme</key>
8+
<dict>
9+
<key>orderHint</key>
10+
<integer>0</integer>
11+
</dict>
12+
<key>MarvinUI.xcscheme</key>
13+
<dict>
14+
<key>orderHint</key>
15+
<integer>1</integer>
16+
</dict>
17+
</dict>
18+
</dict>
19+
</plist>

0 commit comments

Comments
 (0)