Merge pull request #233 from pepibumur/updateResultDependency

Update dependencies
This commit is contained in:
Pedro Piñera Buendía 2016-04-28 00:47:32 +02:00
commit 03c2d28d36
5 changed files with 17 additions and 15 deletions

View File

@ -1,3 +1,3 @@
github "ReactiveCocoa/ReactiveCocoa" "v4.0.1"
github "realm/realm-cocoa" "v0.98.0"
github "ReactiveX/RxSwift" "2.3.1"
github "ReactiveCocoa/ReactiveCocoa" "v4.1.0"
github "realm/realm-cocoa" "v0.99.0"
github "ReactiveX/RxSwift" "2.4"

View File

@ -1,2 +1,2 @@
# github "Quick/Quick" "v0.9.2"
# github "Quick/Nimble" "v4.0.0"
# github "Quick/Nimble" "v4.0.1"

View File

@ -1,4 +1,4 @@
github "antitypical/Result" "1.0.2"
github "ReactiveX/RxSwift" "2.3.1"
github "realm/realm-cocoa" "v0.98.0"
github "ReactiveCocoa/ReactiveCocoa" "v4.0.1"
github "antitypical/Result" "2.0.0"
github "ReactiveX/RxSwift" "2.4"
github "realm/realm-cocoa" "v0.99.0"
github "ReactiveCocoa/ReactiveCocoa" "v4.1.0"

View File

@ -13,17 +13,17 @@ Pod::Spec.new do |s|
s.osx.deployment_target = "10.10"
rx_dependencies = lambda do |spec|
spec.dependency 'RxSwift', '~> 2.1'
spec.dependency 'RxCocoa', '~> 2.1'
spec.dependency 'RxBlocking', '~> 2.1'
spec.dependency 'RxSwift', '~> 2.4'
spec.dependency 'RxCocoa', '~> 2.4'
spec.dependency 'RxBlocking', '~> 2.4'
end
rac_dependencies = lambda do |spec|
spec.dependency "ReactiveCocoa", "4.0.1"
spec.dependency "ReactiveCocoa", "4.1.0"
end
realm_dependencies = lambda do |spec|
spec.dependency "RealmSwift", "~> 0.98"
spec.dependency "RealmSwift", "~> 0.99"
end
coredata_dependencies = lambda do |spec|
@ -31,7 +31,7 @@ Pod::Spec.new do |s|
end
foundation_dependencies = lambda do |spec|
spec.dependency "Result", "~> 1.0"
spec.dependency "Result", "~> 2.0"
end
all_platforms = lambda do |spec|

View File

@ -58,7 +58,9 @@ public class RealmDefaultStorage: Storage {
}
public func removeStore() throws {
try NSFileManager.defaultManager().removeItemAtPath(Realm().path)
if let url = try Realm().configuration.fileURL {
try NSFileManager.defaultManager().removeItemAtURL(url)
}
}
public func operation(operation: (context: Context, save: () -> Void) throws -> Void) throws {