Skip to content

Set bolts back to 1.8.4 #1236

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cartfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "BoltsFramework/Bolts-ObjC" ~> 1.9
github "BoltsFramework/Bolts-ObjC" == 1.8.4
2 changes: 1 addition & 1 deletion Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
github "BoltsFramework/Bolts-ObjC" "1.9.0"
github "BoltsFramework/Bolts-ObjC" "1.8.4"
github "erikdoe/OCMock" "v3.4.1"
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Bolts-ObjC
Submodule Bolts-ObjC updated 43 files
+7 −29 .gitignore
+1 −1 .gitmodules
+9 −17 .travis.yml
+4 −4 Bolts.podspec
+37 −19 Bolts.xcodeproj/project.pbxproj
+30 −0 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
+0 −25 Bolts/Common/BFGeneric.h
+32 −0 Bolts/Common/BFTask+Exceptions.h
+24 −0 Bolts/Common/BFTask+Exceptions.m
+55 −28 Bolts/Common/BFTask.h
+108 −10 Bolts/Common/BFTask.m
+25 −5 Bolts/Common/BFTaskCompletionSource.h
+12 −0 Bolts/Common/BFTaskCompletionSource.m
+1 −1 Bolts/Common/Bolts.h
+1 −1 Bolts/Common/Bolts.m
+0 −1 Bolts/iOS/BFAppLinkNavigation.h
+1 −1 Bolts/iOS/BFAppLinkResolving.h
+0 −1 Bolts/iOS/BFAppLinkReturnToRefererController.h
+0 −1 Bolts/iOS/BFAppLinkReturnToRefererView.h
+22 −13 Bolts/iOS/BFWebViewAppLinkResolver.m
+2 −4 BoltsTests/AppLinkTests.m
+164 −2 BoltsTests/TaskTests.m
+209 −468 CHANGELOG.md
+0 −2 Configurations/Bolts-iOS-Dynamic.xcconfig
+1 −3 Configurations/Bolts-iOS.xcconfig
+0 −2 Configurations/Bolts-macOS.xcconfig
+0 −2 Configurations/Bolts-tvOS-Dynamic.xcconfig
+0 −2 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 Parse.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ Pod::Spec.new do |s|

s.libraries = 'z', 'sqlite3'

s.dependency 'Bolts/Tasks', '~> 1.9'
s.dependency 'Bolts/Tasks', '~> 1.8.4'
end

s.subspec 'FacebookUtils' do |s|
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,9 @@ class DeletionCollectionViewController: PFQueryCollectionViewController, UIAlert
alertDialog.addAction(UIAlertAction(title: "Save", style: .default) { action in
if let title = titleTextField?.text {
let object = PFObject(className: self.parseClassName!, dictionary: [ "title": title ])
object.saveEventually().continueOnSuccessWith { _ -> AnyObject! in
object.saveEventually().continue(successBlock: { _ -> AnyObject! in
return self.loadObjects()
}
})
}
})

Expand Down Expand Up @@ -128,9 +128,9 @@ class DeletionCollectionViewController: PFQueryCollectionViewController, UIAlert
dictionary: [ "title": title ]
)

object.saveEventually().continueOnSuccessWith { _ -> AnyObject! in
object.saveEventually().continue(successBlock: { _ -> AnyObject! in
return self.loadObjects()
}
})
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,9 @@ class DeletionTableViewController: PFQueryTableViewController, UIAlertViewDelega
alertDialog.addAction(UIAlertAction(title: "Save", style: .default) { _ in
if let title = titleTextField.text {
let object = PFObject(className: self.parseClassName!, dictionary: [ "title": title ])
object.saveInBackground().continueOnSuccessWith { _ -> AnyObject! in
object.saveInBackground().continue(successBlock: { _ -> AnyObject! in
return self.loadObjects()
}
})
}
})

Expand Down Expand Up @@ -110,9 +110,9 @@ class DeletionTableViewController: PFQueryTableViewController, UIAlertViewDelega

if let title = alertView.textField(at: 0)?.text {
let object = PFObject(className: self.parseClassName!, dictionary: [ "title": title ])
object.saveEventually().continueOnSuccessWith { _ -> AnyObject! in
object.saveEventually().continue(successBlock: { _ -> AnyObject! in
return self.loadObjects()
}
})
}
}
}
2 changes: 1 addition & 1 deletion Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ namespace :package do
package_watchos_name)

Rake::Task['build:parseui:framework'].invoke
parseui_framework_path = File.join(build_folder, 'ParseUI.framework')
parseui_framework_path = File.join(build_folder, 'iOS', 'ParseUI.framework')
make_package(release_folder,
[parseui_framework_path],
package_parseui_name)
Expand Down