Skip to content

Updated to latest Cocoapods & Removed copy-paste code #19

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.

Sign up for GitHub

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

Open
pzmudzinski wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Updated to latest Cocoapods & Removed copy-paste code #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2875110
updated cocoapods
pzmudzinski Oct 19, 2019
4c43ff1
update copy-paste code
pzmudzinski Oct 19, 2019
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
4 changes: 2 additions & 2 deletions Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ DEPENDENCIES:
- RxSwift (~> 4.0)

SPEC REPOS:
https://github.com/cocoapods/specs.git:
https://github.com/CocoaPods/Specs.git:
- Crashlytics
- Device
- Fabric
Expand Down Expand Up @@ -48,4 +48,4 @@ SPEC CHECKSUMS:

PODFILE CHECKSUM: 176a9ad81388cfc1a7ed586168641a851a009841

COCOAPODS: 1.6.0
COCOAPODS: 1.8.3
4 changes: 2 additions & 2 deletions Pods/Manifest.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3,562 changes: 1,780 additions & 1,782 deletions Pods/Pods.xcodeproj/project.pbxproj
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion Pods/Target Support Files/Crashlytics/Crashlytics.xcconfig
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Pods/Target Support Files/Device/Device.xcconfig
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions Pods/Target Support Files/Fabric/Fabric.xcconfig
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 9 additions & 1 deletion Pods/Target Support Files/Pods-RxMarbles/Pods-RxMarbles-frameworks.sh
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Pods/Target Support Files/Pods-RxMarbles/Pods-RxMarbles.debug.xcconfig
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Pods/Target Support Files/Pods-RxMarbles/Pods-RxMarbles.release.xcconfig
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions Pods/Target Support Files/RazzleDazzle/RazzleDazzle.xcconfig
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Pods/Target Support Files/RxAtomic/RxAtomic.xcconfig
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Pods/Target Support Files/RxCocoa/RxCocoa.xcconfig
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Pods/Target Support Files/RxSwift/RxSwift.xcconfig
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

85 changes: 1 addition & 84 deletions RxMarbles/OperatorImplementation.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -703,90 +703,7 @@ extension Operator {

extension Operator {
var text: String {
switch self {
case .amb:
return NSLocalizedString(self.rawValue, comment: "")
case .buffer:
return NSLocalizedString(self.rawValue, comment: "")
case .catchError, .catchErrorJustReturn:
return NSLocalizedString(self.rawValue, comment: "")
case .combineLatest, .withLatestFrom:
return NSLocalizedString(self.rawValue, comment: "")
case .concat:
return NSLocalizedString(self.rawValue, comment: "")
case .debounce, .throttle:
return NSLocalizedString(self.rawValue, comment: "")
case .delaySubscription:
return NSLocalizedString(self.rawValue, comment: "")
case .distinctUntilChanged:
return NSLocalizedString(self.rawValue, comment: "")
case .elementAt:
return NSLocalizedString(self.rawValue, comment: "")
case .empty:
return NSLocalizedString(self.rawValue, comment: "")
case .filter:
return NSLocalizedString(self.rawValue, comment: "")
case .flatMap:
return NSLocalizedString(self.rawValue, comment: "")
case .flatMapFirst:
return NSLocalizedString(self.rawValue, comment: "")
case .flatMapLatest:
return NSLocalizedString(self.rawValue, comment: "")
case .ignoreElements:
Comment on lines -706 to -735

@Vkt0r Vkt0r Dec 3, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome catch!

return NSLocalizedString(self.rawValue, comment: "")
case .interval:
return NSLocalizedString(self.rawValue, comment: "")
case .just:
return NSLocalizedString(self.rawValue, comment: "")
case .map, .mapWithIndex:
return NSLocalizedString(self.rawValue, comment: "")
case .merge:
return NSLocalizedString(self.rawValue, comment: "")
case .never:
return NSLocalizedString(self.rawValue, comment: "")
case .of:
return NSLocalizedString(self.rawValue, comment: "")
case .reduce:
return NSLocalizedString(self.rawValue, comment: "")
case .repeatElement:
return NSLocalizedString(self.rawValue, comment: "")
case .retry:
return NSLocalizedString(self.rawValue, comment: "")
case .sample:
return NSLocalizedString(self.rawValue, comment: "")
case .scan:
return NSLocalizedString(self.rawValue, comment: "")
case .single:
return NSLocalizedString(self.rawValue, comment: "")
case .skip, .skipDuration:
return NSLocalizedString(self.rawValue, comment: "")
case .skipUntil:
return NSLocalizedString(self.rawValue, comment: "")
case .skipWhile, .skipWhileWithIndex:
return NSLocalizedString(self.rawValue, comment: "")
case .startWith:
return NSLocalizedString(self.rawValue, comment: "")
case .switchLatest:
return NSLocalizedString(self.rawValue, comment: "")
case .take, .takeDuration:
return NSLocalizedString(self.rawValue, comment: "")
case .takeLast:
return NSLocalizedString(self.rawValue, comment: "")
case .takeUntil:
return NSLocalizedString(self.rawValue, comment: "")
case .takeWhile, .takeWhileWithIndex:
return NSLocalizedString(self.rawValue, comment: "")
case .throw:
return NSLocalizedString(self.rawValue, comment: "")
case .timeout:
return NSLocalizedString(self.rawValue, comment: "")
case .timer:
return NSLocalizedString(self.rawValue, comment: "")
case .toArray:
return NSLocalizedString(self.rawValue, comment: "")
case .zip:
return NSLocalizedString(self.rawValue, comment: "")
}
return NSLocalizedString(self.rawValue, comment: "")
}

var linkText: NSMutableAttributedString {
Expand Down