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

Commit

Permalink
Add support for Carthage. (#33)
Browse files Browse the repository at this point in the history
* Declare Carthage dependency on Bolts-ObjC, Parse.

* Add dynamic framework target to support Carthage.

* Update CocoaPods to latest when running on Travis-CI.
  • Loading branch information
nlutsenko authored Jun 28, 2016
1 parent 339cbe3 commit c1e9bbe
Show file tree
Hide file tree
Showing 9 changed files with 726 additions and 38 deletions.
6 changes: 6 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
[submodule "Vendor/xctoolchain"]
path = Vendor/xctoolchain
url = https://github.com/ParsePlatform/xctoolchain.git
[submodule "Carthage/Checkouts/Bolts-ObjC"]
path = Carthage/Checkouts/Bolts-ObjC
url = https://github.com/BoltsFramework/Bolts-ObjC.git
[submodule "Carthage/Checkouts/Parse-SDK-iOS-OSX"]
path = Carthage/Checkouts/Parse-SDK-iOS-OSX
url = https://github.com/ParsePlatform/Parse-SDK-iOS-OSX.git
26 changes: 16 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,25 @@ env:
- LANG=en_US.UTF-8
matrix:
- TEST_TYPE=iOS
- TEST_TYPE=CocoaPods
- TEST_TYPE=Package
- TEST_TYPE=CocoaPods
- TEST_TYPE=Carthage
install:
- |
gem install cocoapods
pod install
bundle install
script:
- |
if [ "$TEST_TYPE" = iOS ]; then
set -o pipefail
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
elif [ "$TEST_TYPE" = CocoaPods ]; then
pod lib lint ParseTwitterUtils.podspec
pod lib lint --use-libraries ParseTwitterUtils.podspec
elif [ "$TEST_TYPE" = Package ]; then
bundle exec rake package:frameworks
fi
if [ "$TEST_TYPE" = iOS ]; then
set -o pipefail
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
elif [ "$TEST_TYPE" = Package ]; then
bundle exec rake package:frameworks
elif [ "$TEST_TYPE" = CocoaPods ]; then
pod lib lint ParseTwitterUtils.podspec
pod lib lint --use-libraries ParseTwitterUtils.podspec
fi
after_success:
- |
if [ "$TEST_TYPE" = iOS ]; then
Expand Down
2 changes: 2 additions & 0 deletions Cartfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
github "ParsePlatform/Parse-SDK-iOS-OSX" ~> 1.13
github "BoltsFramework/Bolts-ObjC" ~> 1.7
2 changes: 2 additions & 0 deletions Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
github "BoltsFramework/Bolts-ObjC" "1.7.0"
github "ParsePlatform/Parse-SDK-iOS-OSX" "1.13.0"
1 change: 1 addition & 0 deletions Carthage/Checkouts/Bolts-ObjC
Submodule Bolts-ObjC added at 7567e7
1 change: 1 addition & 0 deletions Carthage/Checkouts/Parse-SDK-iOS-OSX
Submodule Parse-SDK-iOS-OSX added at dccfe4
24 changes: 24 additions & 0 deletions Configurations/ParseTwitterUtils-iOS-Dynamic.xcconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
//
// Copyright (c) 2015-present, Parse, LLC.
// All rights reserved.
//
// This source code is licensed under the BSD-style license found in the
// LICENSE file in the root directory of this source tree. An additional grant
// of patent rights can be found in the PATENTS file in the same directory.
//

#include "Shared/Platform/iOS.xcconfig"
#include "Shared/Product/Framework.xcconfig"

PRODUCT_NAME = ParseTwitterUtils
PRODUCT_BUNDLE_IDENTIFIER = com.parse.twitterutils.ios
DEFINES_MODULE = YES

IPHONEOS_DEPLOYMENT_TARGET = 8.0

MACH_O_TYPE = mh_dylib
DYLIB_INSTALL_NAME_BASE = @rpath

INFOPLIST_FILE = $(SRCROOT)/Resources/Info.plist

OTHER_CFLAGS[sdk=iphoneos9.*] = $(inherited) -fembed-bitcode
613 changes: 585 additions & 28 deletions ParseTwitterUtils.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0730"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "NO"
buildForArchiving = "NO"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "81ECACB71D1E14E000FA7673"
BuildableName = "ParseTwitterUtils.framework"
BlueprintName = "ParseTwitterUtils-iOS-Dynamic"
ReferencedContainer = "container:ParseTwitterUtils.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "81ECACB71D1E14E000FA7673"
BuildableName = "ParseTwitterUtils.framework"
BlueprintName = "ParseTwitterUtils-iOS-Dynamic"
ReferencedContainer = "container:ParseTwitterUtils.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "81ECACB71D1E14E000FA7673"
BuildableName = "ParseTwitterUtils.framework"
BlueprintName = "ParseTwitterUtils-iOS-Dynamic"
ReferencedContainer = "container:ParseTwitterUtils.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "81ECACB71D1E14E000FA7673"
BuildableName = "ParseTwitterUtils.framework"
BlueprintName = "ParseTwitterUtils-iOS-Dynamic"
ReferencedContainer = "container:ParseTwitterUtils.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>

0 comments on commit c1e9bbe

Please sign in to comment.