From 82b4a487c1f67987b488e1e737682bc6c2e02626 Mon Sep 17 00:00:00 2001 From: Florent Vilmart Date: Fri, 19 Jan 2018 14:46:13 -0500 Subject: [PATCH 1/2] Set bolts back to 1.8.4 --- Cartfile | 2 +- Cartfile.resolved | 2 +- Carthage/Checkouts/Bolts-ObjC | 2 +- Parse.podspec | 2 +- Rakefile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cartfile b/Cartfile index 6a5d24623..0dbca55c5 100644 --- a/Cartfile +++ b/Cartfile @@ -1 +1 @@ -github "BoltsFramework/Bolts-ObjC" ~> 1.9 +github "BoltsFramework/Bolts-ObjC" == 1.8.4 diff --git a/Cartfile.resolved b/Cartfile.resolved index 5a0526650..400bef783 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,2 +1,2 @@ -github "BoltsFramework/Bolts-ObjC" "1.9.0" +github "BoltsFramework/Bolts-ObjC" "1.8.4" github "erikdoe/OCMock" "v3.4.1" diff --git a/Carthage/Checkouts/Bolts-ObjC b/Carthage/Checkouts/Bolts-ObjC index 4dc65427d..e64deecb2 160000 --- a/Carthage/Checkouts/Bolts-ObjC +++ b/Carthage/Checkouts/Bolts-ObjC @@ -1 +1 @@ -Subproject commit 4dc65427dddc19f78db394941127c1528e55ede8 +Subproject commit e64deecb2f0e10ac0dbb71f522c7a5b9cafb0b4d diff --git a/Parse.podspec b/Parse.podspec index 00eb76fcf..857cf19d9 100644 --- a/Parse.podspec +++ b/Parse.podspec @@ -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| diff --git a/Rakefile b/Rakefile index cd411a6f2..c2ff32da7 100644 --- a/Rakefile +++ b/Rakefile @@ -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) From 6a5ca0a863d000d2c94bb9e8271b63b93917c1b2 Mon Sep 17 00:00:00 2001 From: Florent Vilmart Date: Fri, 19 Jan 2018 15:00:41 -0500 Subject: [PATCH 2/2] Restore legacy swift style --- .../DeletionCollectionViewController.swift | 8 ++++---- .../DeletionTableViewController.swift | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ParseUI/ParseUIDemo/Swift/CustomViewControllers/QueryCollectionViewController/DeletionCollectionViewController.swift b/ParseUI/ParseUIDemo/Swift/CustomViewControllers/QueryCollectionViewController/DeletionCollectionViewController.swift index 57e34ec44..03a7f1ac8 100644 --- a/ParseUI/ParseUIDemo/Swift/CustomViewControllers/QueryCollectionViewController/DeletionCollectionViewController.swift +++ b/ParseUI/ParseUIDemo/Swift/CustomViewControllers/QueryCollectionViewController/DeletionCollectionViewController.swift @@ -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() - } + }) } }) @@ -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() - } + }) } } } diff --git a/ParseUI/ParseUIDemo/Swift/CustomViewControllers/QueryTableViewController/DeletionTableViewController.swift b/ParseUI/ParseUIDemo/Swift/CustomViewControllers/QueryTableViewController/DeletionTableViewController.swift index b891a0fd0..eb0540143 100644 --- a/ParseUI/ParseUIDemo/Swift/CustomViewControllers/QueryTableViewController/DeletionTableViewController.swift +++ b/ParseUI/ParseUIDemo/Swift/CustomViewControllers/QueryTableViewController/DeletionTableViewController.swift @@ -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() - } + }) } }) @@ -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() - } + }) } } }