Skip to content

Commit 1b1d9e7

Browse files
alexaubryalexaubry
authored
Merge pull request #5 from alexaubry/xcode9
Update script for Xcode 9
2 parents 2ee73db + 1896658 commit 1b1d9e7

File tree

119 files changed

+2051
-928
lines changed

Some content is hidden

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

119 files changed

+2051
-928
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
#
33
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
44

5+
.DS_Store
6+
57
## Build generated
68
build/
79
DerivedData/

‎.travis.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
os: osx
2-
osx_image: xcode8.3
2+
osx_image: xcode9
33
language: objective-c
44

55
script:
6-
- swift package fetch
6+
- swift package resolve
77
- xcodebuild clean test -scheme "AlternateIcons" -destination "arch=x86_64"
88

99
before_deploy:

‎AlternateIcons.xcodeproj/project.pbxproj‎

Lines changed: 326 additions & 506 deletions
Large diffs are not rendered by default.

AlternateIcons.xcodeproj/xcshareddata/xcschemes/AlternateIcons-Package.xcscheme renamed to AlternateIcons.xcodeproj/xcshareddata/xcschemes/AltKit.xcscheme

Lines changed: 42 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,11 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "9999"
3+
LastUpgradeVersion = "0900"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
77
buildImplicitDependencies = "YES">
88
<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 = "AlternateIcons::AlternateIcons"
18-
BuildableName = "AlternateIcons"
19-
BlueprintName = "AlternateIcons"
20-
ReferencedContainer = "container:AlternateIcons.xcodeproj">
21-
</BuildableReference>
22-
</BuildActionEntry>
239
<BuildActionEntry
2410
buildForTesting = "YES"
2511
buildForRunning = "YES"
@@ -34,41 +20,14 @@
3420
ReferencedContainer = "container:AlternateIcons.xcodeproj">
3521
</BuildableReference>
3622
</BuildActionEntry>
37-
<BuildActionEntry
38-
buildForTesting = "YES"
39-
buildForRunning = "YES"
40-
buildForProfiling = "YES"
41-
buildForArchiving = "YES"
42-
buildForAnalyzing = "YES">
43-
<BuildableReference
44-
BuildableIdentifier = "primary"
45-
BlueprintIdentifier = "Unbox::Unbox"
46-
BuildableName = "Unbox.framework"
47-
BlueprintName = "Unbox"
48-
ReferencedContainer = "container:AlternateIcons.xcodeproj">
49-
</BuildableReference>
50-
</BuildActionEntry>
51-
<BuildActionEntry
52-
buildForTesting = "YES"
53-
buildForRunning = "YES"
54-
buildForProfiling = "YES"
55-
buildForArchiving = "YES"
56-
buildForAnalyzing = "YES">
57-
<BuildableReference
58-
BuildableIdentifier = "primary"
59-
BlueprintIdentifier = "Files::Files"
60-
BuildableName = "Files.framework"
61-
BlueprintName = "Files"
62-
ReferencedContainer = "container:AlternateIcons.xcodeproj">
63-
</BuildableReference>
64-
</BuildActionEntry>
6523
</BuildActionEntries>
6624
</BuildAction>
6725
<TestAction
6826
buildConfiguration = "Debug"
6927
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
7028
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
71-
shouldUseLaunchSchemeArgsEnv = "YES"
29+
language = ""
30+
shouldUseLaunchSchemeArgsEnv = "NO"
7231
codeCoverageEnabled = "YES">
7332
<Testables>
7433
<TestableReference
@@ -82,13 +41,40 @@
8241
</BuildableReference>
8342
</TestableReference>
8443
</Testables>
44+
<MacroExpansion>
45+
<BuildableReference
46+
BuildableIdentifier = "primary"
47+
BlueprintIdentifier = "AlternateIcons::AltKit"
48+
BuildableName = "AltKit.framework"
49+
BlueprintName = "AltKit"
50+
ReferencedContainer = "container:AlternateIcons.xcodeproj">
51+
</BuildableReference>
52+
</MacroExpansion>
53+
<EnvironmentVariables>
54+
<EnvironmentVariable
55+
key = "SCRIPT_INPUT_FILE_0"
56+
value = "Images.xcassets"
57+
isEnabled = "YES">
58+
</EnvironmentVariable>
59+
<EnvironmentVariable
60+
key = "SCRIPT_INPUT_FILE_COUNT"
61+
value = "1"
62+
isEnabled = "YES">
63+
</EnvironmentVariable>
64+
<EnvironmentVariable
65+
key = "CONTENTS_FOLDER_PATH"
66+
value = "AppBundle"
67+
isEnabled = "YES">
68+
</EnvironmentVariable>
69+
</EnvironmentVariables>
8570
<AdditionalOptions>
8671
</AdditionalOptions>
8772
</TestAction>
8873
<LaunchAction
8974
buildConfiguration = "Debug"
9075
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
9176
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
77+
language = ""
9278
launchStyle = "0"
9379
useCustomWorkingDirectory = "NO"
9480
ignoresPersistentStateOnLaunch = "NO"
@@ -98,9 +84,9 @@
9884
<MacroExpansion>
9985
<BuildableReference
10086
BuildableIdentifier = "primary"
101-
BlueprintIdentifier = "AlternateIcons::AlternateIcons"
102-
BuildableName = "AlternateIcons"
103-
BlueprintName = "AlternateIcons"
87+
BlueprintIdentifier = "AlternateIcons::AltKit"
88+
BuildableName = "AltKit.framework"
89+
BlueprintName = "AltKit"
10490
ReferencedContainer = "container:AlternateIcons.xcodeproj">
10591
</BuildableReference>
10692
</MacroExpansion>
@@ -113,6 +99,15 @@
11399
savedToolIdentifier = ""
114100
useCustomWorkingDirectory = "NO"
115101
debugDocumentVersioning = "YES">
102+
<MacroExpansion>
103+
<BuildableReference
104+
BuildableIdentifier = "primary"
105+
BlueprintIdentifier = "AlternateIcons::AltKit"
106+
BuildableName = "AltKit.framework"
107+
BlueprintName = "AltKit"
108+
ReferencedContainer = "container:AlternateIcons.xcodeproj">
109+
</BuildableReference>
110+
</MacroExpansion>
116111
</ProfileAction>
117112
<AnalyzeAction
118113
buildConfiguration = "Debug">

‎AlternateIcons.xcodeproj/xcshareddata/xcschemes/AlternateIcons.xcscheme‎

Lines changed: 46 additions & 72 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 = "9999"
3+
LastUpgradeVersion = "0900"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -14,49 +14,7 @@
1414
buildForAnalyzing = "YES">
1515
<BuildableReference
1616
BuildableIdentifier = "primary"
17-
BlueprintIdentifier = "OBJ_29"
18-
BuildableName = "Files.framework"
19-
BlueprintName = "Files"
20-
ReferencedContainer = "container:AlternateIcons.xcodeproj">
21-
</BuildableReference>
22-
</BuildActionEntry>
23-
<BuildActionEntry
24-
buildForTesting = "YES"
25-
buildForRunning = "YES"
26-
buildForProfiling = "YES"
27-
buildForArchiving = "YES"
28-
buildForAnalyzing = "YES">
29-
<BuildableReference
30-
BuildableIdentifier = "primary"
31-
BlueprintIdentifier = "OBJ_36"
32-
BuildableName = "Unbox.framework"
33-
BlueprintName = "Unbox"
34-
ReferencedContainer = "container:AlternateIcons.xcodeproj">
35-
</BuildableReference>
36-
</BuildActionEntry>
37-
<BuildActionEntry
38-
buildForTesting = "YES"
39-
buildForRunning = "YES"
40-
buildForProfiling = "YES"
41-
buildForArchiving = "YES"
42-
buildForAnalyzing = "YES">
43-
<BuildableReference
44-
BuildableIdentifier = "primary"
45-
BlueprintIdentifier = "OBJ_43"
46-
BuildableName = "AltKit.framework"
47-
BlueprintName = "AltKit"
48-
ReferencedContainer = "container:AlternateIcons.xcodeproj">
49-
</BuildableReference>
50-
</BuildActionEntry>
51-
<BuildActionEntry
52-
buildForTesting = "YES"
53-
buildForRunning = "YES"
54-
buildForProfiling = "YES"
55-
buildForArchiving = "YES"
56-
buildForAnalyzing = "YES">
57-
<BuildableReference
58-
BuildableIdentifier = "primary"
59-
BlueprintIdentifier = "OBJ_56"
17+
BlueprintIdentifier = "AlternateIcons::AlternateIcons"
6018
BuildableName = "AlternateIcons"
6119
BlueprintName = "AlternateIcons"
6220
ReferencedContainer = "container:AlternateIcons.xcodeproj">
@@ -68,52 +26,34 @@
6826
buildConfiguration = "Debug"
6927
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
7028
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
71-
shouldUseLaunchSchemeArgsEnv = "YES"
29+
language = ""
30+
shouldUseLaunchSchemeArgsEnv = "NO"
7231
codeCoverageEnabled = "YES">
7332
<Testables>
7433
<TestableReference
7534
skipped = "NO">
7635
<BuildableReference
7736
BuildableIdentifier = "primary"
78-
BlueprintIdentifier = "OBJ_69"
37+
BlueprintIdentifier = "AlternateIcons::AltKitTests"
7938
BuildableName = "AltKitTests.xctest"
8039
BlueprintName = "AltKitTests"
8140
ReferencedContainer = "container:AlternateIcons.xcodeproj">
8241
</BuildableReference>
8342
</TestableReference>
8443
</Testables>
85-
<AdditionalOptions>
86-
</AdditionalOptions>
87-
</TestAction>
88-
<LaunchAction
89-
buildConfiguration = "Debug"
90-
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
91-
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
92-
launchStyle = "0"
93-
useCustomWorkingDirectory = "NO"
94-
ignoresPersistentStateOnLaunch = "NO"
95-
debugDocumentVersioning = "YES"
96-
debugServiceExtension = "internal"
97-
allowLocationSimulation = "YES">
9844
<MacroExpansion>
9945
<BuildableReference
10046
BuildableIdentifier = "primary"
101-
BlueprintIdentifier = "OBJ_29"
102-
BuildableName = "Files.framework"
103-
BlueprintName = "Files"
47+
BlueprintIdentifier = "AlternateIcons::AlternateIcons"
48+
BuildableName = "AlternateIcons"
49+
BlueprintName = "AlternateIcons"
10450
ReferencedContainer = "container:AlternateIcons.xcodeproj">
10551
</BuildableReference>
10652
</MacroExpansion>
107-
<CommandLineArguments>
108-
<CommandLineArgument
109-
argument = ""
110-
isEnabled = "YES">
111-
</CommandLineArgument>
112-
</CommandLineArguments>
11353
<EnvironmentVariables>
11454
<EnvironmentVariable
115-
key = "CONTENTS_FOLDER_PATH"
116-
value = "AppBundle"
55+
key = "SCRIPT_INPUT_FILE_0"
56+
value = "Images.xcassets"
11757
isEnabled = "YES">
11858
</EnvironmentVariable>
11959
<EnvironmentVariable
@@ -122,20 +62,54 @@
12262
isEnabled = "YES">
12363
</EnvironmentVariable>
12464
<EnvironmentVariable
125-
key = "SCRIPT_INPUT_FILE_0"
126-
value = "Images.xcassets"
65+
key = "CONTENTS_FOLDER_PATH"
66+
value = "AppBundle"
12767
isEnabled = "YES">
12868
</EnvironmentVariable>
12969
</EnvironmentVariables>
13070
<AdditionalOptions>
13171
</AdditionalOptions>
72+
</TestAction>
73+
<LaunchAction
74+
buildConfiguration = "Debug"
75+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
76+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
77+
language = ""
78+
launchStyle = "0"
79+
useCustomWorkingDirectory = "NO"
80+
ignoresPersistentStateOnLaunch = "NO"
81+
debugDocumentVersioning = "YES"
82+
debugServiceExtension = "internal"
83+
allowLocationSimulation = "YES">
84+
<BuildableProductRunnable
85+
runnableDebuggingMode = "0">
86+
<BuildableReference
87+
BuildableIdentifier = "primary"
88+
BlueprintIdentifier = "AlternateIcons::AlternateIcons"
89+
BuildableName = "AlternateIcons"
90+
BlueprintName = "AlternateIcons"
91+
ReferencedContainer = "container:AlternateIcons.xcodeproj">
92+
</BuildableReference>
93+
</BuildableProductRunnable>
94+
<AdditionalOptions>
95+
</AdditionalOptions>
13296
</LaunchAction>
13397
<ProfileAction
13498
buildConfiguration = "Release"
13599
shouldUseLaunchSchemeArgsEnv = "YES"
136100
savedToolIdentifier = ""
137101
useCustomWorkingDirectory = "NO"
138102
debugDocumentVersioning = "YES">
103+
<BuildableProductRunnable
104+
runnableDebuggingMode = "0">
105+
<BuildableReference
106+
BuildableIdentifier = "primary"
107+
BlueprintIdentifier = "AlternateIcons::AlternateIcons"
108+
BuildableName = "AlternateIcons"
109+
BlueprintName = "AlternateIcons"
110+
ReferencedContainer = "container:AlternateIcons.xcodeproj">
111+
</BuildableReference>
112+
</BuildableProductRunnable>
139113
</ProfileAction>
140114
<AnalyzeAction
141115
buildConfiguration = "Debug">

0 commit comments

Comments
 (0)