Skip to content

Commit 5314acc

Browse files
NachoSotoandersio
authored andcommitted
Removing Result in favor of Swift.Result (#702)
* Removed Result * Removing Result from project * Added NoError and ResultProtocol for Swift.Result * Using Swift.Error in lieu of AnyError * Replaced NoError with Never * Test fixes * Specify the correct Error type in Never overloads * Fix tests * Update SwiftPM * Update CI * Remove the last vestiges of Result.framework * Rename assumeNevers back to assumeNoErrors
1 parent c37950d commit 5314acc

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+970
-1140
lines changed

.gitmodules

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,3 @@
77
[submodule "Carthage/Checkouts/xcconfigs"]
88
path = Carthage/Checkouts/xcconfigs
99
url = https://github.com/jspahrsummers/xcconfigs.git
10-
[submodule "Carthage/Checkouts/Result"]
11-
path = Carthage/Checkouts/Result
12-
url = https://github.com/antitypical/Result.git

.swift-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.2.1
1+
5.0

.travis.yml

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
os: osx
22
language: objective-c
3-
osx_image: xcode10.1
3+
osx_image: xcode10.2
44
before_install: true
55
install: true
66
branches:
@@ -68,25 +68,10 @@ aliases:
6868
matrix:
6969
include:
7070
- <<: *xcode
71-
- <<: *xcode
72-
osx_image: xcode10.2
73-
# - <<: *xcode
74-
# osx_image: xcode10.2
75-
# env: XCODE_ARGS="SWIFT_VERSION=5.0"
7671
- <<: *cocoapods
7772
install: gem update cocoapods
7873
- <<: *swiftpm_darwin
79-
- <<: *swiftpm_darwin
80-
osx_image: xcode10.2
81-
- <<: *swiftpm_linux
8274
- <<: *swiftpm_linux
83-
env:
84-
- JOB=SwiftPM
85-
- SWIFT_VERSION=4.2.3
86-
- <<: *swiftpm_linux
87-
env:
88-
- JOB=SwiftPM
89-
- SWIFT_VERSION=5.0-DEVELOPMENT-SNAPSHOT-2019-02-28-a
9075
- stage: carthage
9176
script: carthage build --cache-builds --no-skip-current
9277
- stage: deploy

Cartfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +0,0 @@
1-
github "antitypical/Result" ~> 4.1

Cartfile.resolved

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
github "Quick/Nimble" "v8.0.0"
22
github "Quick/Quick" "v2.0.0"
3-
github "antitypical/Result" "4.1.0"
43
github "jspahrsummers/xcconfigs" "0.12"

Carthage/Checkouts/Result

Lines changed: 0 additions & 1 deletion
This file was deleted.

Package.resolved

Lines changed: 0 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Package.swift

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version:4.0
1+
// swift-tools-version:5.0
22
import PackageDescription
33

44
let package = Package(
@@ -7,13 +7,12 @@ let package = Package(
77
.library(name: "ReactiveSwift", targets: ["ReactiveSwift"]),
88
],
99
dependencies: [
10-
.package(url: "https://github.com/antitypical/Result.git", from: "4.1.0"),
1110
.package(url: "https://github.com/Quick/Quick.git", from: "2.0.0"),
1211
.package(url: "https://github.com/Quick/Nimble.git", from: "8.0.0"),
1312
],
1413
targets: [
15-
.target(name: "ReactiveSwift", dependencies: ["Result"], path: "Sources"),
14+
.target(name: "ReactiveSwift", dependencies: [], path: "Sources"),
1615
.testTarget(name: "ReactiveSwiftTests", dependencies: ["ReactiveSwift", "Quick", "Nimble"]),
1716
],
18-
swiftLanguageVersions: [4]
17+
swiftLanguageVersions: [.v5]
1918
)

[email protected]

Lines changed: 0 additions & 19 deletions
This file was deleted.

README.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ ReactiveSwift to your `Cartfile`:
7575
github "ReactiveCocoa/ReactiveSwift" ~> 5.0
7676
```
7777

78-
If you use Carthage to build your dependencies, make sure you have added `ReactiveSwift.framework`, and `Result.framework` to the "_Linked Frameworks and Libraries_" section of your target, and have included them in your Carthage framework copying build phase.
78+
If you use Carthage to build your dependencies, make sure you have added `ReactiveSwift.framework` to the "_Linked Frameworks and Libraries_" section of your target, and have included them in your Carthage framework copying build phase.
7979

8080
#### CocoaPods
8181

@@ -100,12 +100,10 @@ of your package in `Package.swift`:
100100
1. Add the ReactiveSwift repository as a [submodule][] of your
101101
application’s repository.
102102
1. Run `git submodule update --init --recursive` from within the ReactiveCocoa folder.
103-
1. Drag and drop `ReactiveSwift.xcodeproj` and
104-
`Carthage/Checkouts/Result/Result.xcodeproj` into your application’s Xcode
103+
1. Drag and drop `ReactiveSwift.xcodeproj` into your application’s Xcode
105104
project or workspace.
106105
1. On the “General” tab of your application target’s settings, add
107-
`ReactiveSwift.framework`, and `Result.framework`
108-
to the “Embedded Binaries” section.
106+
`ReactiveSwift.framework` to the “Embedded Binaries” section.
109107
1. If your application target does not contain Swift code at all, you should also
110108
set the `EMBEDDED_CONTENT_CONTAINS_SWIFT` build setting to “Yes”.
111109

0 commit comments

Comments
 (0)