Merge pull request #70 from ParsePlatform/swift-3

Swift3 and Carthage

Author: flovilmart

.gitmodules

@@ -0,0 +1,12 @@
+[submodule "Carthage/Checkouts/Bolts-ObjC"]
+	path = Carthage/Checkouts/Bolts-ObjC
+	url = https://github.com/BoltsFramework/Bolts-ObjC.git
+[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

.swift-version

@@ -0,0 +1 @@
+3.0

.travis.yml

@@ -3,7 +3,7 @@ branches:
     - master
 language: objective-c
 os: osx
-osx_image: xcode7.3
+osx_image: xcode8
 cache:
   - cocoapods
 env:
@@ -13,6 +13,7 @@ env:
     - TEST_TYPE=OSXDemoSwift
     - TEST_TYPE=OSXDemoObjC
     - TEST_TYPE=CocoaPods
+    - TEST_TYPE=Carthage
 install:
 - |
   bundle install
@@ -35,7 +36,10 @@ 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
-      pod lib lint ParseLiveQuery.podspec
+      # SocketRocket produces warnings on xcode8
+      pod lib lint ParseLiveQuery.podspec --allow-warnings
+    elif [ "$TEST_TYPE" = Carthage ]; then
+      carthage build --no-skip-current
     fi
 after_success:
 - |

Cartfile

@@ -0,0 +1,4 @@
+github "BoltsFramework/Bolts-Swift" == 1.3.0
+github "facebook/SocketRocket" "master"
+github "ParsePlatform/Parse-SDK-iOS-OSX" == 1.14.2
+

Cartfile.resolved

@@ -0,0 +1,4 @@
+github "BoltsFramework/Bolts-ObjC" "1.8.4"
+github "BoltsFramework/Bolts-Swift" "1.3.0"
+github "facebook/SocketRocket" "41b57bb2fc292a814f758441a05243eb38457027"
+github "ParsePlatform/Parse-SDK-iOS-OSX" "1.14.2"

Carthage/Checkouts/Bolts-ObjC

@@ -135,12 +135,15 @@
 			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 = (
 			);
@@ -158,7 +161,7 @@
 		F519CBA91CA9CA04005295C0 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0730;
+				LastUpgradeCheck = 0800;
 				ORGANIZATIONNAME = parse;
 				TargetAttributes = {
 					F509D5311CA9E597007B15B0 = {
@@ -218,6 +221,36 @@
 /* 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;
@@ -248,6 +281,21 @@
 			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;
@@ -292,23 +340,27 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 46BB59B59BEB1C1B30D1528A /* Pods-LiveQueryDemo-ObjC.debug.xcconfig */;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				COMBINE_HIDPI_IMAGES = YES;
 				INFOPLIST_FILE = "$(SRCROOT)/LiveQueryDemo-ObjC/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.parse.LiveQueryDemo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
 		F509D5411CA9E597007B15B0 /* Release */ = {
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = BBA908F914DAEEBB466454E2 /* Pods-LiveQueryDemo-ObjC.release.xcconfig */;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				COMBINE_HIDPI_IMAGES = YES;
 				INFOPLIST_FILE = "$(SRCROOT)/LiveQueryDemo-ObjC/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.parse.LiveQueryDemo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Release;
 		};
@@ -326,8 +378,10 @@
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "-";
@@ -370,8 +424,10 @@
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "-";