Skip to content

Commit

Permalink
Merge branch 'feature/bump-swift-5-3'
Browse files Browse the repository at this point in the history
  • Loading branch information
twittemb committed Sep 27, 2020
2 parents 28d99bf + 1700a89 commit acd1f0d
Show file tree
Hide file tree
Showing 16 changed files with 101 additions and 80 deletions.
8 changes: 4 additions & 4 deletions Package.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// swift-tools-version:5.1
// swift-tools-version:5.3
// The swift-tools-version declares the minimum version of Swift required to build this package.

import PackageDescription
Expand All @@ -7,7 +7,7 @@ let package = Package(
name: "Spin.Swift",
platforms: [
.macOS(.v10_10),
.iOS(.v8),
.iOS(.v9),
.tvOS(.v9),
.watchOS(.v3)
],
Expand Down Expand Up @@ -49,7 +49,7 @@ let package = Package(
path: "Sources/ReactiveSwift"),
.target(
name: "SpinRxSwift",
dependencies: ["SpinCommon", "RxSwift", "RxRelay"],
dependencies: ["SpinCommon", "RxSwift", .product(name: "RxRelay", package: "RxSwift")],
path: "Sources/RxSwift"),
.testTarget(
name: "SpinCommonTests",
Expand All @@ -65,7 +65,7 @@ let package = Package(
path: "Tests/ReactiveSwiftTests"),
.testTarget(
name: "SpinRxSwiftTests",
dependencies: ["SpinRxSwift", "RxBlocking"],
dependencies: ["SpinRxSwift", .product(name: "RxBlocking", package: "RxSwift")],
path: "Tests/RxSwiftTests"
),
]
Expand Down
Loading

0 comments on commit acd1f0d

Please sign in to comment.