Skip to content

Commit

Permalink
⚡ Release 1.15.4 (#1185)
Browse files Browse the repository at this point in the history 
* Bumps Bolts to 1.9
* Runs latest Xcode verison (9.2) on CI
* Uses nlutsenko's xctoolchain
  • Loading branch information
@flovilmart
flovilmart authored Jan 2, 2018
1 parent 0469af6 commit 2032def
Show file tree
Hide file tree
Showing 20 changed files with 40 additions and 38 deletions.
8 changes: 4 additions & 4 deletions .gitmodules
View file
Original file line number Diff line number Diff line change
@@ -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
4 changes: 3 additions & 1 deletion .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: objective-c
os: osx
osx_image: xcode8.3
osx_image: xcode9.2
branches:
only:
- master
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion Cartfile
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "BoltsFramework/Bolts-ObjC" ~> 1.6
github "BoltsFramework/Bolts-ObjC" ~> 1.9
4 changes: 2 additions & 2 deletions Cartfile.resolved
View file
Original file line number Diff line number Diff line change
@@ -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"
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Bolts-ObjC
Submodule Bolts-ObjC updated 43 files
+29 −7 .gitignore
+1 −1 .gitmodules
+17 −9 .travis.yml
+4 −4 Bolts.podspec
+19 −37 Bolts.xcodeproj/project.pbxproj
+0 −30 Bolts.xcodeproj/project.xcworkspace/xcshareddata/Bolts.xcscmblueprint
+1 −1 Bolts.xcodeproj/xcshareddata/xcschemes/Bolts-iOS-Dynamic.xcscheme
+1 −1 Bolts.xcodeproj/xcshareddata/xcschemes/Bolts-iOS.xcscheme
+1 −1 Bolts.xcodeproj/xcshareddata/xcschemes/Bolts-macOS.xcscheme
+1 −1 Bolts.xcodeproj/xcshareddata/xcschemes/Bolts-tvOS-Dynamic.xcscheme
+1 −1 Bolts.xcodeproj/xcshareddata/xcschemes/Bolts-tvOS.xcscheme
+1 −1 Bolts.xcodeproj/xcshareddata/xcschemes/Bolts-watchOS-Dynamic.xcscheme
+1 −1 Bolts.xcodeproj/xcshareddata/xcschemes/Bolts-watchOS.xcscheme
+1 −1 Bolts/Common/BFCancellationToken.h
+2 −2 Bolts/Common/BFExecutor.h
+10 −10 Bolts/Common/BFExecutor.m
+25 −0 Bolts/Common/BFGeneric.h
+0 −32 Bolts/Common/BFTask+Exceptions.h
+0 −24 Bolts/Common/BFTask+Exceptions.m
+28 −55 Bolts/Common/BFTask.h
+10 −108 Bolts/Common/BFTask.m
+5 −25 Bolts/Common/BFTaskCompletionSource.h
+0 −12 Bolts/Common/BFTaskCompletionSource.m
+1 −1 Bolts/Common/Bolts.h
+1 −1 Bolts/Common/Bolts.m
+1 −0 Bolts/iOS/BFAppLinkNavigation.h
+1 −1 Bolts/iOS/BFAppLinkResolving.h
+1 −0 Bolts/iOS/BFAppLinkReturnToRefererController.h
+1 −0 Bolts/iOS/BFAppLinkReturnToRefererView.h
+13 −22 Bolts/iOS/BFWebViewAppLinkResolver.m
+4 −2 BoltsTests/AppLinkTests.m
+2 −164 BoltsTests/TaskTests.m
+468 −209 CHANGELOG.md
+2 −0 Configurations/Bolts-iOS-Dynamic.xcconfig
+3 −1 Configurations/Bolts-iOS.xcconfig
+2 −0 Configurations/Bolts-macOS.xcconfig
+2 −0 Configurations/Bolts-tvOS-Dynamic.xcconfig
+2 −0 Configurations/Bolts-tvOS.xcconfig
+2 −2 Configurations/Bolts-watchOS-Dynamic.xcconfig
+2 −2 Configurations/Bolts-watchOS.xcconfig
+1 −1 Configurations/BoltsTests-iOS.xcconfig
+1 −1 Configurations/Version.xcconfig
+1 −1 Vendor/xctoolchain
2 changes: 1 addition & 1 deletion Carthage/Checkouts/OCMock
Submodule OCMock updated 15 files
+1 −1 OCMock.podspec
+12 −0 Source/Changes.txt
+15 −1 Source/OCMock.xcodeproj/project.pbxproj
+3 −1 Source/OCMock.xcodeproj/xcshareddata/xcschemes/OCMock iOS.xcscheme
+3 −1 Source/OCMock.xcodeproj/xcshareddata/xcschemes/OCMock tvOS.xcscheme
+3 −1 Source/OCMock.xcodeproj/xcshareddata/xcschemes/OCMock.xcscheme
+3 −1 Source/OCMock.xcodeproj/xcshareddata/xcschemes/OCMockLib.xcscheme
+12 −1 Source/OCMock/NSInvocation+OCMAdditions.m
+4 −2 Source/OCMock/OCClassMockObject.m
+90 −16 Source/OCMock/OCMFunctions.m
+6 −2 Source/OCMock/OCMockObject.m
+2 −2 Source/OCMockTests/NSMethodSignatureOCMAdditionsTests.m
+25 −0 Source/OCMockTests/OCMBoxedReturnValueProviderTests.m
+83 −2 Source/OCMockTests/OCMockObjectTests.m
+15 −8 Tools/build.rb
6 changes: 3 additions & 3 deletions Parse.podspec
View file
Original file line number Diff line number Diff line change
@@ -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.'
Expand All @@ -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'
Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion Parse/PFConstants.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#pragma mark - SDK Version
///--------------------------------------

#define PARSE_VERSION @"1.15.3"
#define PARSE_VERSION @"1.15.4"

///--------------------------------------
#pragma mark - Platform
Expand Down
4 changes: 2 additions & 2 deletions Parse/Resources/Parse-OSX.Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.15.3</string>
<string>1.15.4</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1.15.3</string>
<string>1.15.4</string>
</dict>
</plist>
4 changes: 2 additions & 2 deletions Parse/Resources/Parse-iOS.Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.15.3</string>
<string>1.15.4</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleSupportedPlatforms</key>
Expand All @@ -22,7 +22,7 @@
<string>iPhoneOS</string>
</array>
<key>CFBundleVersion</key>
<string>1.15.3</string>
<string>1.15.4</string>
<key>MinimumOSVersion</key>
<string>6.0</string>
</dict>
Expand Down
4 changes: 2 additions & 2 deletions Parse/Resources/Parse-tvOS.Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.15.3</string>
<string>1.15.4</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1.15.3</string>
<string>1.15.4</string>
<key>NSPrincipalClass</key>
<string></string>
</dict>
Expand Down
4 changes: 2 additions & 2 deletions Parse/Resources/Parse-watchOS.Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.15.3</string>
<string>1.15.4</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1.15.3</string>
<string>1.15.4</string>
<key>NSPrincipalClass</key>
<string></string>
</dict>
Expand Down
4 changes: 2 additions & 2 deletions ParseStarterProject/OSX/ParseOSXStarterProject-Swift/Resources/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.15.3</string>
<string>1.15.4</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1.15.3</string>
<string>1.15.4</string>
<key>LSMinimumSystemVersion</key>
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
<key>NSMainNibFile</key>
Expand Down
4 changes: 2 additions & 2 deletions ParseStarterProject/OSX/ParseOSXStarterProject/Resources/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.15.3</string>
<string>1.15.4</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1.15.3</string>
<string>1.15.4</string>
<key>LSMinimumSystemVersion</key>
<string>${MACOSX_DEPLOYMENT_TARGET}</string>
<key>NSMainNibFile</key>
Expand Down
4 changes: 2 additions & 2 deletions ParseStarterProject/iOS/ParseStarterProject-Swift/Resources/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.15.3</string>
<string>1.15.4</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1.15.3</string>
<string>1.15.4</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>UILaunchStoryboardName</key>
Expand Down
4 changes: 2 additions & 2 deletions ParseStarterProject/iOS/ParseStarterProject/Resources/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.15.3</string>
<string>1.15.4</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1.15.3</string>
<string>1.15.4</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSMainNibFile</key>
Expand Down
4 changes: 2 additions & 2 deletions ParseStarterProject/tvOS/ParseStarterProject-Swift/ParseStarter/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.15.3</string>
<string>1.15.4</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1.15.3</string>
<string>1.15.4</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>UIMainStoryboardFile</key>
Expand Down
4 changes: 2 additions & 2 deletions ParseStarterProject/watchOS/ParseStarterProject-Swift/ParseStarter Extension/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
<key>CFBundlePackageType</key>
<string>XPC!</string>
<key>CFBundleShortVersionString</key>
<string>1.15.3</string>
<string>1.15.4</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1.15.3</string>
<string>1.15.4</string>
<key>NSExtension</key>
<dict>
<key>NSExtensionAttributes</key>
Expand Down
4 changes: 2 additions & 2 deletions ParseStarterProject/watchOS/ParseStarterProject-Swift/ParseStarter/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.15.3</string>
<string>1.15.4</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1.15.3</string>
<string>1.15.4</string>
<key>UISupportedInterfaceOrientations</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
Expand Down
4 changes: 2 additions & 2 deletions ParseStarterProject/watchOS/ParseStarterProject-Swift/Resources/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.15.3</string>
<string>1.15.4</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1.15.3</string>
<string>1.15.4</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>UIMainStoryboardFile</key>
Expand Down

0 comments on commit 2032def

Please sign in to comment.