Skip to content
This repository was archived by the owner on Jun 13, 2023. It is now read-only.

Carthage support #95

Merged
merged 11 commits into from
Feb 24, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
[submodule "Carthage/Checkouts/Bolts-Swift"]
path = Carthage/Checkouts/Bolts-Swift
url = https://github.com/BoltsFramework/Bolts-Swift.git
[submodule "Carthage/Checkouts/SocketRocket"]
path = Carthage/Checkouts/SocketRocket
url = https://github.com/facebook/SocketRocket.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
[submodule "Carthage/Checkouts/Starscream"]
path = Carthage/Checkouts/Starscream
url = https://github.com/daltoniam/Starscream.git
6 changes: 2 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ env:
install:
- |
bundle install
bundle exec pod repo update
bundle exec pod install
script:
- |
if [ "$TEST_TYPE" = iOS ]; then
Expand All @@ -36,8 +34,8 @@ script:
xcodebuild clean -workspace ParseLiveQuery.xcworkspace -scheme LiveQueryDemo-ObjC | xcpretty -c
xcodebuild build -workspace ParseLiveQuery.xcworkspace -scheme LiveQueryDemo-ObjC -configuration Debug | xcpretty -c
elif [ "$TEST_TYPE" = CocoaPods ]; then
# SocketRocket produces warnings on xcode8
pod lib lint ParseLiveQuery.podspec --allow-warnings
bundle exec pod repo update 2>&1 || exit 1
pod lib lint ParseLiveQuery.podspec
elif [ "$TEST_TYPE" = Carthage ]; then
carthage build --no-skip-current
fi
Expand Down
2 changes: 1 addition & 1 deletion Cartfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
github "BoltsFramework/Bolts-Swift" == 1.3.0
github "facebook/SocketRocket" "master"
github "ParsePlatform/Parse-SDK-iOS-OSX" == 1.14.2
github "daltoniam/Starscream" == 2.0.3

2 changes: 1 addition & 1 deletion Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
github "BoltsFramework/Bolts-ObjC" "1.8.4"
github "BoltsFramework/Bolts-Swift" "1.3.0"
github "facebook/SocketRocket" "41b57bb2fc292a814f758441a05243eb38457027"
github "daltoniam/Starscream" "2.0.3"
github "ParsePlatform/Parse-SDK-iOS-OSX" "1.14.2"
1 change: 0 additions & 1 deletion Carthage/Checkouts/SocketRocket
Submodule SocketRocket deleted from 41b57b
1 change: 1 addition & 0 deletions Carthage/Checkouts/Starscream
Submodule Starscream added at 138593
103 changes: 0 additions & 103 deletions Examples/LiveQueryDemo-ObjC.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
objects = {

/* Begin PBXBuildFile section */
8F68026DAC07EBB6ABECA553 /* Pods_LiveQueryDemo_ObjC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B8FE714A9B78962AE71BE6E5 /* Pods_LiveQueryDemo_ObjC.framework */; };
F509D5461CA9E5B8007B15B0 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = F519CBB41CA9CA04005295C0 /* main.m */; };
F509D5471CA9E5B8007B15B0 /* Message.m in Sources */ = {isa = PBXBuildFile; fileRef = F519CBBC1CA9CA2B005295C0 /* Message.m */; };
F509D5481CA9E5B8007B15B0 /* Room.m in Sources */ = {isa = PBXBuildFile; fileRef = F519CBBF1CA9CA34005295C0 /* Room.m */; };
Expand Down Expand Up @@ -61,7 +60,6 @@
buildActionMask = 2147483647;
files = (
F570348B1CAC837800EB3067 /* ParseLiveQuery.framework in Frameworks */,
8F68026DAC07EBB6ABECA553 /* Pods_LiveQueryDemo_ObjC.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -135,15 +133,9 @@
isa = PBXNativeTarget;
buildConfigurationList = F509D5431CA9E597007B15B0 /* Build configuration list for PBXNativeTarget "LiveQueryDemo-ObjC" */;
buildPhases = (
208FAA4977FAE6125655600F /* [CP] Check Pods Manifest.lock */,
87DA45B46CF98727F2E13351 /* [CP] Check Pods Manifest.lock */,
F509D52E1CA9E597007B15B0 /* Sources */,
F509D52F1CA9E597007B15B0 /* Frameworks */,
F509D5301CA9E597007B15B0 /* Resources */,
EA41B3F790AE39BE08641EBB /* [CP] Embed Pods Frameworks */,
A8851B9B8AD727FB055366F2 /* [CP] Copy Pods Resources */,
AEF3C7E9E62737C95CCEDF15 /* 📦 Embed Pods Frameworks */,
6527F5DEB5EFD1866B2614D7 /* 📦 Copy Pods Resources */,
);
buildRules = (
);
Expand Down Expand Up @@ -220,99 +212,6 @@
};
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
208FAA4977FAE6125655600F /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "[CP] Check Pods Manifest.lock";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_ROOT}/../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";
showEnvVarsInLog = 0;
};
6527F5DEB5EFD1866B2614D7 /* 📦 Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "📦 Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-LiveQueryDemo-ObjC/Pods-LiveQueryDemo-ObjC-resources.sh\"\n";
showEnvVarsInLog = 0;
};
87DA45B46CF98727F2E13351 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "[CP] Check Pods Manifest.lock";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
showEnvVarsInLog = 0;
};
A8851B9B8AD727FB055366F2 /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "[CP] Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-LiveQueryDemo-ObjC/Pods-LiveQueryDemo-ObjC-resources.sh\"\n";
showEnvVarsInLog = 0;
};
AEF3C7E9E62737C95CCEDF15 /* 📦 Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "📦 Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-LiveQueryDemo-ObjC/Pods-LiveQueryDemo-ObjC-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
EA41B3F790AE39BE08641EBB /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-LiveQueryDemo-ObjC/Pods-LiveQueryDemo-ObjC-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
F509D52E1CA9E597007B15B0 /* Sources */ = {
isa = PBXSourcesBuildPhase;
Expand All @@ -338,7 +237,6 @@
/* Begin XCBuildConfiguration section */
F509D5401CA9E597007B15B0 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 46BB59B59BEB1C1B30D1528A /* Pods-LiveQueryDemo-ObjC.debug.xcconfig */;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
COMBINE_HIDPI_IMAGES = YES;
Expand All @@ -352,7 +250,6 @@
};
F509D5411CA9E597007B15B0 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = BBA908F914DAEEBB466454E2 /* Pods-LiveQueryDemo-ObjC.release.xcconfig */;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
COMBINE_HIDPI_IMAGES = YES;
Expand Down
103 changes: 0 additions & 103 deletions Examples/LiveQueryDemo.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
objects = {

/* Begin PBXBuildFile section */
B88040BD3E7C225E22705572 /* Pods_LiveQueryDemo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E6A6F02FD57E57309877DA38 /* Pods_LiveQueryDemo.framework */; };
F509D5281CA9E4D9007B15B0 /* ParseLiveQuery.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8199A4061CA1EF1800BF61E1 /* ParseLiveQuery.framework */; };
F509D5291CA9E53D007B15B0 /* Message.swift in Sources */ = {isa = PBXBuildFile; fileRef = F59F85B61C9BB4B600566A29 /* Message.swift */; };
F509D52A1CA9E53D007B15B0 /* Room.swift in Sources */ = {isa = PBXBuildFile; fileRef = F59F85B71C9BB4B600566A29 /* Room.swift */; };
Expand Down Expand Up @@ -50,7 +49,6 @@
buildActionMask = 2147483647;
files = (
F509D5281CA9E4D9007B15B0 /* ParseLiveQuery.framework in Frameworks */,
B88040BD3E7C225E22705572 /* Pods_LiveQueryDemo.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -123,15 +121,9 @@
isa = PBXNativeTarget;
buildConfigurationList = F509D5251CA9E4AE007B15B0 /* Build configuration list for PBXNativeTarget "LiveQueryDemo" */;
buildPhases = (
9D539417025C30ADB0E1A1F6 /* [CP] Check Pods Manifest.lock */,
E6F699DDDA9E6B861F705AD5 /* [CP] Check Pods Manifest.lock */,
F509D5131CA9E4AE007B15B0 /* Sources */,
F509D5141CA9E4AE007B15B0 /* Frameworks */,
F509D5151CA9E4AE007B15B0 /* Resources */,
045C33FD1807E3932888A2F9 /* [CP] Embed Pods Frameworks */,
D9EF05A29B9F1AAC9B62408C /* [CP] Copy Pods Resources */,
EAD62EF23FE70C6E3984EDE6 /* 📦 Embed Pods Frameworks */,
E3F143CFD9CCD46782420827 /* 📦 Copy Pods Resources */,
);
buildRules = (
);
Expand Down Expand Up @@ -209,99 +201,6 @@
};
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
045C33FD1807E3932888A2F9 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-LiveQueryDemo/Pods-LiveQueryDemo-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
9D539417025C30ADB0E1A1F6 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "[CP] Check Pods Manifest.lock";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_ROOT}/../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";
showEnvVarsInLog = 0;
};
D9EF05A29B9F1AAC9B62408C /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "[CP] Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-LiveQueryDemo/Pods-LiveQueryDemo-resources.sh\"\n";
showEnvVarsInLog = 0;
};
E3F143CFD9CCD46782420827 /* 📦 Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "📦 Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-LiveQueryDemo/Pods-LiveQueryDemo-resources.sh\"\n";
showEnvVarsInLog = 0;
};
E6F699DDDA9E6B861F705AD5 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "[CP] Check Pods Manifest.lock";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
showEnvVarsInLog = 0;
};
EAD62EF23FE70C6E3984EDE6 /* 📦 Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "📦 Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-LiveQueryDemo/Pods-LiveQueryDemo-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
F509D5131CA9E4AE007B15B0 /* Sources */ = {
isa = PBXSourcesBuildPhase;
Expand All @@ -318,7 +217,6 @@
/* Begin XCBuildConfiguration section */
F509D5261CA9E4AE007B15B0 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 3AC9312CEDA0007F8EAA9880 /* Pods-LiveQueryDemo.debug.xcconfig */;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
CLANG_ANALYZER_NONNULL = YES;
Expand All @@ -333,7 +231,6 @@
};
F509D5271CA9E4AE007B15B0 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 497772719B97C861F0896BFC /* Pods-LiveQueryDemo.release.xcconfig */;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
CLANG_ANALYZER_NONNULL = YES;
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ source 'https://rubygems.org'

gem 'xcpretty'
# xcode8 compat
gem 'cocoapods', '1.1.0.rc.2'
gem 'cocoapods', '1.1.1'
Loading