Skip to content

Commit 4576c47

Browse files
albertodebortolialbertodebortoli
authored
Merge pull request #1 from justeattakeaway/feature/vs/better-package-support
Better Package support
2 parents 83ecdfa + 3c1dc33 commit 4576c47

35 files changed

+1704
-427
lines changed

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,3 +88,6 @@ fastlane/test_output
8888
# https://github.com/johnno1962/injectionforxcode
8989

9090
iOSInjectionProject/
91+
92+
# Misc
93+
.DS_Store

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

Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1410"
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 = "PackageGenerator"
18+
BuildableName = "PackageGenerator"
19+
BlueprintName = "PackageGenerator"
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 = "PackageGeneratorTests"
36+
BuildableName = "PackageGeneratorTests"
37+
BlueprintName = "PackageGeneratorTests"
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+
viewDebuggingEnabled = "No">
54+
<BuildableProductRunnable
55+
runnableDebuggingMode = "0">
56+
<BuildableReference
57+
BuildableIdentifier = "primary"
58+
BlueprintIdentifier = "PackageGenerator"
59+
BuildableName = "PackageGenerator"
60+
BlueprintName = "PackageGenerator"
61+
ReferencedContainer = "container:">
62+
</BuildableReference>
63+
</BuildableProductRunnable>
64+
<CommandLineArguments>
65+
<CommandLineArgument
66+
argument = "generate-package"
67+
isEnabled = "YES">
68+
</CommandLineArgument>
69+
<CommandLineArgument
70+
argument = "--path Example/Packages/Example"
71+
isEnabled = "YES">
72+
</CommandLineArgument>
73+
<CommandLineArgument
74+
argument = "--dependencies-path Example/Config/RemoteDependencies.json"
75+
isEnabled = "YES">
76+
</CommandLineArgument>
77+
<CommandLineArgument
78+
argument = "--template-path Templates/Package.stencil"
79+
isEnabled = "YES">
80+
</CommandLineArgument>
81+
</CommandLineArguments>
82+
</LaunchAction>
83+
<ProfileAction
84+
buildConfiguration = "Release"
85+
shouldUseLaunchSchemeArgsEnv = "YES"
86+
savedToolIdentifier = ""
87+
useCustomWorkingDirectory = "NO"
88+
debugDocumentVersioning = "YES">
89+
<BuildableProductRunnable
90+
runnableDebuggingMode = "0">
91+
<BuildableReference
92+
BuildableIdentifier = "primary"
93+
BlueprintIdentifier = "PackageGenerator"
94+
BuildableName = "PackageGenerator"
95+
BlueprintName = "PackageGenerator"
96+
ReferencedContainer = "container:">
97+
</BuildableReference>
98+
</BuildableProductRunnable>
99+
</ProfileAction>
100+
<AnalyzeAction
101+
buildConfiguration = "Debug">
102+
</AnalyzeAction>
103+
<ArchiveAction
104+
buildConfiguration = "Release"
105+
revealArchiveInOrganizer = "YES">
106+
</ArchiveAction>
107+
</Scheme>

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

Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1410"
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 = "PackageGenerator"
18+
BuildableName = "PackageGenerator"
19+
BlueprintName = "PackageGenerator"
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 = "PackageGeneratorTests"
36+
BuildableName = "PackageGeneratorTests"
37+
BlueprintName = "PackageGeneratorTests"
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+
viewDebuggingEnabled = "No">
54+
<BuildableProductRunnable
55+
runnableDebuggingMode = "0">
56+
<BuildableReference
57+
BuildableIdentifier = "primary"
58+
BlueprintIdentifier = "PackageGenerator"
59+
BuildableName = "PackageGenerator"
60+
BlueprintName = "PackageGenerator"
61+
ReferencedContainer = "container:">
62+
</BuildableReference>
63+
</BuildableProductRunnable>
64+
<CommandLineArguments>
65+
<CommandLineArgument
66+
argument = "generate-packages"
67+
isEnabled = "YES">
68+
</CommandLineArgument>
69+
<CommandLineArgument
70+
argument = "--packages-folder-path Example/Packages"
71+
isEnabled = "YES">
72+
</CommandLineArgument>
73+
<CommandLineArgument
74+
argument = "--dependencies-path Example/Config/RemoteDependencies.json"
75+
isEnabled = "YES">
76+
</CommandLineArgument>
77+
<CommandLineArgument
78+
argument = "--template-path Templates/Package.stencil"
79+
isEnabled = "YES">
80+
</CommandLineArgument>
81+
</CommandLineArguments>
82+
</LaunchAction>
83+
<ProfileAction
84+
buildConfiguration = "Release"
85+
shouldUseLaunchSchemeArgsEnv = "YES"
86+
savedToolIdentifier = ""
87+
useCustomWorkingDirectory = "NO"
88+
debugDocumentVersioning = "YES">
89+
<BuildableProductRunnable
90+
runnableDebuggingMode = "0">
91+
<BuildableReference
92+
BuildableIdentifier = "primary"
93+
BlueprintIdentifier = "PackageGenerator"
94+
BuildableName = "PackageGenerator"
95+
BlueprintName = "PackageGenerator"
96+
ReferencedContainer = "container:">
97+
</BuildableReference>
98+
</BuildableProductRunnable>
99+
</ProfileAction>
100+
<AnalyzeAction
101+
buildConfiguration = "Debug">
102+
</AnalyzeAction>
103+
<ArchiveAction
104+
buildConfiguration = "Release"
105+
revealArchiveInOrganizer = "YES">
106+
</ArchiveAction>
107+
</Scheme>

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

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@
4545
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4646
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
4747
launchStyle = "0"
48-
useCustomWorkingDirectory = "NO"
48+
useCustomWorkingDirectory = "YES"
49+
customWorkingDirectory = "/Users/victor.sarda/Developer/PackageGenerator"
4950
ignoresPersistentStateOnLaunch = "NO"
5051
debugDocumentVersioning = "YES"
5152
debugServiceExtension = "internal"
@@ -61,28 +62,6 @@
6162
ReferencedContainer = "container:">
6263
</BuildableReference>
6364
</BuildableProductRunnable>
64-
<CommandLineArguments>
65-
<CommandLineArgument
66-
argument = "generate-package"
67-
isEnabled = "YES">
68-
</CommandLineArgument>
69-
<CommandLineArgument
70-
argument = "--modules-folder Example/Modules/"
71-
isEnabled = "YES">
72-
</CommandLineArgument>
73-
<CommandLineArgument
74-
argument = "--dependencies-path Example/Config/RemoteDependencies.json"
75-
isEnabled = "YES">
76-
</CommandLineArgument>
77-
<CommandLineArgument
78-
argument = "--template-path Templates/Package.stencil"
79-
isEnabled = "YES">
80-
</CommandLineArgument>
81-
<CommandLineArgument
82-
argument = "--module-name Example"
83-
isEnabled = "YES">
84-
</CommandLineArgument>
85-
</CommandLineArguments>
8665
</LaunchAction>
8766
<ProfileAction
8867
buildConfiguration = "Release"

‎Example/Config/RemoteDependencies.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"dependencies": [
33
{
4-
"name": "Alamofire",
5-
"url": "https://github.com/Alamofire/Alamofire",
6-
"version": "5.6.1"
4+
"name": "RemoteDependencyA",
5+
"url": "https://github.com/DependencyA",
6+
"version": "1.0.0"
77
},
88
{
9-
"name": "ViewInspector",
10-
"url": "https://github.com/nalexn/ViewInspector",
11-
"version": "0.9.2"
9+
"name": "RemoteDependencyB",
10+
"url": "https://github.com/DependencyB",
11+
"version": "2.0.0"
1212
}
1313
]
1414
}

‎Example/Modules/Example/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata‎

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

‎Example/Modules/Example/Example.json‎

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

0 commit comments

Comments
 (0)