From 6d4f04ea7bd315c7a5886082062a468e76b18071 Mon Sep 17 00:00:00 2001 From: Krunoslav Zaher Date: Wed, 30 Dec 2015 20:13:38 +0100 Subject: [PATCH] Fixes package configuration for SPM. --- Package.swift | 41 +++++++++++++++++++++++++++++++++++++---- 1 file changed, 37 insertions(+), 4 deletions(-) diff --git a/Package.swift b/Package.swift index 55caff03..99b9b3bf 100644 --- a/Package.swift +++ b/Package.swift @@ -1,7 +1,13 @@ import PackageDescription +#if os(OSX) let package = Package( name: "RxSwift", + exclude: [ + "Sources/RxCocoa", + "Sources/RxTests", + "Sources/AllTests" + ], targets: [ Target( name: "RxSwift" @@ -28,9 +34,36 @@ let package = Package( ) ] ) -#if os(OSX) - package.exclude = ["Sources/RxCocoa", "Sources/RxTests", "Sources/AllTests"] #elseif os(Linux) - package.exclude = ["Sources/RxCocoa"] -#else +let package = Package( + name: "RxSwift", + exclude: [ + "Sources/RxCocoa", + ], + targets: [ + Target( + name: "RxSwift" + ), + Target( + name: "RxTests", + dependencies: [ + .Target(name: "RxSwift") + ] + ), + Target( + name: "RxBlocking", + dependencies: [ + .Target(name: "RxSwift") + ] + ), + Target( + name: "AllTests", + dependencies: [ + .Target(name: "RxSwift"), + .Target(name: "RxBlocking"), + .Target(name: "RxTests") + ] + ) + ] +) #endif