Merge pull request #958 from ParsePlatform/nlutsenko.configuration

Update all configurations and dependencies.

Author: nlutsenko

.travis.yml

@@ -10,7 +10,7 @@ env:
     - LANG=en_US.UTF-8
   matrix:
     - TEST_TYPE=iOS
-    - TEST_TYPE=OSX
+    - TEST_TYPE=macOS
     - TEST_TYPE=Deployment
     - TEST_TYPE=Starters
     - TEST_TYPE=CocoaPods
@@ -29,10 +29,10 @@ install:
   fi
 script:
 - |
-  TEST_TYPE=$(echo "$TEST_TYPE" | tr '[:upper:]' '[:lower:]')
-  bundle exec rake test:$TEST_TYPE
+  RAKE_TASK_NAME=$(echo "$TEST_TYPE" | tr '[:upper:]' '[:lower:]')
+  bundle exec rake test:$RAKE_TASK_NAME
 after_success:
 - |
-  if [ "$TEST_TYPE" = "ios" ] || [ "$TEST_TYPE" = "osx" ]; then
+  if [ "$TEST_TYPE" = iOS ] || [ "$TEST_TYPE" = macOS ]; then
     bash <(curl -s https://codecov.io/bash)
-  fi
+  fi

Cartfile.resolved

@@ -1,2 +1,2 @@
-github "BoltsFramework/Bolts-ObjC" "1.7.0"
-github "erikdoe/OCMock" "v3.2.2"
+github "BoltsFramework/Bolts-ObjC" "1.8.3"
+github "erikdoe/OCMock" "v3.3.1"

Carthage/Checkouts/Bolts-ObjC

@@ -8,17 +8,14 @@
 //
 
 #include "Shared/Platform/iOS.xcconfig"
-#include "Shared/Product/Framework.xcconfig"
+#include "Shared/Product/DynamicFramework.xcconfig"
 
 PRODUCT_NAME = Parse
 PRODUCT_BUNDLE_IDENTIFIER = com.parse.ios
-DEFINES_MODULE = YES
 
 IPHONEOS_DEPLOYMENT_TARGET = 8.0
 
-MACH_O_TYPE = mh_dylib
-DYLIB_INSTALL_NAME_BASE = @rpath
-
 INFOPLIST_FILE = $(PROJECT_DIR)/Parse/Resources/Parse-iOS.Info.plist
 
-OTHER_CFLAGS[sdk=iphoneos9.*] = $(inherited) -fembed-bitcode
+// TODO: (nlutsenko) Cleanup source code so we can safely ignore local variable shadow warnings.
+GCC_WARN_SHADOW = NO

Carthage/Checkouts/OCMock

@@ -8,15 +8,13 @@
 //
 
 #include "Shared/Platform/iOS.xcconfig"
-#include "Shared/Product/Framework.xcconfig"
+#include "Shared/Product/StaticFramework.xcconfig"
 
 PRODUCT_NAME = Parse
 PRODUCT_BUNDLE_IDENTIFIER = com.parse.ios
 APPLICATION_EXTENSION_API_ONLY = YES
 
-MACH_O_TYPE = staticlib
-DEFINES_MODULE = YES
-
 INFOPLIST_FILE = $(PROJECT_DIR)/Parse/Resources/Parse-iOS.Info.plist
 
-OTHER_CFLAGS[sdk=iphoneos9.*] = $(inherited) -fembed-bitcode
+// TODO: (nlutsenko) Cleanup source code so we can safely ignore local variable shadow warnings.
+GCC_WARN_SHADOW = NO

Configurations/Parse-iOS-Dynamic.xcconfig

@@ -7,14 +7,13 @@
 // of patent rights can be found in the PATENTS file in the same directory.
 //
 
-#include "Shared/Platform/OSX.xcconfig"
-#include "Shared/Product/Framework.xcconfig"
+#include "Shared/Platform/macOS.xcconfig"
+#include "Shared/Product/DynamicFramework.xcconfig"
 
 PRODUCT_NAME = Parse
-PRODUCT_BUNDLE_IDENTIFIER = com.parse.osx
-
-MACH_O_TYPE = mh_dylib
-DEFINES_MODULE = YES
-DYLIB_INSTALL_NAME_BASE = @rpath
+PRODUCT_BUNDLE_IDENTIFIER = com.parse.macos
 
 INFOPLIST_FILE = $(PROJECT_DIR)/Parse/Resources/Parse-OSX.Info.plist
+
+// TODO: (nlutsenko) Cleanup source code so we can safely ignore local variable shadow warnings.
+GCC_WARN_SHADOW = NO

Configurations/Parse-iOS.xcconfig

@@ -8,15 +8,12 @@
 //
 
 #include "Shared/Platform/tvOS.xcconfig"
-#include "Shared/Product/Framework.xcconfig"
+#include "Shared/Product/DynamicFramework.xcconfig"
 
 PRODUCT_NAME = Parse
 PRODUCT_BUNDLE_IDENTIFIER = com.parse.tvos
-DEFINES_MODULE = YES
-
-MACH_O_TYPE = mh_dylib
-DYLIB_INSTALL_NAME_BASE = @rpath
-
-OTHER_LDFLAGS = $(inherited) -ObjC
 
 INFOPLIST_FILE = $(PROJECT_DIR)/Parse/Resources/Parse-tvOS.Info.plist
+
+// TODO: (nlutsenko) Cleanup source code so we can safely ignore local variable shadow warnings.
+GCC_WARN_SHADOW = NO

Configurations/Parse-OSX.xcconfig renamed to Configurations/Parse-macOS.xcconfig

@@ -8,15 +8,12 @@
 //
 
 #include "Shared/Platform/tvOS.xcconfig"
-#include "Shared/Product/Framework.xcconfig"
+#include "Shared/Product/StaticFramework.xcconfig"
 
 PRODUCT_NAME = Parse
 PRODUCT_BUNDLE_IDENTIFIER = com.parse.tvos
 
-MACH_O_TYPE = staticlib
-APPLICATION_EXTENSION_API_ONLY = YES
-DEFINES_MODULE = YES
-
-OTHER_LDFLAGS = $(inherited) -ObjC
-
 INFOPLIST_FILE = $(PROJECT_DIR)/Parse/Resources/Parse-tvOS.Info.plist
+
+// TODO: (nlutsenko) Cleanup source code so we can safely ignore local variable shadow warnings.
+GCC_WARN_SHADOW = NO

Configurations/Parse-tvOS-Dynamic.xcconfig

@@ -8,18 +8,12 @@
 //
 
 #include "Shared/Platform/watchOS.xcconfig"
-#include "Shared/Product/Framework.xcconfig"
+#include "Shared/Product/DynamicFramework.xcconfig"
 
 PRODUCT_NAME = Parse
 PRODUCT_BUNDLE_IDENTIFIER = com.parse.watchos
 
-MACH_O_TYPE = mh_dylib
-DYLIB_INSTALL_NAME_BASE = @rpath
-
-APPLICATION_EXTENSION_API_ONLY = YES
-DEFINES_MODULE = YES
-ENABLE_BITCODE = YES
-
-OTHER_LDFLAGS = $(inherited) -ObjC
-
 INFOPLIST_FILE = $(PROJECT_DIR)/Parse/Resources/Parse-watchOS.Info.plist
+
+// TODO: (nlutsenko) Cleanup source code so we can safely ignore local variable shadow warnings.
+GCC_WARN_SHADOW = NO