Skip to content

Commit 1d1ad79

Browse files
freak4pcfreak4pc
committed
Restructure project for SPM & Objective-C target
1 parent 681cb06 commit 1d1ad79

33 files changed

+231
-114
lines changed

‎Example/Example.xcodeproj/project.pbxproj‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
55D03783B6D732FD6F6AC69A /* Pods_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BBA6D804FDF0AA577D384BEC /* Pods_Example.framework */; };
10+
3D5D919445BB2B0DA0F0A455 /* Pods_Example_ExampleTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BE798B0656978A899BDE50BF /* Pods_Example_ExampleTests.framework */; };
11+
499340808F6A4BFA9D08AB34 /* Pods_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7789E43DCE40382369F72B2 /* Pods_Example.framework */; };
1112
7822AD1E24E1504600187502 /* UITextViewTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7822AD1D24E1504600187502 /* UITextViewTests.swift */; };
1213
A233795622F59DBD0083F92F /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A233795522F59DBD0083F92F /* Main.storyboard */; };
1314
A24C43FD22F592E700BC2E2B /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = A24C43FC22F592E700BC2E2B /* AppDelegate.swift */; };
@@ -17,7 +18,6 @@
1718
A24C440922F592E800BC2E2B /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A24C440722F592E800BC2E2B /* LaunchScreen.storyboard */; };
1819
DC8A555624B5ED4B007BCEEC /* UITableViewTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC8A555524B5ED4B007BCEEC /* UITableViewTests.swift */; };
1920
DC8A555E24B60A9A007BCEEC /* UICollectionViewTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC8A555D24B60A9A007BCEEC /* UICollectionViewTests.swift */; };
20-
E1EEC015EE18A550BFC69809 /* Pods_Example_ExampleTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6C907B7798E1CF876B8F846E /* Pods_Example_ExampleTests.framework */; };
2121
/* End PBXBuildFile section */
2222

2323
/* Begin PBXContainerItemProxy section */
@@ -31,7 +31,6 @@
3131
/* End PBXContainerItemProxy section */
3232

3333
/* Begin PBXFileReference section */
34-
6C907B7798E1CF876B8F846E /* Pods_Example_ExampleTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Example_ExampleTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
3534
7822AD1D24E1504600187502 /* UITextViewTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UITextViewTests.swift; sourceTree = "<group>"; };
3635
A233795522F59DBD0083F92F /* Main.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Main.storyboard; sourceTree = "<group>"; };
3736
A24C43F922F592E700BC2E2B /* Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Example.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -45,11 +44,12 @@
4544
A3A5BF6E4631484B5F0C14C7 /* Pods-Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Example.debug.xcconfig"; path = "Target Support Files/Pods-Example/Pods-Example.debug.xcconfig"; sourceTree = "<group>"; };
4645
AD949152515161F740DAF80C /* Pods-Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Example.release.xcconfig"; path = "Target Support Files/Pods-Example/Pods-Example.release.xcconfig"; sourceTree = "<group>"; };
4746
B84F6B1029BF235509B7F677 /* Pods-Example-ExampleTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Example-ExampleTests.release.xcconfig"; path = "Target Support Files/Pods-Example-ExampleTests/Pods-Example-ExampleTests.release.xcconfig"; sourceTree = "<group>"; };
48-
BBA6D804FDF0AA577D384BEC /* Pods_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; };
47+
BE798B0656978A899BDE50BF /* Pods_Example_ExampleTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Example_ExampleTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
4948
DC8A555324B5ED4B007BCEEC /* ExampleTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ExampleTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
5049
DC8A555524B5ED4B007BCEEC /* UITableViewTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UITableViewTests.swift; sourceTree = "<group>"; };
5150
DC8A555724B5ED4B007BCEEC /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
5251
DC8A555D24B60A9A007BCEEC /* UICollectionViewTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UICollectionViewTests.swift; sourceTree = "<group>"; };
52+
E7789E43DCE40382369F72B2 /* Pods_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; };
5353
FB09C37F8131759582DE37F2 /* Pods-Example-ExampleTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Example-ExampleTests.debug.xcconfig"; path = "Target Support Files/Pods-Example-ExampleTests/Pods-Example-ExampleTests.debug.xcconfig"; sourceTree = "<group>"; };
5454
/* End PBXFileReference section */
5555

@@ -58,15 +58,15 @@
5858
isa = PBXFrameworksBuildPhase;
5959
buildActionMask = 2147483647;
6060
files = (
61-
55D03783B6D732FD6F6AC69A /* Pods_Example.framework in Frameworks */,
61+
499340808F6A4BFA9D08AB34 /* Pods_Example.framework in Frameworks */,
6262
);
6363
runOnlyForDeploymentPostprocessing = 0;
6464
};
6565
DC8A555024B5ED4B007BCEEC /* Frameworks */ = {
6666
isa = PBXFrameworksBuildPhase;
6767
buildActionMask = 2147483647;
6868
files = (
69-
E1EEC015EE18A550BFC69809 /* Pods_Example_ExampleTests.framework in Frameworks */,
69+
3D5D919445BB2B0DA0F0A455 /* Pods_Example_ExampleTests.framework in Frameworks */,
7070
);
7171
runOnlyForDeploymentPostprocessing = 0;
7272
};
@@ -76,8 +76,8 @@
7676
188A69E03FD2502C8B88E87A /* Frameworks */ = {
7777
isa = PBXGroup;
7878
children = (
79-
BBA6D804FDF0AA577D384BEC /* Pods_Example.framework */,
80-
6C907B7798E1CF876B8F846E /* Pods_Example_ExampleTests.framework */,
79+
E7789E43DCE40382369F72B2 /* Pods_Example.framework */,
80+
BE798B0656978A899BDE50BF /* Pods_Example_ExampleTests.framework */,
8181
);
8282
name = Frameworks;
8383
sourceTree = "<group>";
@@ -151,7 +151,7 @@
151151
A24C43F522F592E700BC2E2B /* Sources */,
152152
A24C43F622F592E700BC2E2B /* Frameworks */,
153153
A24C43F722F592E700BC2E2B /* Resources */,
154-
F457FB62EA75CD0872C935CB /* [CP] Embed Pods Frameworks */,
154+
8B81933BC72185EEB0CF378D /* [CP] Embed Pods Frameworks */,
155155
);
156156
buildRules = (
157157
);
@@ -170,7 +170,7 @@
170170
DC8A554F24B5ED4B007BCEEC /* Sources */,
171171
DC8A555024B5ED4B007BCEEC /* Frameworks */,
172172
DC8A555124B5ED4B007BCEEC /* Resources */,
173-
06BD6D358DE66DAEBD31F4E8 /* [CP] Embed Pods Frameworks */,
173+
D5923E773DBC45360D2D9DC0 /* [CP] Embed Pods Frameworks */,
174174
);
175175
buildRules = (
176176
);
@@ -242,23 +242,6 @@
242242
/* End PBXResourcesBuildPhase section */
243243

244244
/* Begin PBXShellScriptBuildPhase section */
245-
06BD6D358DE66DAEBD31F4E8 /* [CP] Embed Pods Frameworks */ = {
246-
isa = PBXShellScriptBuildPhase;
247-
buildActionMask = 2147483647;
248-
files = (
249-
);
250-
inputFileListPaths = (
251-
"${PODS_ROOT}/Target Support Files/Pods-Example-ExampleTests/Pods-Example-ExampleTests-frameworks-${CONFIGURATION}-input-files.xcfilelist",
252-
);
253-
name = "[CP] Embed Pods Frameworks";
254-
outputFileListPaths = (
255-
"${PODS_ROOT}/Target Support Files/Pods-Example-ExampleTests/Pods-Example-ExampleTests-frameworks-${CONFIGURATION}-output-files.xcfilelist",
256-
);
257-
runOnlyForDeploymentPostprocessing = 0;
258-
shellPath = /bin/sh;
259-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Example-ExampleTests/Pods-Example-ExampleTests-frameworks.sh\"\n";
260-
showEnvVarsInLog = 0;
261-
};
262245
1A00880812CC0A46E5A1E4A6 /* [CP] Check Pods Manifest.lock */ = {
263246
isa = PBXShellScriptBuildPhase;
264247
buildActionMask = 2147483647;
@@ -303,7 +286,7 @@
303286
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
304287
showEnvVarsInLog = 0;
305288
};
306-
F457FB62EA75CD0872C935CB /* [CP] Embed Pods Frameworks */ = {
289+
8B81933BC72185EEB0CF378D /* [CP] Embed Pods Frameworks */ = {
307290
isa = PBXShellScriptBuildPhase;
308291
buildActionMask = 2147483647;
309292
files = (
@@ -320,6 +303,23 @@
320303
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Example/Pods-Example-frameworks.sh\"\n";
321304
showEnvVarsInLog = 0;
322305
};
306+
D5923E773DBC45360D2D9DC0 /* [CP] Embed Pods Frameworks */ = {
307+
isa = PBXShellScriptBuildPhase;
308+
buildActionMask = 2147483647;
309+
files = (
310+
);
311+
inputFileListPaths = (
312+
"${PODS_ROOT}/Target Support Files/Pods-Example-ExampleTests/Pods-Example-ExampleTests-frameworks-${CONFIGURATION}-input-files.xcfilelist",
313+
);
314+
name = "[CP] Embed Pods Frameworks";
315+
outputFileListPaths = (
316+
"${PODS_ROOT}/Target Support Files/Pods-Example-ExampleTests/Pods-Example-ExampleTests-frameworks-${CONFIGURATION}-output-files.xcfilelist",
317+
);
318+
runOnlyForDeploymentPostprocessing = 0;
319+
shellPath = /bin/sh;
320+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Example-ExampleTests/Pods-Example-ExampleTests-frameworks.sh\"\n";
321+
showEnvVarsInLog = 0;
322+
};
323323
/* End PBXShellScriptBuildPhase section */
324324

325325
/* Begin PBXSourcesBuildPhase section */

‎Example/Example.xcodeproj/xcshareddata/xcschemes/Example.xcscheme‎

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

‎Gemfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
source 'https://rubygems.org'
22

3-
gem 'cocoapods', '1.9.1'
3+
gem 'cocoapods', '1.9.1'
4+
gem 'xcodeproj'

‎Gemfile.lock‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ GEM
77
minitest (~> 5.1)
88
thread_safe (~> 0.3, >= 0.3.4)
99
tzinfo (~> 1.1)
10-
algoliasearch (1.27.3)
10+
algoliasearch (1.27.4)
1111
httpclient (~> 2.8, >= 2.8.3)
1212
json (>= 1.5.1)
1313
atomos (0.1.3)
@@ -62,7 +62,7 @@ GEM
6262
i18n (0.9.5)
6363
concurrent-ruby (~> 1.0)
6464
json (2.3.1)
65-
minitest (5.14.1)
65+
minitest (5.14.2)
6666
molinillo (0.6.6)
6767
nanaimo (0.3.0)
6868
nap (1.1.0)
@@ -73,7 +73,7 @@ GEM
7373
ethon (>= 0.9.0)
7474
tzinfo (1.2.7)
7575
thread_safe (~> 0.1)
76-
xcodeproj (1.17.1)
76+
xcodeproj (1.18.0)
7777
CFPropertyList (>= 2.3.3, < 4.0)
7878
atomos (~> 0.1.3)
7979
claide (>= 1.0.2, < 2.0)
@@ -85,6 +85,7 @@ PLATFORMS
8585

8686
DEPENDENCIES
8787
cocoapods (= 1.9.1)
88+
xcodeproj
8889

8990
BUNDLED WITH
90-
2.0.2
91+
2.1.4

‎Makefile‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
archive:
2-
scripts/carthage-archive.sh
2+
scripts/carthage-archive.sh
3+
project:
4+
scripts/make_project.rb

‎Package.swift‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,11 @@ let package = Package(
55
name: "CombineCocoa",
66
platforms: [.iOS(.v10)],
77
products: [
8-
.library(
9-
name: "CombineCocoa",
10-
targets: ["CombineCocoa"]),
8+
.library(name: "CombineCocoa", targets: ["CombineCocoa"]),
119
],
1210
dependencies: [],
1311
targets: [
14-
.target(
15-
name: "CombineCocoa",
16-
dependencies: [],
17-
path: "Sources"
18-
)
12+
.target(name: "CombineCocoa", dependencies: ["Runtime"]),
13+
.target(name: "Runtime", dependencies: [])
1914
]
2015
)

Sources/AnimatedAssignSubscriber.swift renamed to Sources/CombineCocoa/AnimatedAssignSubscriber.swift

File renamed without changes.

Sources/CombineCocoa.h renamed to Sources/CombineCocoa/CombineCocoa.h

File renamed without changes.

Sources/CombineControlEvent.swift renamed to Sources/CombineCocoa/CombineControlEvent.swift

File renamed without changes.

Sources/CombineControlProperty.swift renamed to Sources/CombineCocoa/CombineControlProperty.swift

File renamed without changes.

0 commit comments

Comments
 (0)