Skip to content
This repository was archived by the owner on Jan 16, 2021. It is now read-only.

Commit c1e9bbe

Browse files
nlutsenkonlutsenko
authored
Add support for Carthage. (#33)
* Declare Carthage dependency on Bolts-ObjC, Parse. * Add dynamic framework target to support Carthage. * Update CocoaPods to latest when running on Travis-CI.
1 parent 339cbe3 commit c1e9bbe

File tree

9 files changed

+726
-38
lines changed

9 files changed

+726
-38
lines changed

‎.gitmodules

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
11
[submodule "Vendor/xctoolchain"]
22
path = Vendor/xctoolchain
33
url = https://github.com/ParsePlatform/xctoolchain.git
4+
[submodule "Carthage/Checkouts/Bolts-ObjC"]
5+
path = Carthage/Checkouts/Bolts-ObjC
6+
url = https://github.com/BoltsFramework/Bolts-ObjC.git
7+
[submodule "Carthage/Checkouts/Parse-SDK-iOS-OSX"]
8+
path = Carthage/Checkouts/Parse-SDK-iOS-OSX
9+
url = https://github.com/ParsePlatform/Parse-SDK-iOS-OSX.git

‎.travis.yml

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,25 @@ env:
1010
- LANG=en_US.UTF-8
1111
matrix:
1212
- TEST_TYPE=iOS
13-
- TEST_TYPE=CocoaPods
1413
- TEST_TYPE=Package
14+
- TEST_TYPE=CocoaPods
15+
- TEST_TYPE=Carthage
16+
install:
17+
- |
18+
gem install cocoapods
19+
pod install
20+
bundle install
1521
script:
1622
- |
17-
if [ "$TEST_TYPE" = iOS ]; then
18-
set -o pipefail
19-
xcodebuild test -workspace ParseTwitterUtils.xcworkspace -sdk iphonesimulator -scheme ParseTwitterUtils-iOS -configuration Debug -destination "platform=iOS Simulator,name=iPhone 4s" -destination "platform=iOS Simulator,name=iPhone 6s" GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES | xcpretty
20-
elif [ "$TEST_TYPE" = CocoaPods ]; then
21-
pod lib lint ParseTwitterUtils.podspec
22-
pod lib lint --use-libraries ParseTwitterUtils.podspec
23-
elif [ "$TEST_TYPE" = Package ]; then
24-
bundle exec rake package:frameworks
25-
fi
23+
if [ "$TEST_TYPE" = iOS ]; then
24+
set -o pipefail
25+
xcodebuild test -workspace ParseTwitterUtils.xcworkspace -sdk iphonesimulator -scheme ParseTwitterUtils-iOS -configuration Debug -destination "platform=iOS Simulator,name=iPhone 4s" -destination "platform=iOS Simulator,name=iPhone 6s" GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES | xcpretty
26+
elif [ "$TEST_TYPE" = Package ]; then
27+
bundle exec rake package:frameworks
28+
elif [ "$TEST_TYPE" = CocoaPods ]; then
29+
pod lib lint ParseTwitterUtils.podspec
30+
pod lib lint --use-libraries ParseTwitterUtils.podspec
31+
fi
2632
after_success:
2733
- |
2834
if [ "$TEST_TYPE" = iOS ]; then

‎Cartfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
github "ParsePlatform/Parse-SDK-iOS-OSX" ~> 1.13
2+
github "BoltsFramework/Bolts-ObjC" ~> 1.7

‎Cartfile.resolved

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
github "BoltsFramework/Bolts-ObjC" "1.7.0"
2+
github "ParsePlatform/Parse-SDK-iOS-OSX" "1.13.0"

‎Carthage/Checkouts/Bolts-ObjC

Submodule Bolts-ObjC added at 7567e79

‎Carthage/Checkouts/Parse-SDK-iOS-OSX

Submodule Parse-SDK-iOS-OSX added at dccfe42

‎Configurations/ParseTwitterUtils-iOS-Dynamic.xcconfig

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
//
2+
// Copyright (c) 2015-present, Parse, LLC.
3+
// All rights reserved.
4+
//
5+
// This source code is licensed under the BSD-style license found in the
6+
// LICENSE file in the root directory of this source tree. An additional grant
7+
// of patent rights can be found in the PATENTS file in the same directory.
8+
//
9+
10+
#include "Shared/Platform/iOS.xcconfig"
11+
#include "Shared/Product/Framework.xcconfig"
12+
13+
PRODUCT_NAME = ParseTwitterUtils
14+
PRODUCT_BUNDLE_IDENTIFIER = com.parse.twitterutils.ios
15+
DEFINES_MODULE = YES
16+
17+
IPHONEOS_DEPLOYMENT_TARGET = 8.0
18+
19+
MACH_O_TYPE = mh_dylib
20+
DYLIB_INSTALL_NAME_BASE = @rpath
21+
22+
INFOPLIST_FILE = $(SRCROOT)/Resources/Info.plist
23+
24+
OTHER_CFLAGS[sdk=iphoneos9.*] = $(inherited) -fembed-bitcode

‎ParseTwitterUtils.xcodeproj/project.pbxproj

Lines changed: 585 additions & 28 deletions
Large diffs are not rendered by default.

‎ParseTwitterUtils.xcodeproj/xcshareddata/xcschemes/ParseTwitterUtils-iOS-Dynamic.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 = "0730"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "NO"
13+
buildForArchiving = "NO"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "81ECACB71D1E14E000FA7673"
18+
BuildableName = "ParseTwitterUtils.framework"
19+
BlueprintName = "ParseTwitterUtils-iOS-Dynamic"
20+
ReferencedContainer = "container:ParseTwitterUtils.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+
<Testables>
31+
</Testables>
32+
<MacroExpansion>
33+
<BuildableReference
34+
BuildableIdentifier = "primary"
35+
BlueprintIdentifier = "81ECACB71D1E14E000FA7673"
36+
BuildableName = "ParseTwitterUtils.framework"
37+
BlueprintName = "ParseTwitterUtils-iOS-Dynamic"
38+
ReferencedContainer = "container:ParseTwitterUtils.xcodeproj">
39+
</BuildableReference>
40+
</MacroExpansion>
41+
<AdditionalOptions>
42+
</AdditionalOptions>
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+
<MacroExpansion>
55+
<BuildableReference
56+
BuildableIdentifier = "primary"
57+
BlueprintIdentifier = "81ECACB71D1E14E000FA7673"
58+
BuildableName = "ParseTwitterUtils.framework"
59+
BlueprintName = "ParseTwitterUtils-iOS-Dynamic"
60+
ReferencedContainer = "container:ParseTwitterUtils.xcodeproj">
61+
</BuildableReference>
62+
</MacroExpansion>
63+
<AdditionalOptions>
64+
</AdditionalOptions>
65+
</LaunchAction>
66+
<ProfileAction
67+
buildConfiguration = "Release"
68+
shouldUseLaunchSchemeArgsEnv = "YES"
69+
savedToolIdentifier = ""
70+
useCustomWorkingDirectory = "NO"
71+
debugDocumentVersioning = "YES">
72+
<MacroExpansion>
73+
<BuildableReference
74+
BuildableIdentifier = "primary"
75+
BlueprintIdentifier = "81ECACB71D1E14E000FA7673"
76+
BuildableName = "ParseTwitterUtils.framework"
77+
BlueprintName = "ParseTwitterUtils-iOS-Dynamic"
78+
ReferencedContainer = "container:ParseTwitterUtils.xcodeproj">
79+
</BuildableReference>
80+
</MacroExpansion>
81+
</ProfileAction>
82+
<AnalyzeAction
83+
buildConfiguration = "Debug">
84+
</AnalyzeAction>
85+
<ArchiveAction
86+
buildConfiguration = "Release"
87+
revealArchiveInOrganizer = "YES">
88+
</ArchiveAction>
89+
</Scheme>

0 commit comments

Comments
 (0)