From 31d34e83c952187f50bb462aed2a04fede5c5e6f Mon Sep 17 00:00:00 2001 From: jake Date: Mon, 23 Oct 2017 07:13:38 -0700 Subject: [PATCH] Version 1.0.1 Bugfix. Relevant classes were not marked public, but are now. --- Concurrency.podspec | 2 +- Concurrency/Info.plist | 2 +- Source/ConcurrencyHelpers.swift | 2 +- Source/PeriodicFetcher.swift | 22 +++++++++++----------- Source/Promise.swift | 16 ++++++++-------- Source/Result.swift | 12 ++++++------ 6 files changed, 28 insertions(+), 28 deletions(-) diff --git a/Concurrency.podspec b/Concurrency.podspec index 0fd02b2..0d85876 100644 --- a/Concurrency.podspec +++ b/Concurrency.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'Concurrency' - s.version = '1.0.0' + s.version = '1.0.1' s.summary = 'A small toolkit for handling concurrency in Swift.' s.description = <<-DESC diff --git a/Concurrency/Info.plist b/Concurrency/Info.plist index 8928fed..427aee0 100644 --- a/Concurrency/Info.plist +++ b/Concurrency/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.0.0 + 1.0.1 CFBundleVersion 1 LSRequiresIPhoneOS diff --git a/Source/ConcurrencyHelpers.swift b/Source/ConcurrencyHelpers.swift index 08c0c71..87ee82e 100644 --- a/Source/ConcurrencyHelpers.swift +++ b/Source/ConcurrencyHelpers.swift @@ -6,7 +6,7 @@ import Foundation -extension NSError { +public extension NSError { static func cantMap(value:T, toType: Q.Type) -> NSError { return CantMapError(value: value, toType: toType) } diff --git a/Source/PeriodicFetcher.swift b/Source/PeriodicFetcher.swift index 99b9880..d902475 100644 --- a/Source/PeriodicFetcher.swift +++ b/Source/PeriodicFetcher.swift @@ -7,12 +7,12 @@ import Foundation import RxSwift -enum StreamState: Equatable { +public enum StreamState: Equatable { case noData case newData(T) case error(Error) - static func ==(lhs: StreamState, rhs: StreamState) -> Bool { + public static func ==(lhs: StreamState, rhs: StreamState) -> Bool { switch (lhs, rhs) { case (.newData(let data1), .newData(let data2)): return data1 == data2 @@ -45,10 +45,10 @@ enum StreamState: Equatable { } -class PeriodicFetcher { +public class PeriodicFetcher { - typealias FutureGenerator = ()->(Future) - typealias TimeIntervalGenerator = ()->(Double) + public typealias FutureGenerator = ()->(Future) + public typealias TimeIntervalGenerator = ()->(Double) //MARK: - PROPERTIES - //MARK: private @@ -72,7 +72,7 @@ class PeriodicFetcher { //MARK: - public - internal var isFetching: Bool { + public var isFetching: Bool { if let timer = timer { return timer.isValid } @@ -89,25 +89,25 @@ class PeriodicFetcher { //MARK: - PUBLIC METHODS - func observable() -> Observable> { + public func observable() -> Observable> { return variable.asObservable() } - internal func startPeriodicFetch() { + public func startPeriodicFetch() { shouldEmit = true if !isFetching || !timeIntervalIsCurrent { createTimerAndFire() } } - func stopPeriodicFetch() { + public func stopPeriodicFetch() { shouldEmit = false currentFuture = nil timer?.invalidate() timer = nil } - internal func fetchOnce() { + public func fetchOnce() { shouldEmit = true if isFetching { if timeIntervalIsCurrent { @@ -162,7 +162,7 @@ class PeriodicFetcher { } } -protocol PeriodicService { +public protocol PeriodicService { associatedtype T: Equatable func observable() -> Observable> func startPeriodicFetch() diff --git a/Source/Promise.swift b/Source/Promise.swift index 89cee01..4c238f5 100644 --- a/Source/Promise.swift +++ b/Source/Promise.swift @@ -6,7 +6,7 @@ import Foundation -class Promise { +public class Promise { let future = Future() @@ -20,9 +20,9 @@ class Promise { } -class Future { - typealias ThenBlock = (T)->() - typealias ErrorBlock = (Error)->() +public class Future { + public typealias ThenBlock = (T)->() + public typealias ErrorBlock = (Error)->() private var thenBlock: ThenBlock? private var errorBlock: ErrorBlock? @@ -36,7 +36,7 @@ class Future { //MARK: public properties - var value: T? { + public var value: T? { guard let result = result else { return nil } @@ -48,7 +48,7 @@ class Future { } } - var error: Error? { + public var error: Error? { guard let result = result else { return nil } @@ -160,7 +160,7 @@ class Future { } } -extension Future { +public extension Future { public static func preResolved(value: T) -> Future { let future = Future() @@ -195,7 +195,7 @@ extension Future { } -extension Future { +public extension Future { public class func joining(_ futures:[Future]) -> Future<[T]> { return JoinedFuture(futures).future diff --git a/Source/Result.swift b/Source/Result.swift index c8b3f29..b9a1312 100644 --- a/Source/Result.swift +++ b/Source/Result.swift @@ -6,10 +6,10 @@ import Foundation -enum Result { +public enum Result { - typealias SuccessBlock = (T)->() - typealias ErrorBlock = (Error)->() + public typealias SuccessBlock = (T)->() + public typealias ErrorBlock = (Error)->() case success(T) case error(Error) @@ -52,12 +52,12 @@ enum Result { return self.map(mapBlock).simple() } - enum MapResult: Error, CustomStringConvertible { + public enum MapResult: Error, CustomStringConvertible { case success(Q) case originalError(Error) case mappingError(T) - var description: String { + public var description: String { switch self { case .success: return "success" @@ -68,7 +68,7 @@ enum Result { } } - func simple() -> Result { + public func simple() -> Result { switch self { case .success(let value): return .success(value)