.gitignore

@@ -20,4 +20,8 @@ xcuserdata
 *.ipa
 
 Pods/
-Carthage/Build
+Carthage/Build
+
+.build
+/.previous-build
+.DS_Store

.travis.yml

@@ -1,5 +1,5 @@
-language: objective-c
-osx_image: xcode8
+language: swift
+osx_image: xcode10.2
 env:
   global:
   - LC_CTYPE=en_US.UTF-8
@@ -9,40 +9,38 @@ env:
   - OSX_FRAMEWORK_SCHEME="Signals OSX"
   - TVOS_FRAMEWORK_SCHEME="Signals tvOS"
   - WATCHOS_FRAMEWORK_SCHEME="Signals watchOS"
-  - IOS_SDK=iphonesimulator10.0
-  - OSX_SDK=macosx10.12
-  - TVOS_SDK=appletvsimulator10.0
-  - WATCHOS_SDK=watchsimulator3.0
-
+
   matrix:
-    - DESTINATION="OS=9.0,name=iPhone 4S"          SCHEME="$IOS_FRAMEWORK_SCHEME"     SDK="$IOS_SDK"     RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="YES"
-    - DESTINATION="OS=9.1,name=iPhone 5"           SCHEME="$IOS_FRAMEWORK_SCHEME"     SDK="$IOS_SDK"     RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="NO"
-    - DESTINATION="OS=9.2,name=iPhone 5S"          SCHEME="$IOS_FRAMEWORK_SCHEME"     SDK="$IOS_SDK"     RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="NO"
-    - DESTINATION="OS=9.3,name=iPhone 6"           SCHEME="$IOS_FRAMEWORK_SCHEME"     SDK="$IOS_SDK"     RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="NO"
-    - DESTINATION="OS=10.0,name=iPhone 6 Plus"     SCHEME="$IOS_FRAMEWORK_SCHEME"     SDK="$IOS_SDK"     RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="NO"
-    - DESTINATION="OS=10.0,name=iPhone 6S"         SCHEME="$IOS_FRAMEWORK_SCHEME"     SDK="$IOS_SDK"     RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="NO"
-    - DESTINATION="OS=10.0,name=iPhone 6S Plus"    SCHEME="$IOS_FRAMEWORK_SCHEME"     SDK="$IOS_SDK"     RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="NO"
-    - DESTINATION="arch=x86_64"                    SCHEME="$OSX_FRAMEWORK_SCHEME"     SDK="$OSX_SDK"     RUN_TESTS="YES" BUILD_EXAMPLE="NO"  POD_LINT="NO"
-    - DESTINATION="OS=10.0,name=Apple TV 1080p"    SCHEME="$TVOS_FRAMEWORK_SCHEME"    SDK="$TVOS_SDK"    RUN_TESTS="YES" BUILD_EXAMPLE="NO"  POD_LINT="NO"
-    - DESTINATION="OS=3.0,name=Apple Watch - 38mm" SCHEME="$WATCHOS_FRAMEWORK_SCHEME" SDK="$WATCHOS_SDK" RUN_TESTS="NO"  BUILD_EXAMPLE="NO"  POD_LINT="NO"
+    - DESTINATION="OS=8.1,name=iPhone 4S"          SCHEME="$IOS_FRAMEWORK_SCHEME"     RUN_TESTS="YES" POD_LINT="NO"
+    - DESTINATION="OS=9.1,name=iPhone 5"           SCHEME="$IOS_FRAMEWORK_SCHEME"     RUN_TESTS="YES" POD_LINT="NO"
+    - DESTINATION="OS=9.3,name=iPhone 6"           SCHEME="$IOS_FRAMEWORK_SCHEME"     RUN_TESTS="YES" POD_LINT="NO"
+    - DESTINATION="OS=10.1,name=iPhone 7 Plus"     SCHEME="$IOS_FRAMEWORK_SCHEME"     RUN_TESTS="YES" POD_LINT="NO"
+    - DESTINATION="OS=11.4,name=iPhone X"          SCHEME="$IOS_FRAMEWORK_SCHEME"     RUN_TESTS="YES" POD_LINT="NO"
+    - DESTINATION="arch=x86_64"                    SCHEME="$OSX_FRAMEWORK_SCHEME"     RUN_TESTS="YES" POD_LINT="NO"
+    - DESTINATION="OS=12.2,name=Apple TV 4K"       SCHEME="$TVOS_FRAMEWORK_SCHEME"    RUN_TESTS="YES" POD_LINT="NO"
+    - DESTINATION="OS=5.2,name=Apple Watch Series 4 - 44mm" SCHEME="$WATCHOS_FRAMEWORK_SCHEME" RUN_TESTS="NO"  POD_LINT="NO"
 
 before_install:
     - gem install slather -N
-    - gem install cocoapods --pre --no-rdoc --no-ri --no-document --quiet
+    - gem install cocoapods --no-document --quiet
 
 script:
   - set -o pipefail
   - xcodebuild -version
   - xcodebuild -showsdks
   - instruments -s devices
-  - if [ $BUILD == "YES" ]; then
-      xcodebuild -project "$PROJECT" -scheme "$SCHEME" -destination "$DESTINATION" -sdk "$SDK" -configuration Debug ONLY_ACTIVE_ARCH=NO clean build | xcpretty -c;
-      xcodebuild -project "$PROJECT" -scheme "$SCHEME" -destination "$DESTINATION" -sdk "$SDK" -configuration Release ONLY_ACTIVE_ARCH=NO clean build | xcpretty -c;
+  - if [ $RUN_TESTS == "YES" ]; then
+      xcodebuild -project "$PROJECT" -scheme "$SCHEME" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO ENABLE_TESTABILITY=YES test | xcpretty;
+    else
+      xcodebuild -project "$PROJECT" -scheme "$SCHEME" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO build | xcpretty;
     fi
+
   - if [ $RUN_TESTS == "YES" ]; then
-      xcodebuild -project "$PROJECT" -scheme "$SCHEME" -destination "$DESTINATION"
-       -configuration Debug ONLY_ACTIVE_ARCH=NO GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES clean build test | xcpretty -c;
+      xcodebuild -project "$PROJECT" -scheme "$SCHEME" -destination "$DESTINATION" -configuration Release ONLY_ACTIVE_ARCH=NO ENABLE_TESTABILITY=YES test | xcpretty;
+    else
+      xcodebuild -project "$PROJECT" -scheme "$SCHEME" -destination "$DESTINATION" -configuration Release ONLY_ACTIVE_ARCH=NO build | xcpretty;
     fi
+
   - if [ $POD_LINT == "YES" ]; then
       pod lib lint;
     fi

Package.swift

@@ -0,0 +1,14 @@
+// swift-tools-version:4.2
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+import PackageDescription
+
+let package = Package(
+    name: "Signals",
+    products: [
+        .library(name: "Signals", targets: ["Signals"]),
+    ],
+    targets: [
+        .target(name: "Signals", path: "Signals"),
+        .testTarget(name: "SignalsTests", dependencies: ["Signals"]),
+    ]
+)

README.md

@@ -19,7 +19,7 @@ Signals is a library for creating and observing events. It replaces delegates, a
 ## Requirements
 
 - iOS 7.0 / watchOS 2.0 / Mac OS X 10.9
-- Swift 3.0
+- Swift 4.2
 
 ## Installation
 
@@ -33,15 +33,25 @@ To integrate Signals into your project add the following to your `Podfile`:
 platform :ios, '8.0'
 use_frameworks!
 
-pod 'Signals', '~> 4.0'
+pod 'Signals', '~> 6.0'
 ```
 
 #### Carthage
 
 To integrate Signals into your project using Carthage add the following to your `Cartfile`:
 
 ```ruby
-github "artman/Signals" ~> 4.0
+github "artman/Signals" ~> 6.0
+```
+
+#### Swift Package Manager
+
+To integrate Signals into your project using SwiftPM add the following to your `Package.swift`:
+
+```swift
+dependencies: [
+    .package(url: "https://github.com/artman/Signals", from: "6.0.0"),
+],
 ```
 
 ## Quick start
@@ -70,11 +80,11 @@ Subscribe to these signals from elsewhere in your application
 ```swift
 let networkLoader = NetworkLoader("http://artman.fi")
 
-networkLoader.onProgress.subscribe(on: self) { (progress) in
+networkLoader.onProgress.subscribe(with: self) { (progress) in
     print("Loading progress: \(progress*100)%")
 }
 
-networkLoader.onData.subscribe(on: self) { (data, error) in
+networkLoader.onData.subscribe(with: self) { (data, error) in
     // Do something with the data
 }
 ```
@@ -86,7 +96,7 @@ Singals aren't restricted to one subscriber. Multiple objects can subscribe to t
 You can also subscribe to events after they have occurred:
 
 ```swift
-networkLoader.onProgress.subscribePast(on: self) { (progress) in
+networkLoader.onProgress.subscribePast(with: self) { (progress) in
     // This will immediately fire with last progress that was reported
     // by the onProgress signal
     println("Loading progress: \(progress*100)%")
@@ -98,23 +108,23 @@ networkLoader.onProgress.subscribePast(on: self) { (progress) in
 Signal subscriptions can apply filters:
 
 ```swift
-networkLoader.onProgress.subscribe(on: self) { (progress) in
+networkLoader.onProgress.subscribe(with: self) { (progress) in
     // This fires when progress is done
 }.filter { $0 == 1.0 }
 ```
 
-You can sample up subscriptions to throttle how often you're subscription is exectuded, regardless how often the `Signal` fires:
+You can sample up subscriptions to throttle how often you're subscription is executed, regardless how often the `Signal` fires:
 
 ```swift
-networkLoader.onProgress.subscribe(on: self) { (progress) in
+networkLoader.onProgress.subscribe(with: self) { (progress) in
     // Executed once per second while progress changes
 }.sample(every: 1.0)
 ```
 
 By default, a subscription executes synchronously on the thread that fires the `Signal`. To change the default behaviour, you can use the `dispatchOnQueue` method to define the dispatch queue:
 
 ```swift
-networkLoader.onProgress.subscribe(on: self) { (progress) in
+networkLoader.onProgress.subscribe(with: self) { (progress) in
     // This fires on the main queue
 }.dispatchOnQueue(DispatchQueue.main)
 ```
@@ -127,7 +137,7 @@ self.onData.fire((data:receivedData, error:receivedError))
 
 // You can use the => operator to fire the signal
 self.onData => (data:receivedData, error:receivedError)
-  
+
 // Also works for signals without tuples
 self.onProgress => 1.0
 ```
@@ -138,12 +148,12 @@ Signals extends all classes that extend from UIControl (not available on OS X) a
 
 ```swift
 let button = UIButton()
-button.onTouchUpInside.observe(on: self) {
+button.onTouchUpInside.observe(with: self) {
     // Handle the touch
 }
 
 let slider = UISlider()
-slider.onValueChanged.observe(on: self) {
+slider.onValueChanged.observe(with: self) {
     // Handle value change
 }
 ```

Signals.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name = 'Signals'
-  s.version = '4.0.0'
+  s.version = '6.1.0'
   s.license = 'MIT'
   s.summary = 'Elegant eventing'
   s.homepage = 'https://github.com/artman/Signals'
@@ -9,13 +9,13 @@ Pod::Spec.new do |s|
   s.source = { :git => 'https://github.com/artman/Signals.git', :tag => s.version }
 
   s.ios.deployment_target = '8.0'
-  s.osx.deployment_target = '10.9'
   s.tvos.deployment_target = '9.0'
   s.watchos.deployment_target = '2.0'
+  s.osx.deployment_target = '10.11'
 
   s.source_files = 'Signals/Signal.swift'
   s.ios.source_files = 'Signals/iOS/*.swift'
   s.tvos.source_files = 'Signals/iOS/*.swift'
-
-  s.requires_arc = true
+  
+  s.swift_version = '5.0'
 end