Merge pull request #756 from ParsePlatform/nlutsenko.bolts

nlutsenko · nlutsenko · commit f3522cfb5b72 · 2016-01-14T13:14:18.000-08:00
Update Bolts to 1.6.0
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,2 +1,2 @@
-github "BoltsFramework/Bolts-iOS" "1.5.1"
+github "BoltsFramework/Bolts-iOS" "1.6.0"
 github "erikdoe/OCMock" "v3.2"
diff --git a/Carthage/Checkouts/Bolts-iOS b/Carthage/Checkouts/Bolts-iOS
@@ -1 +1 @@
-Subproject commit 35c683c171d20b1ee00c9e720cf2a1eb0e2642f8
+Subproject commit beac94366f4186a4a54100ce87c7222b6008d63b
diff --git a/Parse.podspec b/Parse.podspec
@@ -85,5 +85,5 @@ Pod::Spec.new do |s|
 
   s.libraries        = 'z', 'sqlite3'
 
-  s.dependency 'Bolts/Tasks', '~> 1.5'
+  s.dependency 'Bolts/Tasks', '~> 1.6'
 end

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-github "BoltsFramework/Bolts-iOS" "1.5.1"`
	`1`	`+github "BoltsFramework/Bolts-iOS" "1.6.0"`
`2`	`2`	`github "erikdoe/OCMock" "v3.2"`