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

Commit 0c3cab6

Browse files
flovilmartflovilmart
authored
Merge pull request #70 from ParsePlatform/swift-3
Swift3 and Carthage
2 parents 33ec3af + 58d30b8 commit 0c3cab6

32 files changed

+601
-328
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

‎.swift-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3.0

‎.travis.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ branches:
33
- master
44
language: objective-c
55
os: osx
6-
osx_image: xcode7.3
6+
osx_image: xcode8
77
cache:
88
- cocoapods
99
env:
@@ -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
@@ -35,7 +36,10 @@ script:
3536
xcodebuild clean -workspace ParseLiveQuery.xcworkspace -scheme LiveQueryDemo-ObjC | xcpretty -c
3637
xcodebuild build -workspace ParseLiveQuery.xcworkspace -scheme LiveQueryDemo-ObjC -configuration Debug | xcpretty -c
3738
elif [ "$TEST_TYPE" = CocoaPods ]; then
38-
pod lib lint ParseLiveQuery.podspec
39+
# SocketRocket produces warnings on xcode8
40+
pod lib lint ParseLiveQuery.podspec --allow-warnings
41+
elif [ "$TEST_TYPE" = Carthage ]; then
42+
carthage build --no-skip-current
3943
fi
4044
after_success:
4145
- |

‎Cartfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
github "BoltsFramework/Bolts-Swift" == 1.3.0
2+
github "facebook/SocketRocket" "master"
3+
github "ParsePlatform/Parse-SDK-iOS-OSX" == 1.14.2
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" "41b57bb2fc292a814f758441a05243eb38457027"
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

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

Submodule Parse-SDK-iOS-OSX added at 7a820b7

‎Carthage/Checkouts/SocketRocket

Submodule SocketRocket added at 41b57bb

‎Examples/LiveQueryDemo-ObjC.xcodeproj/project.pbxproj

Lines changed: 57 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,12 +135,15 @@
135135
isa = PBXNativeTarget;
136136
buildConfigurationList = F509D5431CA9E597007B15B0 /* Build configuration list for PBXNativeTarget "LiveQueryDemo-ObjC" */;
137137
buildPhases = (
138+
208FAA4977FAE6125655600F /* [CP] Check Pods Manifest.lock */,
138139
87DA45B46CF98727F2E13351 /* [CP] Check Pods Manifest.lock */,
139140
F509D52E1CA9E597007B15B0 /* Sources */,
140141
F509D52F1CA9E597007B15B0 /* Frameworks */,
141142
F509D5301CA9E597007B15B0 /* Resources */,
142143
EA41B3F790AE39BE08641EBB /* [CP] Embed Pods Frameworks */,
143144
A8851B9B8AD727FB055366F2 /* [CP] Copy Pods Resources */,
145+
AEF3C7E9E62737C95CCEDF15 /* 📦 Embed Pods Frameworks */,
146+
6527F5DEB5EFD1866B2614D7 /* 📦 Copy Pods Resources */,
144147
);
145148
buildRules = (
146149
);
@@ -158,7 +161,7 @@
158161
F519CBA91CA9CA04005295C0 /* Project object */ = {
159162
isa = PBXProject;
160163
attributes = {
161-
LastUpgradeCheck = 0730;
164+
LastUpgradeCheck = 0800;
162165
ORGANIZATIONNAME = parse;
163166
TargetAttributes = {
164167
F509D5311CA9E597007B15B0 = {
@@ -218,6 +221,36 @@
218221
/* End PBXResourcesBuildPhase section */
219222

220223
/* Begin PBXShellScriptBuildPhase section */
224+
208FAA4977FAE6125655600F /* [CP] Check Pods Manifest.lock */ = {
225+
isa = PBXShellScriptBuildPhase;
226+
buildActionMask = 2147483647;
227+
files = (
228+
);
229+
inputPaths = (
230+
);
231+
name = "[CP] Check Pods Manifest.lock";
232+
outputPaths = (
233+
);
234+
runOnlyForDeploymentPostprocessing = 0;
235+
shellPath = /bin/sh;
236+
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";
237+
showEnvVarsInLog = 0;
238+
};
239+
6527F5DEB5EFD1866B2614D7 /* 📦 Copy Pods Resources */ = {
240+
isa = PBXShellScriptBuildPhase;
241+
buildActionMask = 2147483647;
242+
files = (
243+
);
244+
inputPaths = (
245+
);
246+
name = "📦 Copy Pods Resources";
247+
outputPaths = (
248+
);
249+
runOnlyForDeploymentPostprocessing = 0;
250+
shellPath = /bin/sh;
251+
shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-LiveQueryDemo-ObjC/Pods-LiveQueryDemo-ObjC-resources.sh\"\n";
252+
showEnvVarsInLog = 0;
253+
};
221254
87DA45B46CF98727F2E13351 /* [CP] Check Pods Manifest.lock */ = {
222255
isa = PBXShellScriptBuildPhase;
223256
buildActionMask = 2147483647;
@@ -248,6 +281,21 @@
248281
shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-LiveQueryDemo-ObjC/Pods-LiveQueryDemo-ObjC-resources.sh\"\n";
249282
showEnvVarsInLog = 0;
250283
};
284+
AEF3C7E9E62737C95CCEDF15 /* 📦 Embed Pods Frameworks */ = {
285+
isa = PBXShellScriptBuildPhase;
286+
buildActionMask = 2147483647;
287+
files = (
288+
);
289+
inputPaths = (
290+
);
291+
name = "📦 Embed Pods Frameworks";
292+
outputPaths = (
293+
);
294+
runOnlyForDeploymentPostprocessing = 0;
295+
shellPath = /bin/sh;
296+
shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-LiveQueryDemo-ObjC/Pods-LiveQueryDemo-ObjC-frameworks.sh\"\n";
297+
showEnvVarsInLog = 0;
298+
};
251299
EA41B3F790AE39BE08641EBB /* [CP] Embed Pods Frameworks */ = {
252300
isa = PBXShellScriptBuildPhase;
253301
buildActionMask = 2147483647;
@@ -292,23 +340,27 @@
292340
isa = XCBuildConfiguration;
293341
baseConfigurationReference = 46BB59B59BEB1C1B30D1528A /* Pods-LiveQueryDemo-ObjC.debug.xcconfig */;
294342
buildSettings = {
343+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
295344
COMBINE_HIDPI_IMAGES = YES;
296345
INFOPLIST_FILE = "$(SRCROOT)/LiveQueryDemo-ObjC/Info.plist";
297346
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
298347
PRODUCT_BUNDLE_IDENTIFIER = com.parse.LiveQueryDemo;
299348
PRODUCT_NAME = "$(TARGET_NAME)";
349+
SWIFT_VERSION = 3.0;
300350
};
301351
name = Debug;
302352
};
303353
F509D5411CA9E597007B15B0 /* Release */ = {
304354
isa = XCBuildConfiguration;
305355
baseConfigurationReference = BBA908F914DAEEBB466454E2 /* Pods-LiveQueryDemo-ObjC.release.xcconfig */;
306356
buildSettings = {
357+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
307358
COMBINE_HIDPI_IMAGES = YES;
308359
INFOPLIST_FILE = "$(SRCROOT)/LiveQueryDemo-ObjC/Info.plist";
309360
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
310361
PRODUCT_BUNDLE_IDENTIFIER = com.parse.LiveQueryDemo;
311362
PRODUCT_NAME = "$(TARGET_NAME)";
363+
SWIFT_VERSION = 3.0;
312364
};
313365
name = Release;
314366
};
@@ -326,8 +378,10 @@
326378
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
327379
CLANG_WARN_EMPTY_BODY = YES;
328380
CLANG_WARN_ENUM_CONVERSION = YES;
381+
CLANG_WARN_INFINITE_RECURSION = YES;
329382
CLANG_WARN_INT_CONVERSION = YES;
330383
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
384+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
331385
CLANG_WARN_UNREACHABLE_CODE = YES;
332386
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
333387
CODE_SIGN_IDENTITY = "-";
@@ -370,8 +424,10 @@
370424
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
371425
CLANG_WARN_EMPTY_BODY = YES;
372426
CLANG_WARN_ENUM_CONVERSION = YES;
427+
CLANG_WARN_INFINITE_RECURSION = YES;
373428
CLANG_WARN_INT_CONVERSION = YES;
374429
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
430+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
375431
CLANG_WARN_UNREACHABLE_CODE = YES;
376432
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
377433
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"

‎Examples/LiveQueryDemo.xcodeproj/project.pbxproj

Lines changed: 59 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,12 +123,15 @@
123123
isa = PBXNativeTarget;
124124
buildConfigurationList = F509D5251CA9E4AE007B15B0 /* Build configuration list for PBXNativeTarget "LiveQueryDemo" */;
125125
buildPhases = (
126+
9D539417025C30ADB0E1A1F6 /* [CP] Check Pods Manifest.lock */,
126127
E6F699DDDA9E6B861F705AD5 /* [CP] Check Pods Manifest.lock */,
127128
F509D5131CA9E4AE007B15B0 /* Sources */,
128129
F509D5141CA9E4AE007B15B0 /* Frameworks */,
129130
F509D5151CA9E4AE007B15B0 /* Resources */,
130131
045C33FD1807E3932888A2F9 /* [CP] Embed Pods Frameworks */,
131132
D9EF05A29B9F1AAC9B62408C /* [CP] Copy Pods Resources */,
133+
EAD62EF23FE70C6E3984EDE6 /* 📦 Embed Pods Frameworks */,
134+
E3F143CFD9CCD46782420827 /* 📦 Copy Pods Resources */,
132135
);
133136
buildRules = (
134137
);
@@ -146,11 +149,12 @@
146149
isa = PBXProject;
147150
attributes = {
148151
LastSwiftUpdateCheck = 0720;
149-
LastUpgradeCheck = 0720;
152+
LastUpgradeCheck = 0800;
150153
ORGANIZATIONNAME = Parse;
151154
TargetAttributes = {
152155
F509D5161CA9E4AE007B15B0 = {
153156
CreatedOnToolsVersion = 7.3;
157+
LastSwiftMigration = 0800;
154158
};
155159
};
156160
};
@@ -221,6 +225,21 @@
221225
shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-LiveQueryDemo/Pods-LiveQueryDemo-frameworks.sh\"\n";
222226
showEnvVarsInLog = 0;
223227
};
228+
9D539417025C30ADB0E1A1F6 /* [CP] Check Pods Manifest.lock */ = {
229+
isa = PBXShellScriptBuildPhase;
230+
buildActionMask = 2147483647;
231+
files = (
232+
);
233+
inputPaths = (
234+
);
235+
name = "[CP] Check Pods Manifest.lock";
236+
outputPaths = (
237+
);
238+
runOnlyForDeploymentPostprocessing = 0;
239+
shellPath = /bin/sh;
240+
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";
241+
showEnvVarsInLog = 0;
242+
};
224243
D9EF05A29B9F1AAC9B62408C /* [CP] Copy Pods Resources */ = {
225244
isa = PBXShellScriptBuildPhase;
226245
buildActionMask = 2147483647;
@@ -236,6 +255,21 @@
236255
shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-LiveQueryDemo/Pods-LiveQueryDemo-resources.sh\"\n";
237256
showEnvVarsInLog = 0;
238257
};
258+
E3F143CFD9CCD46782420827 /* 📦 Copy Pods Resources */ = {
259+
isa = PBXShellScriptBuildPhase;
260+
buildActionMask = 2147483647;
261+
files = (
262+
);
263+
inputPaths = (
264+
);
265+
name = "📦 Copy Pods Resources";
266+
outputPaths = (
267+
);
268+
runOnlyForDeploymentPostprocessing = 0;
269+
shellPath = /bin/sh;
270+
shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-LiveQueryDemo/Pods-LiveQueryDemo-resources.sh\"\n";
271+
showEnvVarsInLog = 0;
272+
};
239273
E6F699DDDA9E6B861F705AD5 /* [CP] Check Pods Manifest.lock */ = {
240274
isa = PBXShellScriptBuildPhase;
241275
buildActionMask = 2147483647;
@@ -251,6 +285,21 @@
251285
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";
252286
showEnvVarsInLog = 0;
253287
};
288+
EAD62EF23FE70C6E3984EDE6 /* 📦 Embed Pods Frameworks */ = {
289+
isa = PBXShellScriptBuildPhase;
290+
buildActionMask = 2147483647;
291+
files = (
292+
);
293+
inputPaths = (
294+
);
295+
name = "📦 Embed Pods Frameworks";
296+
outputPaths = (
297+
);
298+
runOnlyForDeploymentPostprocessing = 0;
299+
shellPath = /bin/sh;
300+
shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-LiveQueryDemo/Pods-LiveQueryDemo-frameworks.sh\"\n";
301+
showEnvVarsInLog = 0;
302+
};
254303
/* End PBXShellScriptBuildPhase section */
255304

256305
/* Begin PBXSourcesBuildPhase section */
@@ -271,25 +320,29 @@
271320
isa = XCBuildConfiguration;
272321
baseConfigurationReference = 3AC9312CEDA0007F8EAA9880 /* Pods-LiveQueryDemo.debug.xcconfig */;
273322
buildSettings = {
323+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
274324
CLANG_ANALYZER_NONNULL = YES;
275325
COMBINE_HIDPI_IMAGES = YES;
276326
INFOPLIST_FILE = "$(SRCROOT)/LiveQueryDemo/Info.plist";
277327
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
278328
PRODUCT_BUNDLE_IDENTIFIER = com.parse.LiveQueryDemo;
279329
PRODUCT_NAME = "$(TARGET_NAME)";
330+
SWIFT_VERSION = 3.0;
280331
};
281332
name = Debug;
282333
};
283334
F509D5271CA9E4AE007B15B0 /* Release */ = {
284335
isa = XCBuildConfiguration;
285336
baseConfigurationReference = 497772719B97C861F0896BFC /* Pods-LiveQueryDemo.release.xcconfig */;
286337
buildSettings = {
338+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
287339
CLANG_ANALYZER_NONNULL = YES;
288340
COMBINE_HIDPI_IMAGES = YES;
289341
INFOPLIST_FILE = "$(SRCROOT)/LiveQueryDemo/Info.plist";
290342
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
291343
PRODUCT_BUNDLE_IDENTIFIER = com.parse.LiveQueryDemo;
292344
PRODUCT_NAME = "$(TARGET_NAME)";
345+
SWIFT_VERSION = 3.0;
293346
};
294347
name = Release;
295348
};
@@ -306,8 +359,10 @@
306359
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
307360
CLANG_WARN_EMPTY_BODY = YES;
308361
CLANG_WARN_ENUM_CONVERSION = YES;
362+
CLANG_WARN_INFINITE_RECURSION = YES;
309363
CLANG_WARN_INT_CONVERSION = YES;
310364
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
365+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
311366
CLANG_WARN_UNREACHABLE_CODE = YES;
312367
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
313368
CODE_SIGN_IDENTITY = "-";
@@ -350,8 +405,10 @@
350405
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
351406
CLANG_WARN_EMPTY_BODY = YES;
352407
CLANG_WARN_ENUM_CONVERSION = YES;
408+
CLANG_WARN_INFINITE_RECURSION = YES;
353409
CLANG_WARN_INT_CONVERSION = YES;
354410
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
411+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
355412
CLANG_WARN_UNREACHABLE_CODE = YES;
356413
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
357414
CODE_SIGN_IDENTITY = "-";
@@ -370,6 +427,7 @@
370427
MACOSX_DEPLOYMENT_TARGET = 10.11;
371428
MTL_ENABLE_DEBUG_INFO = NO;
372429
SDKROOT = macosx;
430+
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
373431
};
374432
name = Release;
375433
};

‎Examples/LiveQueryDemo.xcodeproj/xcshareddata/xcschemes/LiveQueryDemo.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)