Skip to content

Update project layout for SwiftPM support #58

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Nov 24, 2016
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -32,3 +32,7 @@ Pods/
Carthage/Checkouts
Carthage/Build
.DS_Store

# SPM
#
Packages
2 changes: 1 addition & 1 deletion .swift-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.0
3.0.1
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -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

138 changes: 79 additions & 59 deletions Action.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

10 changes: 10 additions & 0 deletions Package.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import PackageDescription

let package = Package(
name: "Action",
targets: [],
dependencies: [
.Package(url: "https://github.com/ReactiveX/RxSwift.git", majorVersion: 3)
]
)

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.