From 057f8497830258823893ea7952cefc146ac0b40b Mon Sep 17 00:00:00 2001 From: Tony Arnold Date: Wed, 28 Dec 2016 22:24:46 +1100 Subject: [PATCH 1/3] Import Foundation into source files that reference NSRecursiveLock --- Sources/Connectable.swift | 2 ++ Sources/Observer.swift | 2 ++ 2 files changed, 4 insertions(+) diff --git a/Sources/Connectable.swift b/Sources/Connectable.swift index 66b9d05..095434b 100644 --- a/Sources/Connectable.swift +++ b/Sources/Connectable.swift @@ -22,6 +22,8 @@ // THE SOFTWARE. // +import Foundation + /// Represents a signal that is started by calling `connect` on it. public protocol ConnectableSignalProtocol: SignalProtocol { diff --git a/Sources/Observer.swift b/Sources/Observer.swift index 053727d..29930be 100644 --- a/Sources/Observer.swift +++ b/Sources/Observer.swift @@ -22,6 +22,8 @@ // THE SOFTWARE. // +import Foundation + /// Represents a type that receives events. public protocol ObserverProtocol { From 5c15a05820112c9da321f754fc5491274c33bc62 Mon Sep 17 00:00:00 2001 From: Tony Arnold Date: Wed, 28 Dec 2016 22:39:30 +1100 Subject: [PATCH 2/3] Update Travis configuration to include Swift PM build and test steps Also bump container image version and add code coverage reporting --- .travis.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index a9471ec..db2603c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,10 @@ language: objective-c -osx_image: xcode7.3 +osx_image: xcode8.2 script: - - xcodebuild -workspace ReactiveKit.xcworkspace -scheme ReactiveKit-iOS -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 6,OS=9.3' test + - set -o pipefail && xcodebuild -project ReactiveKit.xcodeproj -scheme ReactiveKit-iOS -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 6s,OS=10.0' test | xcpretty + - set -o pipefail && swift build + - set -o pipefail && swift test + +after_success: + - bash <(curl -s https://codecov.io/bash) From 47c90ccb978a6aab557aaeb29c5da83c91ba3fe2 Mon Sep 17 00:00:00 2001 From: Srdan Rasic Date: Wed, 28 Dec 2016 14:51:40 +0100 Subject: [PATCH 3/3] Up version --- ReactiveKit.podspec | 4 ++-- ReactiveKit/Info.plist | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ReactiveKit.podspec b/ReactiveKit.podspec index 4590a94..57ae252 100644 --- a/ReactiveKit.podspec +++ b/ReactiveKit.podspec @@ -1,12 +1,12 @@ Pod::Spec.new do |s| s.name = "ReactiveKit" - s.version = "3.1.1" + s.version = "3.1.2" s.summary = "A Swift Reactive Programming Framework" s.description = "ReactiveKit is a Swift framework for reactive and functional reactive programming." s.homepage = "https://github.com/ReactiveKit/ReactiveKit" s.license = 'MIT' s.author = { "Srdan Rasic" => "srdan.rasic@gmail.com" } - s.source = { :git => "https://github.com/ReactiveKit/ReactiveKit.git", :tag => "v3.1.1" } + s.source = { :git => "https://github.com/ReactiveKit/ReactiveKit.git", :tag => "v3.1.2" } s.ios.deployment_target = '8.0' s.osx.deployment_target = '10.9' diff --git a/ReactiveKit/Info.plist b/ReactiveKit/Info.plist index d353b3e..b1376a8 100644 --- a/ReactiveKit/Info.plist +++ b/ReactiveKit/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 3.1.1 + 3.1.2 CFBundleSignature ???? CFBundleVersion