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

Commit ed4f859

Browse files
committed
Swift3 and Carthage
1 parent 33ec3af commit ed4f859

File tree

28 files changed

+409
-304
lines changed

28 files changed

+409
-304
lines changed

.gitmodules

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

.travis.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ env:
1313
- TEST_TYPE=OSXDemoSwift
1414
- TEST_TYPE=OSXDemoObjC
1515
- TEST_TYPE=CocoaPods
16+
- TEST_TYPE=Carthage
1617
install:
1718
- |
1819
bundle install
@@ -36,6 +37,8 @@ script:
3637
xcodebuild build -workspace ParseLiveQuery.xcworkspace -scheme LiveQueryDemo-ObjC -configuration Debug | xcpretty -c
3738
elif [ "$TEST_TYPE" = CocoaPods ]; then
3839
pod lib lint ParseLiveQuery.podspec
40+
elif [ "$TEST_TYPE" = Carthage ]; then
41+
carthage build --no-skip-current --platform iOS
3942
fi
4043
after_success:
4144
- |

Cartfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
github "BoltsFramework/Bolts-Swift"
2+
github "facebook/SocketRocket" "0.4.2"
3+
github "ParsePlatform/Parse-SDK-iOS-OSX"
4+

Cartfile.resolved

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
github "BoltsFramework/Bolts-ObjC" "1.8.4"
2+
github "BoltsFramework/Bolts-Swift" "1.3.0"
3+
github "facebook/SocketRocket" "0.4.2"
4+
github "ParsePlatform/Parse-SDK-iOS-OSX" "1.14.2"

Carthage/Checkouts/Bolts-ObjC

Submodule Bolts-ObjC added at e64deec

Carthage/Checkouts/Bolts-Swift

Submodule Bolts-Swift added at bbcbab6
Submodule Parse-SDK-iOS-OSX added at 7a820b7

Carthage/Checkouts/SocketRocket

Submodule SocketRocket added at 954c947

Examples/LiveQueryDemo-ObjC.xcodeproj/project.pbxproj

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@
158158
F519CBA91CA9CA04005295C0 /* Project object */ = {
159159
isa = PBXProject;
160160
attributes = {
161-
LastUpgradeCheck = 0730;
161+
LastUpgradeCheck = 0800;
162162
ORGANIZATIONNAME = parse;
163163
TargetAttributes = {
164164
F509D5311CA9E597007B15B0 = {
@@ -292,6 +292,7 @@
292292
isa = XCBuildConfiguration;
293293
baseConfigurationReference = 46BB59B59BEB1C1B30D1528A /* Pods-LiveQueryDemo-ObjC.debug.xcconfig */;
294294
buildSettings = {
295+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
295296
COMBINE_HIDPI_IMAGES = YES;
296297
INFOPLIST_FILE = "$(SRCROOT)/LiveQueryDemo-ObjC/Info.plist";
297298
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
@@ -304,6 +305,7 @@
304305
isa = XCBuildConfiguration;
305306
baseConfigurationReference = BBA908F914DAEEBB466454E2 /* Pods-LiveQueryDemo-ObjC.release.xcconfig */;
306307
buildSettings = {
308+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
307309
COMBINE_HIDPI_IMAGES = YES;
308310
INFOPLIST_FILE = "$(SRCROOT)/LiveQueryDemo-ObjC/Info.plist";
309311
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
@@ -326,8 +328,10 @@
326328
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
327329
CLANG_WARN_EMPTY_BODY = YES;
328330
CLANG_WARN_ENUM_CONVERSION = YES;
331+
CLANG_WARN_INFINITE_RECURSION = YES;
329332
CLANG_WARN_INT_CONVERSION = YES;
330333
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
334+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
331335
CLANG_WARN_UNREACHABLE_CODE = YES;
332336
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
333337
CODE_SIGN_IDENTITY = "-";
@@ -370,8 +374,10 @@
370374
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
371375
CLANG_WARN_EMPTY_BODY = YES;
372376
CLANG_WARN_ENUM_CONVERSION = YES;
377+
CLANG_WARN_INFINITE_RECURSION = YES;
373378
CLANG_WARN_INT_CONVERSION = YES;
374379
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
380+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
375381
CLANG_WARN_UNREACHABLE_CODE = YES;
376382
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
377383
CODE_SIGN_IDENTITY = "-";

Examples/LiveQueryDemo-ObjC.xcodeproj/xcshareddata/xcschemes/LiveQueryDemo-ObjC.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0730"
3+
LastUpgradeVersion = "0800"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

0 commit comments

Comments
 (0)