diff --git a/.gitmodules b/.gitmodules index a7d06b96c..1ba7e7f70 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,9 @@ [submodule "Vendor/xctoolchain"] path = Vendor/xctoolchain - url = https://github.com/ParsePlatform/xctoolchain.git -[submodule "Carthage/Checkouts/OCMock"] - path = Carthage/Checkouts/OCMock - url = https://github.com/erikdoe/OCMock.git + url = https://github.com/nlutsenko/xctoolchain.git [submodule "Carthage/Checkouts/Bolts-ObjC"] path = Carthage/Checkouts/Bolts-ObjC url = https://github.com/BoltsFramework/Bolts-ObjC.git +[submodule "Carthage/Checkouts/OCMock"] + path = Carthage/Checkouts/OCMock + url = https://github.com/erikdoe/OCMock.git diff --git a/.travis.yml b/.travis.yml index a77f64885..5272391e4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: objective-c os: osx -osx_image: xcode8.3 +osx_image: xcode9.2 branches: only: - master @@ -32,6 +32,8 @@ jobs: env: Deployment install: bundle install script: + # Create a simulator that match current SDK + name + - xcrun simctl create "Apple TV 1080p" com.apple.CoreSimulator.SimDeviceType.Apple-TV-1080p com.apple.CoreSimulator.SimRuntime.tvOS-11-2 - bundle exec rake test:deployment - ./Scripts/jazzy.sh deploy: diff --git a/Cartfile b/Cartfile index 377d17b96..6a5d24623 100644 --- a/Cartfile +++ b/Cartfile @@ -1 +1 @@ -github "BoltsFramework/Bolts-ObjC" ~> 1.6 +github "BoltsFramework/Bolts-ObjC" ~> 1.9 diff --git a/Cartfile.resolved b/Cartfile.resolved index 148de4fa9..5a0526650 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,2 +1,2 @@ -github "BoltsFramework/Bolts-ObjC" "1.8.4" -github "erikdoe/OCMock" "v3.4" +github "BoltsFramework/Bolts-ObjC" "1.9.0" +github "erikdoe/OCMock" "v3.4.1" diff --git a/Carthage/Checkouts/Bolts-ObjC b/Carthage/Checkouts/Bolts-ObjC index e64deecb2..4dc65427d 160000 --- a/Carthage/Checkouts/Bolts-ObjC +++ b/Carthage/Checkouts/Bolts-ObjC @@ -1 +1 @@ -Subproject commit e64deecb2f0e10ac0dbb71f522c7a5b9cafb0b4d +Subproject commit 4dc65427dddc19f78db394941127c1528e55ede8 diff --git a/Carthage/Checkouts/OCMock b/Carthage/Checkouts/OCMock index 69142b9b9..37cfe605d 160000 --- a/Carthage/Checkouts/OCMock +++ b/Carthage/Checkouts/OCMock @@ -1 +1 @@ -Subproject commit 69142b9b916febda3dc88ba63927f0a916ee2994 +Subproject commit 37cfe605d7c848de254e7858a1e3746f74c7801b diff --git a/Parse.podspec b/Parse.podspec index d19ef2202..f2da8af71 100644 --- a/Parse.podspec +++ b/Parse.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'Parse' - s.version = '1.15.3' + s.version = '1.15.4' s.license = { :type => 'BSD', :file => 'LICENSE' } s.homepage = 'http://parseplatform.org/' s.summary = 'A library that gives you access to the powerful Parse cloud platform from your iOS/OS X/watchOS/tvOS app.' @@ -10,7 +10,7 @@ Pod::Spec.new do |s| s.source = { :git => "https://github.com/parse-community/Parse-SDK-iOS-OSX.git", :tag => s.version.to_s } s.platform = :ios, :osx, :tvos, :watchos - s.ios.deployment_target = '7.0' + s.ios.deployment_target = '8.0' s.osx.deployment_target = '10.9' s.tvos.deployment_target = '9.0' s.watchos.deployment_target = '2.0' @@ -86,5 +86,5 @@ Pod::Spec.new do |s| s.libraries = 'z', 'sqlite3' - s.dependency 'Bolts/Tasks', '~> 1.8' + s.dependency 'Bolts/Tasks', '~> 1.9' end diff --git a/Parse/PFConstants.h b/Parse/PFConstants.h index 39467b994..ceb9046e3 100644 --- a/Parse/PFConstants.h +++ b/Parse/PFConstants.h @@ -13,7 +13,7 @@ #pragma mark - SDK Version ///-------------------------------------- -#define PARSE_VERSION @"1.15.3" +#define PARSE_VERSION @"1.15.4" ///-------------------------------------- #pragma mark - Platform diff --git a/Parse/Resources/Parse-OSX.Info.plist b/Parse/Resources/Parse-OSX.Info.plist index 7fd0ce69c..8ce0cec6c 100644 --- a/Parse/Resources/Parse-OSX.Info.plist +++ b/Parse/Resources/Parse-OSX.Info.plist @@ -13,10 +13,10 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 1.15.3 + 1.15.4 CFBundleSignature ???? CFBundleVersion - 1.15.3 + 1.15.4 diff --git a/Parse/Resources/Parse-iOS.Info.plist b/Parse/Resources/Parse-iOS.Info.plist index fbd41fe03..741b5486a 100644 --- a/Parse/Resources/Parse-iOS.Info.plist +++ b/Parse/Resources/Parse-iOS.Info.plist @@ -13,7 +13,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 1.15.3 + 1.15.4 CFBundleSignature ???? CFBundleSupportedPlatforms @@ -22,7 +22,7 @@ iPhoneOS CFBundleVersion - 1.15.3 + 1.15.4 MinimumOSVersion 6.0 diff --git a/Parse/Resources/Parse-tvOS.Info.plist b/Parse/Resources/Parse-tvOS.Info.plist index 96520c55f..80666f44c 100644 --- a/Parse/Resources/Parse-tvOS.Info.plist +++ b/Parse/Resources/Parse-tvOS.Info.plist @@ -15,11 +15,11 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 1.15.3 + 1.15.4 CFBundleSignature ???? CFBundleVersion - 1.15.3 + 1.15.4 NSPrincipalClass diff --git a/Parse/Resources/Parse-watchOS.Info.plist b/Parse/Resources/Parse-watchOS.Info.plist index 96520c55f..80666f44c 100644 --- a/Parse/Resources/Parse-watchOS.Info.plist +++ b/Parse/Resources/Parse-watchOS.Info.plist @@ -15,11 +15,11 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 1.15.3 + 1.15.4 CFBundleSignature ???? CFBundleVersion - 1.15.3 + 1.15.4 NSPrincipalClass diff --git a/ParseStarterProject/OSX/ParseOSXStarterProject-Swift/Resources/Info.plist b/ParseStarterProject/OSX/ParseOSXStarterProject-Swift/Resources/Info.plist index e3990583a..6cca4990a 100644 --- a/ParseStarterProject/OSX/ParseOSXStarterProject-Swift/Resources/Info.plist +++ b/ParseStarterProject/OSX/ParseOSXStarterProject-Swift/Resources/Info.plist @@ -17,11 +17,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.15.3 + 1.15.4 CFBundleSignature ???? CFBundleVersion - 1.15.3 + 1.15.4 LSMinimumSystemVersion $(MACOSX_DEPLOYMENT_TARGET) NSMainNibFile diff --git a/ParseStarterProject/OSX/ParseOSXStarterProject/Resources/Info.plist b/ParseStarterProject/OSX/ParseOSXStarterProject/Resources/Info.plist index 5a721820e..cde97274e 100644 --- a/ParseStarterProject/OSX/ParseOSXStarterProject/Resources/Info.plist +++ b/ParseStarterProject/OSX/ParseOSXStarterProject/Resources/Info.plist @@ -17,11 +17,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.15.3 + 1.15.4 CFBundleSignature ???? CFBundleVersion - 1.15.3 + 1.15.4 LSMinimumSystemVersion ${MACOSX_DEPLOYMENT_TARGET} NSMainNibFile diff --git a/ParseStarterProject/iOS/ParseStarterProject-Swift/Resources/Info.plist b/ParseStarterProject/iOS/ParseStarterProject-Swift/Resources/Info.plist index 344e2135a..07bbf7315 100644 --- a/ParseStarterProject/iOS/ParseStarterProject-Swift/Resources/Info.plist +++ b/ParseStarterProject/iOS/ParseStarterProject-Swift/Resources/Info.plist @@ -15,11 +15,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.15.3 + 1.15.4 CFBundleSignature ???? CFBundleVersion - 1.15.3 + 1.15.4 LSRequiresIPhoneOS UILaunchStoryboardName diff --git a/ParseStarterProject/iOS/ParseStarterProject/Resources/Info.plist b/ParseStarterProject/iOS/ParseStarterProject/Resources/Info.plist index d26587ac5..b071a05a0 100644 --- a/ParseStarterProject/iOS/ParseStarterProject/Resources/Info.plist +++ b/ParseStarterProject/iOS/ParseStarterProject/Resources/Info.plist @@ -19,11 +19,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.15.3 + 1.15.4 CFBundleSignature ???? CFBundleVersion - 1.15.3 + 1.15.4 LSRequiresIPhoneOS NSMainNibFile diff --git a/ParseStarterProject/tvOS/ParseStarterProject-Swift/ParseStarter/Info.plist b/ParseStarterProject/tvOS/ParseStarterProject-Swift/ParseStarter/Info.plist index 190ad5b5b..509b99d60 100644 --- a/ParseStarterProject/tvOS/ParseStarterProject-Swift/ParseStarter/Info.plist +++ b/ParseStarterProject/tvOS/ParseStarterProject-Swift/ParseStarter/Info.plist @@ -15,11 +15,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.15.3 + 1.15.4 CFBundleSignature ???? CFBundleVersion - 1.15.3 + 1.15.4 LSRequiresIPhoneOS UIMainStoryboardFile diff --git a/ParseStarterProject/watchOS/ParseStarterProject-Swift/ParseStarter Extension/Info.plist b/ParseStarterProject/watchOS/ParseStarterProject-Swift/ParseStarter Extension/Info.plist index e337107e7..e7fe91301 100644 --- a/ParseStarterProject/watchOS/ParseStarterProject-Swift/ParseStarter Extension/Info.plist +++ b/ParseStarterProject/watchOS/ParseStarterProject-Swift/ParseStarter Extension/Info.plist @@ -17,11 +17,11 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 1.15.3 + 1.15.4 CFBundleSignature ???? CFBundleVersion - 1.15.3 + 1.15.4 NSExtension NSExtensionAttributes diff --git a/ParseStarterProject/watchOS/ParseStarterProject-Swift/ParseStarter/Info.plist b/ParseStarterProject/watchOS/ParseStarterProject-Swift/ParseStarter/Info.plist index f92a162be..1c4d7cd67 100644 --- a/ParseStarterProject/watchOS/ParseStarterProject-Swift/ParseStarter/Info.plist +++ b/ParseStarterProject/watchOS/ParseStarterProject-Swift/ParseStarter/Info.plist @@ -17,11 +17,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.15.3 + 1.15.4 CFBundleSignature ???? CFBundleVersion - 1.15.3 + 1.15.4 UISupportedInterfaceOrientations UIInterfaceOrientationPortrait diff --git a/ParseStarterProject/watchOS/ParseStarterProject-Swift/Resources/Info.plist b/ParseStarterProject/watchOS/ParseStarterProject-Swift/Resources/Info.plist index 58684dbd3..1a8b8a824 100644 --- a/ParseStarterProject/watchOS/ParseStarterProject-Swift/Resources/Info.plist +++ b/ParseStarterProject/watchOS/ParseStarterProject-Swift/Resources/Info.plist @@ -15,11 +15,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.15.3 + 1.15.4 CFBundleSignature ???? CFBundleVersion - 1.15.3 + 1.15.4 LSRequiresIPhoneOS UIMainStoryboardFile