Skip to content
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

RxSwift Observable alias to fix clash with Observation framework #69

Closed
wants to merge 3 commits into from
Closed

RxSwift Observable alias to fix clash with Observation framework #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9bbb8b9
Declaring typealias of Observable to workaround name conflict caused …
Sep 21, 2023
f58bac4
Fixed example project compilation.
Sep 21, 2023
2b91a78
RxFeedback 4.0.1
Sep 21, 2023
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
7 changes: 4 additions & 3 deletions Examples/Examples.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
3C4A36B82ABC362400044E24 /* Observable+Alias.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Observable+Alias.swift"; sourceTree = "<group>"; };
4DF82BBD71A140F1F2879088 /* Pods-Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Example.debug.xcconfig"; path = "Target Support Files/Pods-Example/Pods-Example.debug.xcconfig"; sourceTree = "<group>"; };
C80987431EC4882E00EE2C23 /* Todo.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Todo.swift; sourceTree = "<group>"; };
C80987581EC4916000EE2C23 /* Todo+Feedback.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Todo+Feedback.swift"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -118,7 +119,6 @@
4DF82BBD71A140F1F2879088 /* Pods-Example.debug.xcconfig */,
D3FE2B9344D2885EA7B2671C /* Pods-Example.release.xcconfig */,
);
name = Pods;
path = Pods;
sourceTree = "<group>";
};
Expand Down Expand Up @@ -151,10 +151,11 @@
isa = PBXGroup;
children = (
C84893692190FAE900561487 /* AsyncSynchronized.swift */,
C8576BE5214EE1F0000A62AE /* RxFeedback.plist */,
C8576BE6214EE1F0000A62AE /* Feedbacks.swift */,
C8576BE7214EE1F0000A62AE /* Deprecations.swift */,
C8576BE6214EE1F0000A62AE /* Feedbacks.swift */,
3C4A36B82ABC362400044E24 /* Observable+Alias.swift */,
C8576BE8214EE1F0000A62AE /* ObservableType+RxFeedback.swift */,
C8576BE5214EE1F0000A62AE /* RxFeedback.plist */,
);
path = RxFeedback;
sourceTree = "<group>";
Expand Down
2 changes: 1 addition & 1 deletion Examples/Examples/PlayCatch.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ class PlayCatchViewController: UIViewController {
bindUI,
// NoUI, machine feedback
react(request: { $0.machinePitching }, effects: { (_) -> Observable<Event> in
return Observable<Int>
return RxSwift.Observable<Int>
.timer(.seconds(1), scheduler: MainScheduler.instance)
.map { _ in Event.throwToHuman }
})
Expand Down
6 changes: 3 additions & 3 deletions Examples/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ PODS:
- RxCocoa (6.0.0):
- RxRelay (= 6.0.0)
- RxSwift (= 6.0.0)
- RxFeedback (4.0.0):
- RxFeedback (4.0.1):
- RxCocoa (~> 6.0)
- RxSwift (~> 6.0)
- RxRelay (6.0.0):
Expand All @@ -24,10 +24,10 @@ EXTERNAL SOURCES:

SPEC CHECKSUMS:
RxCocoa: 3f79328fafa3645b34600f37c31e64c73ae3a80e
RxFeedback: c762a59b678ed8e30b5c84b6e4e03ad0341d2ecb
RxFeedback: de76048d17a6ba28c3f61a03d976b62ddb44d45e
RxRelay: 8d593be109c06ea850df027351beba614b012ffb
RxSwift: c14e798c59b9f6e9a2df8fd235602e85cc044295

PODFILE CHECKSUM: 1c64147e23f9070efe02f93aa36b8029d82c504e

COCOAPODS: 1.10.0
COCOAPODS: 1.11.3
2 changes: 1 addition & 1 deletion RxFeedback.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "RxFeedback"
s.version = "4.0.0"
s.version = "4.0.1"
s.summary = "Simplest architecture for RxSwift. State + feedback loops."
s.description = <<-DESC
* Straightforward
Expand Down
10 changes: 10 additions & 0 deletions Sources/RxFeedback/Observable+Alias.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
//
// Feedbacks.swift
// RxFeedback
//
// Copyright © 2023 Krunoslav Zaher. All rights reserved.
//

import RxSwift

public typealias Observable = RxSwift.Observable