Skip to content

Commit 12f07f2

Browse files
authored
Merge pull request #58 from RxSwiftCommunity/spm
Update project layout for SwiftPM support
2 parents 23c8094 + 48d107b commit 12f07f2

17 files changed

+101
-60
lines changed

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,7 @@ Pods/
3232
Carthage/Checkouts
3333
Carthage/Build
3434
.DS_Store
35+
36+
# SPM
37+
#
38+
Packages

.swift-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.0
1+
3.0.1

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@ osx_image: xcode8
55
script:
66
- set -o pipefail
77
- xcodebuild build-for-testing test-without-building -workspace Action.xcworkspace -scheme Action -sdk iphonesimulator -destination "name=iPhone SE" | xcpretty -c
8+
- swift build
89

Action.xcodeproj/project.pbxproj

Lines changed: 79 additions & 59 deletions
Large diffs are not rendered by default.

Package.swift

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
import PackageDescription
2+
3+
let package = Package(
4+
name: "Action",
5+
targets: [],
6+
dependencies: [
7+
.Package(url: "https://github.com/ReactiveX/RxSwift.git", majorVersion: 3)
8+
]
9+
)
10+
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

AlertAction.swift renamed to Sources/Action/UIKitExtensions/AlertAction.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#if os(iOS) || os(tvOS)
12
import UIKit
23
import RxSwift
34
import RxCocoa
@@ -62,3 +63,4 @@ public extension Reactive where Base: UIAlertAction {
6263
}
6364
}
6465
}
66+
#endif

UIBarButtonItem+Action.swift renamed to Sources/Action/UIKitExtensions/UIBarButtonItem+Action.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#if os(iOS) || os(tvOS)
12
import UIKit
23
import RxSwift
34
import RxCocoa
@@ -37,3 +38,4 @@ public extension Reactive where Base: UIBarButtonItem {
3738
}
3839
}
3940
}
41+
#endif

UIButton+Rx.swift renamed to Sources/Action/UIKitExtensions/UIButton+Rx.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#if os(iOS) || os(tvOS)
12
import UIKit
23
import RxSwift
34
import RxCocoa
@@ -51,3 +52,4 @@ public extension Reactive where Base: UIButton {
5152
}
5253
}
5354
}
55+
#endif
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)