Skip to content
Open
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
371 changes: 250 additions & 121 deletions Podfile.lock

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@

## Requirements

Xcode 9.0
Xcode 12.x
Swift 5.x

Swift 4.0
For Xcode 11 and below, use RxFirebase 0.3.x

## Installation

Expand Down
2 changes: 1 addition & 1 deletion RxFirebase.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

Pod::Spec.new do |s|
s.name = 'RxFirebase'
s.version = '0.3.11'
s.version = '0.4.0'
s.summary = 'RxSwift extensions for Firebase.'

# This description is used to generate tags and improve search results.
Expand Down
14 changes: 9 additions & 5 deletions RxFirebase.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 1010;
LastUpgradeCheck = 0930;
LastUpgradeCheck = 1250;
ORGANIZATIONNAME = RxSwiftCommunity;
TargetAttributes = {
607FACCF1AFB9204008FA782 = {
Expand Down Expand Up @@ -488,6 +488,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
Expand All @@ -506,6 +507,7 @@
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
Expand All @@ -531,7 +533,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
Expand All @@ -544,6 +546,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
Expand All @@ -562,6 +565,7 @@
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
Expand All @@ -580,7 +584,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
Expand All @@ -595,7 +599,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
INFOPLIST_FILE = Example/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MODULE_NAME = ExampleApp;
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
Expand All @@ -611,7 +615,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
INFOPLIST_FILE = Example/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MODULE_NAME = ExampleApp;
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1010"
LastUpgradeVersion = "1250"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand All @@ -27,8 +27,6 @@
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
Expand All @@ -38,8 +36,8 @@
ReferencedContainer = "container:RxFirebase.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
<Testables>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
Expand All @@ -61,8 +59,6 @@
ReferencedContainer = "container:RxFirebase.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
Expand Down
10 changes: 3 additions & 7 deletions RxFirebase.xcodeproj/xcshareddata/xcschemes/Example.xcscheme
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0930"
LastUpgradeVersion = "1250"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand All @@ -27,8 +27,6 @@
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
Expand All @@ -38,8 +36,8 @@
ReferencedContainer = "container:RxFirebase.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
<Testables>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
Expand All @@ -61,8 +59,6 @@
ReferencedContainer = "container:RxFirebase.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
Expand Down
10 changes: 5 additions & 5 deletions RxFirebaseAuthentication.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'RxFirebaseAuthentication'
s.version = '0.3.11'
s.version = '0.4.0'
s.summary = 'RxSwift extensions for FirebaseAuth.'

# This description is used to generate tags and improve search results.
Expand All @@ -26,10 +26,10 @@ Pod::Spec.new do |s|
s.tvos.deployment_target = '10.0'

s.static_framework = true
s.dependency 'RxSwift', '~> 5.1'
s.dependency 'RxCocoa', '~> 5.1'
s.dependency 'FirebaseAuth', '~> 7'
s.dependency 'FirebaseCore', '~> 7'
s.dependency 'RxSwift', '~> 6'
s.dependency 'RxCocoa', '~> 6'
s.dependency 'FirebaseAuth', '~> 8'
s.dependency 'FirebaseCore', '~> 8'

s.source_files = 'Sources/Auth/**/*'
end
8 changes: 4 additions & 4 deletions RxFirebaseDatabase.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'RxFirebaseDatabase'
s.version = '0.3.11'
s.version = '0.4.0'
s.summary = 'RxSwift extensions for FirebaseDatabase.'

# This description is used to generate tags and improve search results.
Expand All @@ -26,9 +26,9 @@ Pod::Spec.new do |s|
s.tvos.deployment_target = '10.0'

s.static_framework = true
s.dependency 'RxSwift', '~> 5.1'
s.dependency 'RxCocoa', '~> 5.1'
s.dependency 'FirebaseDatabase', '~> 7'
s.dependency 'RxSwift', '~> 6'
s.dependency 'RxCocoa', '~> 6'
s.dependency 'FirebaseDatabase', '~> 8'

s.source_files = 'Sources/Database/**/*'
end
8 changes: 4 additions & 4 deletions RxFirebaseFirestore.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'RxFirebaseFirestore'
s.version = '0.3.11'
s.version = '0.4.0'
s.summary = 'RxSwift extensions for FirebaseFirestore.'

# This description is used to generate tags and improve search results.
Expand All @@ -26,9 +26,9 @@ Pod::Spec.new do |s|
s.tvos.deployment_target = '10.0'

s.static_framework = true
s.dependency 'RxSwift', '~> 5.1'
s.dependency 'RxCocoa', '~> 5.1'
s.dependency 'FirebaseFirestore', '~> 7'
s.dependency 'RxSwift', '~> 6'
s.dependency 'RxCocoa', '~> 6'
s.dependency 'FirebaseFirestore', '~> 8'

s.source_files = 'Sources/Firestore/**/*'
end
8 changes: 4 additions & 4 deletions RxFirebaseFunctions.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'RxFirebaseFunctions'
s.version = '0.3.11'
s.version = '0.4.0'
s.summary = 'RxSwift extensions for FirebaseFunctions.'

# This description is used to generate tags and improve search results.
Expand All @@ -26,9 +26,9 @@ Pod::Spec.new do |s|
s.tvos.deployment_target = '10.0'

s.static_framework = true
s.dependency 'RxSwift', '~> 5.1'
s.dependency 'RxCocoa', '~> 5.1'
s.dependency 'FirebaseFunctions', '~> 7'
s.dependency 'RxSwift', '~> 6'
s.dependency 'RxCocoa', '~> 6'
s.dependency 'FirebaseFunctions', '~> 8'

s.source_files = 'Sources/Functions/**/*'
end
8 changes: 4 additions & 4 deletions RxFirebaseRemoteConfig.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'RxFirebaseRemoteConfig'
s.version = '0.3.11'
s.version = '0.4.0'
s.summary = 'RxSwift extensions for FirebaseFirestore.'

# This description is used to generate tags and improve search results.
Expand All @@ -26,9 +26,9 @@ Pod::Spec.new do |s|
s.tvos.deployment_target = '10.0'

s.static_framework = true
s.dependency 'RxSwift', '~> 5.1'
s.dependency 'RxCocoa', '~> 5.1'
s.dependency 'FirebaseRemoteConfig', '~> 7'
s.dependency 'RxSwift', '~> 6'
s.dependency 'RxCocoa', '~> 6'
s.dependency 'FirebaseRemoteConfig', '~> 8'

s.source_files = 'Sources/RemoteConfig/**/*'
end
8 changes: 4 additions & 4 deletions RxFirebaseStorage.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'RxFirebaseStorage'
s.version = '0.3.11'
s.version = '0.4.0'
s.summary = 'RxSwift extensions for FirebaseStorage.'

# This description is used to generate tags and improve search results.
Expand All @@ -26,9 +26,9 @@ Pod::Spec.new do |s|
s.tvos.deployment_target = '10.0'

s.static_framework = true
s.dependency 'RxSwift', '~> 5.1'
s.dependency 'RxCocoa', '~> 5.1'
s.dependency 'FirebaseStorage', '~> 7'
s.dependency 'RxSwift', '~> 6'
s.dependency 'RxCocoa', '~> 6'
s.dependency 'FirebaseStorage', '~> 8'

s.source_files = 'Sources/Storage/**/*'
end
4 changes: 2 additions & 2 deletions Sources/Database/FIRDatabaseQuery+Rx.swift
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ extension Reactive where Base: DatabaseQuery {
self.base.observeSingleEvent(of: eventType, with: { (snapshot) in
singleEventListener(.success(snapshot))
}, withCancel: { (error) in
singleEventListener(.error(error))
singleEventListener(.failure(error))
})
return Disposables.create()
})
Expand All @@ -105,7 +105,7 @@ extension Reactive where Base: DatabaseQuery {
self.base.observeSingleEvent(of: eventType, andPreviousSiblingKeyWith: { (snapshot, prevKey) in
singleEventListener(.success(PreviousSiblingKeyDataSnapshot(snapshot, prevKey)))
}, withCancel: { (error) in
singleEventListener(.error(error))
singleEventListener(.failure(error))
})
return Disposables.create()
})
Expand Down
18 changes: 9 additions & 9 deletions Sources/Database/FIRDatabaseReference+Rx.swift
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ extension Reactive where Base: DatabaseReference {
return Single.create(subscribe: { (singleEventListener) -> Disposable in
self.base.setValue(value, andPriority: priority, withCompletionBlock: { (error, ref) in
if let error = error {
singleEventListener(.error(error))
singleEventListener(.failure(error))
}
else {
singleEventListener(.success(ref))
Expand All @@ -47,7 +47,7 @@ extension Reactive where Base: DatabaseReference {
return Single.create(subscribe: { (singleEventListener) -> Disposable in
self.base.removeValue(completionBlock: { (error, ref) in
if let error = error {
singleEventListener(.error(error))
singleEventListener(.failure(error))
}
else {
singleEventListener(.success(ref))
Expand Down Expand Up @@ -84,7 +84,7 @@ extension Reactive where Base: DatabaseReference {
return Single.create(subscribe: { (singleEventListener) -> Disposable in
self.base.setPriority(priority, withCompletionBlock: { (error, ref) in
if let error = error {
singleEventListener(.error(error))
singleEventListener(.failure(error))
}
else {
singleEventListener(.success(ref))
Expand All @@ -104,7 +104,7 @@ extension Reactive where Base: DatabaseReference {
return Single.create(subscribe: { (singleEventListener) -> Disposable in
self.base.updateChildValues(values, withCompletionBlock: { (error, ref) in
if let error = error {
singleEventListener(.error(error))
singleEventListener(.failure(error))
}
else {
singleEventListener(.success(ref))
Expand All @@ -126,7 +126,7 @@ extension Reactive where Base: DatabaseReference {
return Single.create(subscribe: { (singleEventListener) -> Disposable in
self.base.onDisconnectSetValue(value, andPriority: priority, withCompletionBlock: { (error, ref) in
if let error = error {
singleEventListener(.error(error))
singleEventListener(.failure(error))
}
else {
singleEventListener(.success(ref))
Expand All @@ -147,7 +147,7 @@ extension Reactive where Base: DatabaseReference {
return Single.create(subscribe: { (singleEventListener) -> Disposable in
self.base.onDisconnectRemoveValue(completionBlock: { (error, ref) in
if let error = error {
singleEventListener(.error(error))
singleEventListener(.failure(error))
}
else {
singleEventListener(.success(ref))
Expand All @@ -169,7 +169,7 @@ extension Reactive where Base: DatabaseReference {
return Single.create(subscribe: { (singleEventListener) -> Disposable in
self.base.onDisconnectUpdateChildValues(values, withCompletionBlock: { (error, ref) in
if let error = error {
singleEventListener(.error(error))
singleEventListener(.failure(error))
}
else {
singleEventListener(.success(ref))
Expand All @@ -188,7 +188,7 @@ extension Reactive where Base: DatabaseReference {
return Single.create(subscribe: { (singleEventListener) -> Disposable in
self.base.cancelDisconnectOperations(completionBlock: { (error, ref) in
if let error = error {
singleEventListener(.error(error))
singleEventListener(.failure(error))
}
else {
singleEventListener(.success(ref))
Expand Down Expand Up @@ -219,7 +219,7 @@ extension Reactive where Base: DatabaseReference {
return Single.create(subscribe: { (singleEventListener) -> Disposable in
self.base.runTransactionBlock(block, andCompletionBlock: { (error, committed, snapshot) in
if let error = error {
singleEventListener(.error(error))
singleEventListener(.failure(error))
}
else {
singleEventListener(.success(DatabaseReferenceTransactionResult(committed, snapshot)))
Expand Down