Skip to content

Commit 717ecbf

Browse files
author
Christian Kienle
authored
Merge pull request #33 from ChristianKienle/develop
Develop
2 parents 6a6e6ee + ba807e2 commit 717ecbf

File tree

60 files changed

+2345
-12829
lines changed

Some content is hidden

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

60 files changed

+2345
-12829
lines changed

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
language: objective-c
2-
osx_image: xcode61
2+
osx_image: xcode8
33
before_install:
44
- brew update
55
- if brew outdated | grep -qx xctool; then brew upgrade xctool; fi

‎CDE-Workspace.xcworkspace/xcshareddata/xcschemes/CDETests.xcscheme

Lines changed: 43 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0600"
3+
LastUpgradeVersion = "0800"
44
version = "2.0">
55
<BuildAction
66
parallelizeBuildables = "YES"
77
buildImplicitDependencies = "YES">
88
<BuildActionEntries>
99
<BuildActionEntry
10+
buildForTesting = "YES"
1011
buildForRunning = "YES"
11-
buildForTesting = "YES">
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
1215
<BuildableReference
1316
BuildableIdentifier = "primary"
1417
BlueprintIdentifier = "ABBEA8C0176620E10024A9D2"
@@ -20,42 +23,73 @@
2023
</BuildActionEntries>
2124
</BuildAction>
2225
<TestAction
26+
buildConfiguration = "Debug"
2327
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2428
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
25-
shouldUseLaunchSchemeArgsEnv = "YES"
26-
buildConfiguration = "Debug">
29+
shouldUseLaunchSchemeArgsEnv = "YES">
2730
<Testables>
2831
<TestableReference
2932
skipped = "NO">
3033
<BuildableReference
3134
BuildableIdentifier = "primary"
32-
BlueprintIdentifier = "ABBEA8C0176620E10024A9D2"
33-
BuildableName = "Core Data Editor Tests.xctest"
34-
BlueprintName = "Core Data Editor Tests"
35+
BlueprintIdentifier = "AB7EF6AD1DB4028C0062DD0C"
36+
BuildableName = "CDETests.xctest"
37+
BlueprintName = "CDETests"
3538
ReferencedContainer = "container:Core Data Editor/Core Data Editor.xcodeproj">
3639
</BuildableReference>
3740
</TestableReference>
3841
</Testables>
42+
<MacroExpansion>
43+
<BuildableReference
44+
BuildableIdentifier = "primary"
45+
BlueprintIdentifier = "ABBEA7D51765CB730024A9D2"
46+
BuildableName = "Core Data Editor.app"
47+
BlueprintName = "Core Data Editor"
48+
ReferencedContainer = "container:Core Data Editor/Core Data Editor.xcodeproj">
49+
</BuildableReference>
50+
</MacroExpansion>
51+
<AdditionalOptions>
52+
</AdditionalOptions>
3953
</TestAction>
4054
<LaunchAction
55+
buildConfiguration = "Debug"
4156
selectedDebuggerIdentifier = ""
4257
selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
4358
launchStyle = "0"
4459
useCustomWorkingDirectory = "NO"
45-
buildConfiguration = "Debug"
4660
ignoresPersistentStateOnLaunch = "NO"
4761
debugDocumentVersioning = "YES"
4862
debugXPCServices = "NO"
63+
debugServiceExtension = "internal"
4964
allowLocationSimulation = "YES">
65+
<BuildableProductRunnable
66+
runnableDebuggingMode = "0">
67+
<BuildableReference
68+
BuildableIdentifier = "primary"
69+
BlueprintIdentifier = "ABBEA7D51765CB730024A9D2"
70+
BuildableName = "Core Data Editor.app"
71+
BlueprintName = "Core Data Editor"
72+
ReferencedContainer = "container:Core Data Editor/Core Data Editor.xcodeproj">
73+
</BuildableReference>
74+
</BuildableProductRunnable>
5075
<AdditionalOptions>
5176
</AdditionalOptions>
5277
</LaunchAction>
5378
<ProfileAction
79+
buildConfiguration = "Release"
5480
shouldUseLaunchSchemeArgsEnv = "YES"
5581
savedToolIdentifier = ""
5682
useCustomWorkingDirectory = "NO"
57-
buildConfiguration = "Release"
5883
debugDocumentVersioning = "YES">
84+
<MacroExpansion>
85+
<BuildableReference
86+
BuildableIdentifier = "primary"
87+
BlueprintIdentifier = "ABBEA8C0176620E10024A9D2"
88+
BuildableName = "Core Data Editor Tests.xctest"
89+
BlueprintName = "Core Data Editor Tests"
90+
ReferencedContainer = "container:Core Data Editor/Core Data Editor.xcodeproj">
91+
</BuildableReference>
92+
</MacroExpansion>
5993
</ProfileAction>
6094
<AnalyzeAction
6195
buildConfiguration = "Debug">

‎CDE-Workspace.xcworkspace/xcshareddata/xcschemes/Core Data Editor.xcscheme

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0600"
3+
LastUpgradeVersion = "0800"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -23,18 +23,18 @@
2323
</BuildActionEntries>
2424
</BuildAction>
2525
<TestAction
26+
buildConfiguration = "Debug"
2627
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2728
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
28-
shouldUseLaunchSchemeArgsEnv = "YES"
29-
buildConfiguration = "Debug">
29+
shouldUseLaunchSchemeArgsEnv = "YES">
3030
<Testables>
3131
<TestableReference
3232
skipped = "NO">
3333
<BuildableReference
3434
BuildableIdentifier = "primary"
35-
BlueprintIdentifier = "ABBEA8C0176620E10024A9D2"
36-
BuildableName = "Core Data Editor Tests.xctest"
37-
BlueprintName = "Core Data Editor Tests"
35+
BlueprintIdentifier = "AB7EF6AD1DB4028C0062DD0C"
36+
BuildableName = "CDETests.xctest"
37+
BlueprintName = "CDETests"
3838
ReferencedContainer = "container:Core Data Editor/Core Data Editor.xcodeproj">
3939
</BuildableReference>
4040
</TestableReference>
@@ -48,17 +48,21 @@
4848
ReferencedContainer = "container:Core Data Editor/Core Data Editor.xcodeproj">
4949
</BuildableReference>
5050
</MacroExpansion>
51+
<AdditionalOptions>
52+
</AdditionalOptions>
5153
</TestAction>
5254
<LaunchAction
55+
buildConfiguration = "Debug"
5356
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5457
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
5558
launchStyle = "0"
5659
useCustomWorkingDirectory = "NO"
57-
buildConfiguration = "Debug"
5860
ignoresPersistentStateOnLaunch = "NO"
5961
debugDocumentVersioning = "YES"
62+
debugServiceExtension = "internal"
6063
allowLocationSimulation = "YES">
61-
<BuildableProductRunnable>
64+
<BuildableProductRunnable
65+
runnableDebuggingMode = "0">
6266
<BuildableReference
6367
BuildableIdentifier = "primary"
6468
BlueprintIdentifier = "ABBEA7D51765CB730024A9D2"
@@ -71,12 +75,13 @@
7175
</AdditionalOptions>
7276
</LaunchAction>
7377
<ProfileAction
78+
buildConfiguration = "Release"
7479
shouldUseLaunchSchemeArgsEnv = "YES"
7580
savedToolIdentifier = ""
7681
useCustomWorkingDirectory = "NO"
77-
buildConfiguration = "Release"
7882
debugDocumentVersioning = "YES">
79-
<BuildableProductRunnable>
83+
<BuildableProductRunnable
84+
runnableDebuggingMode = "0">
8085
<BuildableReference
8186
BuildableIdentifier = "primary"
8287
BlueprintIdentifier = "ABBEA7D51765CB730024A9D2"

‎CDE-Workspace.xcworkspace/xcshareddata/xcschemes/iOS Example.xcscheme

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0600"
3+
LastUpgradeVersion = "0800"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -23,10 +23,10 @@
2323
</BuildActionEntries>
2424
</BuildAction>
2525
<TestAction
26+
buildConfiguration = "Debug"
2627
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2728
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
28-
shouldUseLaunchSchemeArgsEnv = "YES"
29-
buildConfiguration = "Debug">
29+
shouldUseLaunchSchemeArgsEnv = "YES">
3030
<Testables>
3131
</Testables>
3232
<MacroExpansion>
@@ -38,17 +38,21 @@
3838
ReferencedContainer = "container:iOS Example/iOS Example.xcodeproj">
3939
</BuildableReference>
4040
</MacroExpansion>
41+
<AdditionalOptions>
42+
</AdditionalOptions>
4143
</TestAction>
4244
<LaunchAction
45+
buildConfiguration = "Debug"
4346
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4447
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
4548
launchStyle = "0"
4649
useCustomWorkingDirectory = "NO"
47-
buildConfiguration = "Debug"
4850
ignoresPersistentStateOnLaunch = "NO"
4951
debugDocumentVersioning = "YES"
52+
debugServiceExtension = "internal"
5053
allowLocationSimulation = "YES">
51-
<BuildableProductRunnable>
54+
<BuildableProductRunnable
55+
runnableDebuggingMode = "0">
5256
<BuildableReference
5357
BuildableIdentifier = "primary"
5458
BlueprintIdentifier = "AB15926C17B52996008DA7E2"
@@ -61,12 +65,13 @@
6165
</AdditionalOptions>
6266
</LaunchAction>
6367
<ProfileAction
68+
buildConfiguration = "Release"
6469
shouldUseLaunchSchemeArgsEnv = "YES"
6570
savedToolIdentifier = ""
6671
useCustomWorkingDirectory = "NO"
67-
buildConfiguration = "Release"
6872
debugDocumentVersioning = "YES">
69-
<BuildableProductRunnable>
73+
<BuildableProductRunnable
74+
runnableDebuggingMode = "0">
7075
<BuildableReference
7176
BuildableIdentifier = "primary"
7277
BlueprintIdentifier = "AB15926C17B52996008DA7E2"

‎CDE-Workspace.xcworkspace/xcuserdata/cmk.xcuserdatad/WorkspaceSettings.xcsettings

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

‎CDE-Workspace.xcworkspace/xcuserdata/cmk.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist

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

0 commit comments

Comments
 (0)