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

Configurations/Parse-tvOS.xcconfig

@@ -8,16 +8,12 @@
 //
 
 #include "Shared/Platform/watchOS.xcconfig"
-#include "Shared/Product/Framework.xcconfig"
+#include "Shared/Product/StaticFramework.xcconfig"
 
 PRODUCT_NAME = Parse
 PRODUCT_BUNDLE_IDENTIFIER = com.parse.watchos
 
-MACH_O_TYPE = staticlib
-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

Configurations/Parse-watchOS-Dynamic.xcconfig

@@ -8,7 +8,7 @@
 //
 
 #include "Shared/Platform/iOS.xcconfig"
-#include "Shared/Product/UnitTest.xcconfig"
+#include "Shared/Product/LogicTests.xcconfig"
 
 PRODUCT_NAME = ParseUnitTests-iOS
 PRODUCT_MODULE_NAME = ParseUnitTests
@@ -19,3 +19,6 @@ IPHONEOS_DEPLOYMENT_TARGET = 8.0
 INFOPLIST_FILE = $(SRCROOT)/Tests/Resources/ParseUnitTests-iOS-Info.plist
 
 USER_HEADER_SEARCH_PATHS = $(inherited) $(PARSE_DIR)/Parse/Internal/**
+
+// TODO: (nlutsenko) Cleanup source code so we can safely ignore local variable shadow warnings.
+GCC_WARN_SHADOW = NO

Configurations/Parse-watchOS.xcconfig

@@ -7,14 +7,16 @@
 // of patent rights can be found in the PATENTS file in the same directory.
 //
 
-#include "Shared/Platform/OSX.xcconfig"
-#include "Shared/Product/UnitTest.xcconfig"
+#include "Shared/Platform/macOS.xcconfig"
+#include "Shared/Product/LogicTests.xcconfig"
 
-PRODUCT_NAME = ParseUnitTests-OSX
+PRODUCT_NAME = ParseUnitTests-macOS
 PRODUCT_MODULE_NAME = ParseUnitTests
-PRODUCT_BUNDLE_IDENTIFIER = com.parse.unit.osx
+PRODUCT_BUNDLE_IDENTIFIER = com.parse.unit.macOS
 
 INFOPLIST_FILE = $(SRCROOT)/Tests/Resources/ParseUnitTests-OSX-Info.plist
-LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/../Frameworks @loader_path/../Frameworks @executable_path/Frameworks @loader_path/Frameworks
 
 USER_HEADER_SEARCH_PATHS = $(inherited) $(PARSE_DIR)/Parse/Internal/**
+
+// TODO: (nlutsenko) Cleanup source code so we can safely ignore local variable shadow warnings.
+GCC_WARN_SHADOW = NO

Configurations/ParseUnitTests-iOS.xcconfig

@@ -1,60 +1,63 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.5)
+    activesupport (5.0.0)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    claide (0.9.1)
-    cocoapods (0.39.0)
+    claide (1.0.0)
+    cocoapods (1.0.1)
       activesupport (>= 4.0.2)
-      claide (~> 0.9.1)
-      cocoapods-core (= 0.39.0)
-      cocoapods-downloader (~> 0.9.3)
-      cocoapods-plugins (~> 0.4.2)
-      cocoapods-search (~> 0.1.0)
-      cocoapods-stats (~> 0.6.2)
-      cocoapods-trunk (~> 0.6.4)
-      cocoapods-try (~> 0.5.1)
+      claide (>= 1.0.0, < 2.0)
+      cocoapods-core (= 1.0.1)
+      cocoapods-deintegrate (>= 1.0.0, < 2.0)
+      cocoapods-downloader (>= 1.0.0, < 2.0)
+      cocoapods-plugins (>= 1.0.0, < 2.0)
+      cocoapods-search (>= 1.0.0, < 2.0)
+      cocoapods-stats (>= 1.0.0, < 2.0)
+      cocoapods-trunk (>= 1.0.0, < 2.0)
+      cocoapods-try (>= 1.0.0, < 2.0)
       colored (~> 1.2)
       escape (~> 0.0.4)
-      molinillo (~> 0.4.0)
+      fourflusher (~> 0.3.0)
+      molinillo (~> 0.4.5)
       nap (~> 1.0)
-      xcodeproj (~> 0.28.2)
-    cocoapods-core (0.39.0)
+      xcodeproj (>= 1.1.0, < 2.0)
+    cocoapods-core (1.0.1)
       activesupport (>= 4.0.2)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
-    cocoapods-downloader (0.9.3)
-    cocoapods-plugins (0.4.2)
+    cocoapods-deintegrate (1.0.0)
+    cocoapods-downloader (1.0.1)
+    cocoapods-plugins (1.0.0)
       nap
-    cocoapods-search (0.1.0)
-    cocoapods-stats (0.6.2)
-    cocoapods-trunk (0.6.4)
+    cocoapods-search (1.0.0)
+    cocoapods-stats (1.0.0)
+    cocoapods-trunk (1.0.0)
       nap (>= 0.8, < 2.0)
       netrc (= 0.7.8)
-    cocoapods-try (0.5.1)
+    cocoapods-try (1.0.0)
     colored (1.2)
+    concurrent-ruby (1.0.2)
     escape (0.0.4)
+    fourflusher (0.3.2)
     fuzzy_match (2.0.4)
     i18n (0.7.0)
-    json (1.8.3)
-    minitest (5.8.3)
-    molinillo (0.4.1)
-    nap (1.0.0)
+    minitest (5.9.0)
+    molinillo (0.4.5)
+    nap (1.1.0)
     naturally (1.3.2)
     netrc (0.7.8)
-    plist (3.1.0)
-    rake (10.4.2)
-    rouge (1.10.1)
+    plist (3.2.0)
+    rake (11.2.2)
+    rouge (1.11.1)
     thread_safe (0.3.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    xcodeproj (0.28.2)
+    xcodeproj (1.1.0)
       activesupport (>= 3)
-      claide (~> 0.9.1)
+      claide (>= 1.0.0, < 2.0)
       colored (~> 1.2)
     xcpretty (0.2.2)
       rouge (~> 1.8)
@@ -71,4 +74,4 @@ DEPENDENCIES
   xcpretty
 
 BUNDLED WITH
-   1.11.2
+   1.12.5