Skip to content

Commit 854dd75

Browse files
flovilmartflovilmart
authored
Carthage support for ParseUI (#1231)
* Adds dynamic framework for ParseUI * Proper shared schemes, fixes build for Carthage TwitterUtils, ParseUI * Restore shared schemes * Remove unnecessary jobs
1 parent 0f5a33c commit 854dd75

File tree

9 files changed

+451
-637
lines changed

9 files changed

+451
-637
lines changed

‎.circleci/config.yml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -83,12 +83,6 @@ jobs:
8383
- checkout
8484
- run: *prepare
8585
- run: bundle exec rake test:cocoapods
86-
publish-cocoapods:
87-
<<: *defaults
88-
steps:
89-
- checkout
90-
- run: *prepare
91-
- run: ./Scripts/publish.sh
9286

9387
workflows:
9488
version: 2
@@ -113,12 +107,3 @@ workflows:
113107
- schedule:
114108
cron: "0 1 * * *"
115109
filters: *filter-only-master
116-
publish:
117-
jobs:
118-
- hold:
119-
type: approval
120-
filters: *filter-only-master
121-
- publish-cocoapods:
122-
requires:
123-
- hold
124-
filters: *filter-only-master

‎Parse.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
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+
</plist>

‎Parse/Parse.xcodeproj/project.pbxproj

Lines changed: 14 additions & 457 deletions
Large diffs are not rendered by default.

‎ParseFacebookUtils/ParseFacebookUtils.xcodeproj/project.pbxproj

Lines changed: 26 additions & 56 deletions
Large diffs are not rendered by default.

‎ParseTwitterUtils/ParseTwitterUtils.xcodeproj/project.pbxproj

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,6 @@
252252
4A9A94FE200D12C9005D8F4B /* Bolts.framework */,
253253
4A9A94FA200D12A2005D8F4B /* Bolts.framework */,
254254
4AAEAACB200C2BBB00AA7479 /* OCMock.framework */,
255-
813DFC8F1AB2513D00F25A08 /* User Frameworks */,
256255
813DFC8E1AB2513300F25A08 /* System Frameworks */,
257256
);
258257
name = Frameworks;
@@ -306,13 +305,6 @@
306305
name = "System Frameworks";
307306
sourceTree = "<group>";
308307
};
309-
813DFC8F1AB2513D00F25A08 /* User Frameworks */ = {
310-
isa = PBXGroup;
311-
children = (
312-
);
313-
name = "User Frameworks";
314-
sourceTree = "<group>";
315-
};
316308
813DFC961AB2524C00F25A08 /* Resources */ = {
317309
isa = PBXGroup;
318310
children = (

‎ParseTwitterUtils/ParseTwitterUtils.xcodeproj/xcshareddata/xcschemes/ParseTwitterUtils-iOS-Dynamic.xcscheme

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
<BuildActionEntry
1010
buildForTesting = "YES"
1111
buildForRunning = "YES"
12-
buildForProfiling = "NO"
13-
buildForArchiving = "NO"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
1414
buildForAnalyzing = "YES">
1515
<BuildableReference
1616
BuildableIdentifier = "primary"

‎ParseUI/ParseUI.xcodeproj/project.pbxproj

Lines changed: 378 additions & 51 deletions
Large diffs are not rendered by default.

‎ParseUI/ParseUI.xcodeproj/xcshareddata/xcschemes/ParseUIDemo.xcscheme renamed to ‎ParseUI/ParseUI.xcodeproj/xcshareddata/xcschemes/ParseUI-Dynamic.xcscheme

Lines changed: 13 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
buildForAnalyzing = "YES">
1515
<BuildableReference
1616
BuildableIdentifier = "primary"
17-
BlueprintIdentifier = "81472F661A1AB33800FD6EED"
18-
BuildableName = "ParseUIDemo.app"
19-
BlueprintName = "ParseUIDemo"
17+
BlueprintIdentifier = "4A0ECBE4200D8C0200BA84A3"
18+
BuildableName = "ParseUI.framework"
19+
BlueprintName = "ParseUI-Dynamic"
2020
ReferencedContainer = "container:ParseUI.xcodeproj">
2121
</BuildableReference>
2222
</BuildActionEntry>
@@ -30,15 +30,6 @@
3030
shouldUseLaunchSchemeArgsEnv = "YES">
3131
<Testables>
3232
</Testables>
33-
<MacroExpansion>
34-
<BuildableReference
35-
BuildableIdentifier = "primary"
36-
BlueprintIdentifier = "81472F661A1AB33800FD6EED"
37-
BuildableName = "ParseUIDemo.app"
38-
BlueprintName = "ParseUIDemo"
39-
ReferencedContainer = "container:ParseUI.xcodeproj">
40-
</BuildableReference>
41-
</MacroExpansion>
4233
<AdditionalOptions>
4334
</AdditionalOptions>
4435
</TestAction>
@@ -53,16 +44,15 @@
5344
debugDocumentVersioning = "YES"
5445
debugServiceExtension = "internal"
5546
allowLocationSimulation = "YES">
56-
<BuildableProductRunnable
57-
runnableDebuggingMode = "0">
47+
<MacroExpansion>
5848
<BuildableReference
5949
BuildableIdentifier = "primary"
60-
BlueprintIdentifier = "81472F661A1AB33800FD6EED"
61-
BuildableName = "ParseUIDemo.app"
62-
BlueprintName = "ParseUIDemo"
50+
BlueprintIdentifier = "4A0ECBE4200D8C0200BA84A3"
51+
BuildableName = "ParseUI.framework"
52+
BlueprintName = "ParseUI-Dynamic"
6353
ReferencedContainer = "container:ParseUI.xcodeproj">
6454
</BuildableReference>
65-
</BuildableProductRunnable>
55+
</MacroExpansion>
6656
<AdditionalOptions>
6757
</AdditionalOptions>
6858
</LaunchAction>
@@ -72,16 +62,15 @@
7262
savedToolIdentifier = ""
7363
useCustomWorkingDirectory = "NO"
7464
debugDocumentVersioning = "YES">
75-
<BuildableProductRunnable
76-
runnableDebuggingMode = "0">
65+
<MacroExpansion>
7766
<BuildableReference
7867
BuildableIdentifier = "primary"
79-
BlueprintIdentifier = "81472F661A1AB33800FD6EED"
80-
BuildableName = "ParseUIDemo.app"
81-
BlueprintName = "ParseUIDemo"
68+
BlueprintIdentifier = "4A0ECBE4200D8C0200BA84A3"
69+
BuildableName = "ParseUI.framework"
70+
BlueprintName = "ParseUI-Dynamic"
8271
ReferencedContainer = "container:ParseUI.xcodeproj">
8372
</BuildableReference>
84-
</BuildableProductRunnable>
73+
</MacroExpansion>
8574
</ProfileAction>
8675
<AnalyzeAction
8776
buildConfiguration = "Debug">

‎ParseUI/ParseUI.xcodeproj/xcshareddata/xcschemes/ParseUIDemo-Swift.xcscheme renamed to ‎ParseUI/ParseUI.xcodeproj/xcshareddata/xcschemes/ParseUI.xcscheme

Lines changed: 13 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
buildForAnalyzing = "YES">
1515
<BuildableReference
1616
BuildableIdentifier = "primary"
17-
BlueprintIdentifier = "8129E5DE1A9CB067006752BC"
18-
BuildableName = "ParseUIDemo.app"
19-
BlueprintName = "ParseUIDemo-Swift"
17+
BlueprintIdentifier = "4A9A9496200D0329005D8F4B"
18+
BuildableName = "ParseUI.framework"
19+
BlueprintName = "ParseUI"
2020
ReferencedContainer = "container:ParseUI.xcodeproj">
2121
</BuildableReference>
2222
</BuildActionEntry>
@@ -30,15 +30,6 @@
3030
shouldUseLaunchSchemeArgsEnv = "YES">
3131
<Testables>
3232
</Testables>
33-
<MacroExpansion>
34-
<BuildableReference
35-
BuildableIdentifier = "primary"
36-
BlueprintIdentifier = "8129E5DE1A9CB067006752BC"
37-
BuildableName = "ParseUIDemo.app"
38-
BlueprintName = "ParseUIDemo-Swift"
39-
ReferencedContainer = "container:ParseUI.xcodeproj">
40-
</BuildableReference>
41-
</MacroExpansion>
4233
<AdditionalOptions>
4334
</AdditionalOptions>
4435
</TestAction>
@@ -53,16 +44,15 @@
5344
debugDocumentVersioning = "YES"
5445
debugServiceExtension = "internal"
5546
allowLocationSimulation = "YES">
56-
<BuildableProductRunnable
57-
runnableDebuggingMode = "0">
47+
<MacroExpansion>
5848
<BuildableReference
5949
BuildableIdentifier = "primary"
60-
BlueprintIdentifier = "8129E5DE1A9CB067006752BC"
61-
BuildableName = "ParseUIDemo.app"
62-
BlueprintName = "ParseUIDemo-Swift"
50+
BlueprintIdentifier = "4A9A9496200D0329005D8F4B"
51+
BuildableName = "ParseUI.framework"
52+
BlueprintName = "ParseUI"
6353
ReferencedContainer = "container:ParseUI.xcodeproj">
6454
</BuildableReference>
65-
</BuildableProductRunnable>
55+
</MacroExpansion>
6656
<AdditionalOptions>
6757
</AdditionalOptions>
6858
</LaunchAction>
@@ -72,16 +62,15 @@
7262
savedToolIdentifier = ""
7363
useCustomWorkingDirectory = "NO"
7464
debugDocumentVersioning = "YES">
75-
<BuildableProductRunnable
76-
runnableDebuggingMode = "0">
65+
<MacroExpansion>
7766
<BuildableReference
7867
BuildableIdentifier = "primary"
79-
BlueprintIdentifier = "8129E5DE1A9CB067006752BC"
80-
BuildableName = "ParseUIDemo.app"
81-
BlueprintName = "ParseUIDemo-Swift"
68+
BlueprintIdentifier = "4A9A9496200D0329005D8F4B"
69+
BuildableName = "ParseUI.framework"
70+
BlueprintName = "ParseUI"
8271
ReferencedContainer = "container:ParseUI.xcodeproj">
8372
</BuildableReference>
84-
</BuildableProductRunnable>
73+
</MacroExpansion>
8574
</ProfileAction>
8675
<AnalyzeAction
8776
buildConfiguration = "Debug">

0 commit comments

Comments
 (0)