Merge pull request #58 from RxSwiftCommunity/spm

Update project layout for SwiftPM support
RxSwiftCommunity · Nov 24, 2016 · 12f07f2 · 12f07f2
2 parents 23c8094 + 48d107b
commit 12f07f2
Show file tree

Hide file tree

Showing 17 changed files with 101 additions and 60 deletions.
diff --git a/.gitignore b/.gitignore
@@ -32,3 +32,7 @@ Pods/
 Carthage/Checkouts
 Carthage/Build
 .DS_Store
+
+# SPM
+#
+Packages
diff --git a/.swift-version b/.swift-version
@@ -1 +1 @@
-3.0
+3.0.1
diff --git a/.travis.yml b/.travis.yml
@@ -5,4 +5,5 @@ osx_image: xcode8
 script: 
   - set -o pipefail
   - xcodebuild build-for-testing test-without-building -workspace Action.xcworkspace -scheme Action -sdk iphonesimulator -destination "name=iPhone SE" | xcpretty -c
+  - swift build
 
diff --git a/Action.xcodeproj/project.pbxproj b/Action.xcodeproj/project.pbxproj
diff --git a/Package.swift b/Package.swift
@@ -0,0 +1,10 @@
+import PackageDescription
+
+let package = Package(
+    name: "Action",
+    targets: [],
+    dependencies: [
+        .Package(url: "https://github.com/ReactiveX/RxSwift.git", majorVersion: 3)
+    ]
+)
+
diff --git a/Action+Internal.swift → Sources/Action/Action+Internal.swift b/Action+Internal.swift → Sources/Action/Action+Internal.swift
diff --git a/Action/Action.h → Sources/Action/Action.h b/Action/Action.h → Sources/Action/Action.h
diff --git a/Action.swift → Sources/Action/Action.swift b/Action.swift → Sources/Action/Action.swift
diff --git a/Action/Info.plist → Sources/Action/Info.plist b/Action/Info.plist → Sources/Action/Info.plist
diff --git a/AlertAction.swift → .../Action/UIKitExtensions/AlertAction.swift b/AlertAction.swift → .../Action/UIKitExtensions/AlertAction.swift
@@ -1,3 +1,4 @@
+#if os(iOS) || os(tvOS)
 import UIKit
 import RxSwift
 import RxCocoa
@@ -62,3 +63,4 @@ public extension Reactive where Base: UIAlertAction {
 		}
 	}
 }
+#endif
diff --git a/UIBarButtonItem+Action.swift → ...itExtensions/UIBarButtonItem+Action.swift b/UIBarButtonItem+Action.swift → ...itExtensions/UIBarButtonItem+Action.swift
@@ -1,3 +1,4 @@
+#if os(iOS) || os(tvOS)
 import UIKit
 import RxSwift
 import RxCocoa
@@ -37,3 +38,4 @@ public extension Reactive where Base: UIBarButtonItem {
         }
     }
 }
+#endif
diff --git a/UIButton+Rx.swift → .../Action/UIKitExtensions/UIButton+Rx.swift b/UIButton+Rx.swift → .../Action/UIKitExtensions/UIButton+Rx.swift
@@ -1,3 +1,4 @@
+#if os(iOS) || os(tvOS)
 import UIKit
 import RxSwift
 import RxCocoa
@@ -51,3 +52,4 @@ public extension Reactive where Base: UIButton {
         }
     }
 }
+#endif
diff --git a/Tests/Action/ActionTests.swift → Tests/ActionTests/ActionTests.swift b/Tests/Action/ActionTests.swift → Tests/ActionTests/ActionTests.swift
diff --git a/Tests/Action/AlertActionTests.swift → Tests/ActionTests/AlertActionTests.swift b/Tests/Action/AlertActionTests.swift → Tests/ActionTests/AlertActionTests.swift
diff --git a/Tests/Action/BarButtonTests.swift → Tests/ActionTests/BarButtonTests.swift b/Tests/Action/BarButtonTests.swift → Tests/ActionTests/BarButtonTests.swift
diff --git a/Tests/Action/ButtonTests.swift → Tests/ActionTests/ButtonTests.swift b/Tests/Action/ButtonTests.swift → Tests/ActionTests/ButtonTests.swift
diff --git a/Tests/Action/Info.plist → Tests/ActionTests/Info.plist b/Tests/Action/Info.plist → Tests/ActionTests/Info.plist