From 8a4c6fa5bec67586de54b23ba765f00c2557fc63 Mon Sep 17 00:00:00 2001 From: Raghav Ahuja Date: Sun, 19 Apr 2020 01:52:23 +0530 Subject: [PATCH 1/2] Fixed FirstMatch and Matches publisher --- Sources/PublisherKit/Publishers/Matches/First Match.swift | 3 +++ Sources/PublisherKit/Publishers/Matches/Matches.swift | 3 +++ 2 files changed, 6 insertions(+) diff --git a/Sources/PublisherKit/Publishers/Matches/First Match.swift b/Sources/PublisherKit/Publishers/Matches/First Match.swift index 9cc5318..decc904 100644 --- a/Sources/PublisherKit/Publishers/Matches/First Match.swift +++ b/Sources/PublisherKit/Publishers/Matches/First Match.swift @@ -85,6 +85,8 @@ extension Publishers.FirstMatch { guard status == .awaiting else { lock.unlock(); return } status = .subscribed(to: subscription) lock.unlock() + + downstream?.receive(subscription: self) } func receive(_ input: String) -> Subscribers.Demand { @@ -114,6 +116,7 @@ extension Publishers.FirstMatch { guard status.isSubscribed else { lock.unlock(); return } status = .terminated lock.unlock() + downstream?.receive(completion: completion.eraseError()) } diff --git a/Sources/PublisherKit/Publishers/Matches/Matches.swift b/Sources/PublisherKit/Publishers/Matches/Matches.swift index cb4ad03..eab2b39 100644 --- a/Sources/PublisherKit/Publishers/Matches/Matches.swift +++ b/Sources/PublisherKit/Publishers/Matches/Matches.swift @@ -85,6 +85,8 @@ extension Publishers.Matches { guard status == .awaiting else { lock.unlock(); return } status = .subscribed(to: subscription) lock.unlock() + + downstream?.receive(subscription: self) } func receive(_ input: String) -> Subscribers.Demand { @@ -114,6 +116,7 @@ extension Publishers.Matches { guard status.isSubscribed else { lock.unlock(); return } status = .terminated lock.unlock() + downstream?.receive(completion: completion.eraseError()) } From db59a4d03205141477fbbf72178a6f10f19b9cc1 Mon Sep 17 00:00:00 2001 From: Raghav Ahuja Date: Sun, 19 Apr 2020 01:54:52 +0530 Subject: [PATCH 2/2] Updated project version --- PublisherKit.podspec | 2 +- PublisherKit.xcodeproj/project.pbxproj | 13 ++++++------- README.md | 4 ++-- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/PublisherKit.podspec b/PublisherKit.podspec index 868cb0a..34d6afa 100644 --- a/PublisherKit.podspec +++ b/PublisherKit.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |spec| spec.name = "PublisherKit" - spec.version = "4.0.0" + spec.version = "4.0.1" spec.summary = "An open source implementation of Apple's Combine framework for processing asynchronous events over time" spec.homepage = "https://github.com/ragzy15/PublisherKit" diff --git a/PublisherKit.xcodeproj/project.pbxproj b/PublisherKit.xcodeproj/project.pbxproj index 8b57598..d519c08 100644 --- a/PublisherKit.xcodeproj/project.pbxproj +++ b/PublisherKit.xcodeproj/project.pbxproj @@ -1125,7 +1125,7 @@ path = Decoder; sourceTree = ""; }; - OBJ_5 /* */ = { + OBJ_5 = { isa = PBXGroup; children = ( OBJ_6 /* Package.swift */, @@ -1137,7 +1137,6 @@ OBJ_266 /* README.md */, OBJ_267 /* PublisherKit.podspec */, ); - name = ""; sourceTree = ""; }; OBJ_50 /* Encoder */ = { @@ -1548,7 +1547,7 @@ knownRegions = ( en, ); - mainGroup = OBJ_5 /* */; + mainGroup = OBJ_5; productRefGroup = OBJ_260 /* Products */; projectDirPath = ""; projectRoot = ""; @@ -1772,7 +1771,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) $(TOOLCHAIN_DIR)/usr/lib/swift/macosx"; MACOSX_DEPLOYMENT_TARGET = 10.10; - MARKETING_VERSION = 4.0.0; + MARKETING_VERSION = 4.0.1; OTHER_CFLAGS = "$(inherited)"; OTHER_LDFLAGS = "$(inherited)"; OTHER_SWIFT_FLAGS = "$(inherited)"; @@ -1804,7 +1803,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) $(TOOLCHAIN_DIR)/usr/lib/swift/macosx"; MACOSX_DEPLOYMENT_TARGET = 10.10; - MARKETING_VERSION = 4.0.0; + MARKETING_VERSION = 4.0.1; OTHER_CFLAGS = "$(inherited)"; OTHER_LDFLAGS = "$(inherited)"; OTHER_SWIFT_FLAGS = "$(inherited)"; @@ -1890,7 +1889,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) $(TOOLCHAIN_DIR)/usr/lib/swift/macosx"; MACOSX_DEPLOYMENT_TARGET = 10.10; - MARKETING_VERSION = 4.0.0; + MARKETING_VERSION = 4.0.1; OTHER_CFLAGS = "$(inherited)"; OTHER_LDFLAGS = "$(inherited)"; OTHER_SWIFT_FLAGS = "$(inherited)"; @@ -1924,7 +1923,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) $(TOOLCHAIN_DIR)/usr/lib/swift/macosx"; MACOSX_DEPLOYMENT_TARGET = 10.10; - MARKETING_VERSION = 4.0.0; + MARKETING_VERSION = 4.0.1; OTHER_CFLAGS = "$(inherited)"; OTHER_LDFLAGS = "$(inherited)"; OTHER_SWIFT_FLAGS = "$(inherited)"; diff --git a/README.md b/README.md index 8982b88..3536aa0 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,7 @@ let package = Package( targets: ["YourPackage"]), ], dependencies: [ - .package(url: "https://github.com/ragzy15/PublisherKit.git", from: "4.0.0"), + .package(url: "https://github.com/ragzy15/PublisherKit.git", from: "4.0.1"), ], targets: [ .target( @@ -80,7 +80,7 @@ source 'https://github.com/CocoaPods/Specs.git' platform :ios, '10.0' use_frameworks! -pod 'PublisherKit', '~> 4.0.0' +pod 'PublisherKit', '~> 4.0.1' ``` Then, run the following command: