Skip to content

Commit

Permalink
Carthage support for ParseUI (#1231)
Browse files Browse the repository at this point in the history
* Adds dynamic framework for ParseUI

* Proper shared schemes, fixes build for Carthage TwitterUtils, ParseUI

* Restore shared schemes

* Remove unnecessary jobs
  • Loading branch information
flovilmart authored Jan 16, 2018
1 parent 0f5a33c commit 854dd75
Show file tree
Hide file tree
Showing 9 changed files with 451 additions and 637 deletions.
15 changes: 0 additions & 15 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,12 +83,6 @@ jobs:
- checkout
- run: *prepare
- run: bundle exec rake test:cocoapods
publish-cocoapods:
<<: *defaults
steps:
- checkout
- run: *prepare
- run: ./Scripts/publish.sh

workflows:
version: 2
Expand All @@ -113,12 +107,3 @@ workflows:
- schedule:
cron: "0 1 * * *"
filters: *filter-only-master
publish:
jobs:
- hold:
type: approval
filters: *filter-only-master
- publish-cocoapods:
requires:
- hold
filters: *filter-only-master
5 changes: 5 additions & 0 deletions Parse.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict/>
</plist>
471 changes: 14 additions & 457 deletions Parse/Parse.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

82 changes: 26 additions & 56 deletions ParseFacebookUtils/ParseFacebookUtils.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

8 changes: 0 additions & 8 deletions ParseTwitterUtils/ParseTwitterUtils.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,6 @@
4A9A94FE200D12C9005D8F4B /* Bolts.framework */,
4A9A94FA200D12A2005D8F4B /* Bolts.framework */,
4AAEAACB200C2BBB00AA7479 /* OCMock.framework */,
813DFC8F1AB2513D00F25A08 /* User Frameworks */,
813DFC8E1AB2513300F25A08 /* System Frameworks */,
);
name = Frameworks;
Expand Down Expand Up @@ -306,13 +305,6 @@
name = "System Frameworks";
sourceTree = "<group>";
};
813DFC8F1AB2513D00F25A08 /* User Frameworks */ = {
isa = PBXGroup;
children = (
);
name = "User Frameworks";
sourceTree = "<group>";
};
813DFC961AB2524C00F25A08 /* Resources */ = {
isa = PBXGroup;
children = (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "NO"
buildForArchiving = "NO"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
Expand Down
429 changes: 378 additions & 51 deletions ParseUI/ParseUI.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "81472F661A1AB33800FD6EED"
BuildableName = "ParseUIDemo.app"
BlueprintName = "ParseUIDemo"
BlueprintIdentifier = "4A0ECBE4200D8C0200BA84A3"
BuildableName = "ParseUI.framework"
BlueprintName = "ParseUI-Dynamic"
ReferencedContainer = "container:ParseUI.xcodeproj">
</BuildableReference>
</BuildActionEntry>
Expand All @@ -30,15 +30,6 @@
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "81472F661A1AB33800FD6EED"
BuildableName = "ParseUIDemo.app"
BlueprintName = "ParseUIDemo"
ReferencedContainer = "container:ParseUI.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
Expand All @@ -53,16 +44,15 @@
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "81472F661A1AB33800FD6EED"
BuildableName = "ParseUIDemo.app"
BlueprintName = "ParseUIDemo"
BlueprintIdentifier = "4A0ECBE4200D8C0200BA84A3"
BuildableName = "ParseUI.framework"
BlueprintName = "ParseUI-Dynamic"
ReferencedContainer = "container:ParseUI.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
Expand All @@ -72,16 +62,15 @@
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "81472F661A1AB33800FD6EED"
BuildableName = "ParseUIDemo.app"
BlueprintName = "ParseUIDemo"
BlueprintIdentifier = "4A0ECBE4200D8C0200BA84A3"
BuildableName = "ParseUI.framework"
BlueprintName = "ParseUI-Dynamic"
ReferencedContainer = "container:ParseUI.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "8129E5DE1A9CB067006752BC"
BuildableName = "ParseUIDemo.app"
BlueprintName = "ParseUIDemo-Swift"
BlueprintIdentifier = "4A9A9496200D0329005D8F4B"
BuildableName = "ParseUI.framework"
BlueprintName = "ParseUI"
ReferencedContainer = "container:ParseUI.xcodeproj">
</BuildableReference>
</BuildActionEntry>
Expand All @@ -30,15 +30,6 @@
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "8129E5DE1A9CB067006752BC"
BuildableName = "ParseUIDemo.app"
BlueprintName = "ParseUIDemo-Swift"
ReferencedContainer = "container:ParseUI.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
Expand All @@ -53,16 +44,15 @@
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "8129E5DE1A9CB067006752BC"
BuildableName = "ParseUIDemo.app"
BlueprintName = "ParseUIDemo-Swift"
BlueprintIdentifier = "4A9A9496200D0329005D8F4B"
BuildableName = "ParseUI.framework"
BlueprintName = "ParseUI"
ReferencedContainer = "container:ParseUI.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
Expand All @@ -72,16 +62,15 @@
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "8129E5DE1A9CB067006752BC"
BuildableName = "ParseUIDemo.app"
BlueprintName = "ParseUIDemo-Swift"
BlueprintIdentifier = "4A9A9496200D0329005D8F4B"
BuildableName = "ParseUI.framework"
BlueprintName = "ParseUI"
ReferencedContainer = "container:ParseUI.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
Expand Down

0 comments on commit 854dd75

Please sign in to comment.