Skip to content

Commit e59987a

Browse files
committed
[Dependencies] Update to new ReSwift & ReSwiftRouter.
1 parent d0274ca commit e59987a

File tree

323 files changed

+7461
-2936
lines changed

Some content is hidden

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

323 files changed

+7461
-2936
lines changed

Cartfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ github "Quick/Quick"
33
github "Quick/Nimble"
44
github "soffes/SSKeychain"
55
github "Ben-G/ListKit"
6-
github "ReSwift/ReSwift" ~> 3.0.0
7-
github "ReSwift/ReSwiftRouter" ~> 0.5.0
6+
github "ReSwift/ReSwift" ~> 4.0.0
7+
github "ReSwift/ReSwiftRouter" "master"

Cartfile.resolved

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
github "Ben-G/ListKit" "2.0.0"
2-
github "Quick/Nimble" "v5.1.1"
3-
github "Quick/Quick" "v1.0.0"
4-
github "ReSwift/ReSwift" "3.0.0"
5-
github "nerdishbynature/RequestKit" "2.0.0"
2+
github "Quick/Nimble" "v7.0.0"
3+
github "Quick/Quick" "v1.1.0"
4+
github "ReSwift/ReSwift" "4.0.0"
5+
github "ReSwift/ReSwiftRouter" "891bc13fc4c12f106eb51c64f757c18e64062d60"
6+
github "nerdishbynature/RequestKit" "2.0.2"
7+
github "nerdishbynature/octokit.swift" "0.7.3"
68
github "soffes/SSKeychain" "v1.5.2"
7-
github "ReSwift/ReSwiftRouter" "0.5.1"
8-
github "nerdishbynature/octokit.swift" "0.7.0"
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
- [ ] I have read [CONTRIBUTING](https://github.com/Quick/Nimble/blob/master/CONTRIBUTING.md) and have done my best to follow them.
2+
3+
### What did you do?
4+
5+
Please replace this with what you did.
6+
7+
### What did you expect to happen?
8+
9+
Please replace this with what you expected to happen.
10+
11+
### What actually happened instead?
12+
13+
Please replace this with what happened instead.
14+
15+
### Environment
16+
17+
List the software versions you're using:
18+
19+
- Quick: *?.?.?*
20+
- Nimble: *?.?.?*
21+
- Xcode Version: *?.? (????)* (Open Xcode; In menubar: Xcode > About Xcode)
22+
- Swift Version: *?.?* (Open Xcode Preferences; Components > Toolchains. If none, use `Xcode Default`.)
23+
24+
Please also mention which package manager you used and its version. Delete the
25+
other package managers in this list:
26+
27+
- Cocoapods: *?.?.?* (Use `pod --version` in Terminal)
28+
- Carthage: *?.?* (Use `carthage version` in Terminal)
29+
- Swift Package Manager *?.?.? (swiftpm-???)* (Use `swift build --version` in Terminal)
30+
31+
### Project that demonstrates the issue
32+
33+
Please link to a project we can download that reproduces the issue. Feel free
34+
to delete this section if it's not relevant to the issue (eg - feature request).
35+
36+
The project should be [short, self-contained, and correct example](http://sscce.org/).
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
The PR should summarize what was changed and why. Here are some questions to
2+
help you if you're not sure:
3+
4+
- What behavior was changed?
5+
- What code was refactored / updated to support this change?
6+
- What issues are related to this PR? Or why was this change introduced?
7+
8+
Checklist - While not every PR needs it, new features should consider this list:
9+
10+
- [ ] Does this have tests?
11+
- [ ] Does this have documentation?
12+
- [ ] Does this break the public API (Requires major version bump)?
13+
- [ ] Is this a new feature (Requires minor version bump)?
14+
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
swift:
2+
config_file: .swiftlint.yml
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
disabled_rules:
2+
- line_length
3+
- todo
4+
- variable_name
5+
- force_try
6+
- function_parameter_count
7+
- force_cast
8+
- type_name
9+
- large_tuple
10+
11+
included:
12+
- Sources
13+
- Tests
14+
15+
excluded:
16+
- Sources/Lib
17+
18+
trailing_comma:
19+
mandatory_comma: true
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
FROM swift:latest
2+
COPY . .
3+
CMD ./test swiftpm

Carthage/Checkouts/Nimble/Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# A sample Gemfile
22
source "https://rubygems.org"
33

4-
gem 'cocoapods', '1.1.0.rc.3'
4+
gem 'cocoapods', '1.2.0'
Lines changed: 25 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,69 +1,73 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activesupport (4.2.7.1)
4+
CFPropertyList (2.3.5)
5+
activesupport (4.2.8)
56
i18n (~> 0.7)
6-
json (~> 1.7, >= 1.7.7)
77
minitest (~> 5.1)
88
thread_safe (~> 0.3, >= 0.3.4)
99
tzinfo (~> 1.1)
1010
claide (1.0.1)
11-
cocoapods (1.1.0.rc.3)
11+
cocoapods (1.2.0)
1212
activesupport (>= 4.0.2, < 5)
1313
claide (>= 1.0.1, < 2.0)
14-
cocoapods-core (= 1.1.0.rc.3)
14+
cocoapods-core (= 1.2.0)
1515
cocoapods-deintegrate (>= 1.0.1, < 2.0)
16-
cocoapods-downloader (>= 1.1.1, < 2.0)
16+
cocoapods-downloader (>= 1.1.3, < 2.0)
1717
cocoapods-plugins (>= 1.0.0, < 2.0)
1818
cocoapods-search (>= 1.0.0, < 2.0)
1919
cocoapods-stats (>= 1.0.0, < 2.0)
20-
cocoapods-trunk (= 1.1.0.beta.1)
20+
cocoapods-trunk (>= 1.1.2, < 2.0)
2121
cocoapods-try (>= 1.1.0, < 2.0)
2222
colored (~> 1.2)
2323
escape (~> 0.0.4)
24-
fourflusher (~> 2.0)
24+
fourflusher (~> 2.0.1)
2525
gh_inspector (~> 1.0)
26-
molinillo (~> 0.5.1)
26+
molinillo (~> 0.5.5)
2727
nap (~> 1.0)
28-
xcodeproj (>= 1.3.2, < 2.0)
29-
cocoapods-core (1.1.0.rc.3)
28+
ruby-macho (~> 0.2.5)
29+
xcodeproj (>= 1.4.1, < 2.0)
30+
cocoapods-core (1.2.0)
3031
activesupport (>= 4.0.2, < 5)
3132
fuzzy_match (~> 2.0.4)
3233
nap (~> 1.0)
3334
cocoapods-deintegrate (1.0.1)
34-
cocoapods-downloader (1.1.1)
35+
cocoapods-downloader (1.1.3)
3536
cocoapods-plugins (1.0.0)
3637
nap
3738
cocoapods-search (1.0.0)
3839
cocoapods-stats (1.0.0)
39-
cocoapods-trunk (1.1.0.beta.1)
40+
cocoapods-trunk (1.1.2)
4041
nap (>= 0.8, < 2.0)
4142
netrc (= 0.7.8)
4243
cocoapods-try (1.1.0)
4344
colored (1.2)
4445
escape (0.0.4)
4546
fourflusher (2.0.1)
4647
fuzzy_match (2.0.4)
47-
gh_inspector (1.0.2)
48-
i18n (0.7.0)
49-
json (1.8.3)
50-
minitest (5.9.1)
51-
molinillo (0.5.1)
48+
gh_inspector (1.0.3)
49+
i18n (0.8.1)
50+
minitest (5.10.1)
51+
molinillo (0.5.6)
52+
nanaimo (0.2.3)
5253
nap (1.1.0)
5354
netrc (0.7.8)
54-
thread_safe (0.3.5)
55+
ruby-macho (0.2.6)
56+
thread_safe (0.3.6)
5557
tzinfo (1.2.2)
5658
thread_safe (~> 0.1)
57-
xcodeproj (1.3.2)
59+
xcodeproj (1.4.2)
60+
CFPropertyList (~> 2.3.3)
5861
activesupport (>= 3)
5962
claide (>= 1.0.1, < 2.0)
6063
colored (~> 1.2)
64+
nanaimo (~> 0.2.3)
6165

6266
PLATFORMS
6367
ruby
6468

6569
DEPENDENCIES
66-
cocoapods (= 1.1.0.rc.3)
70+
cocoapods (= 1.2.0)
6771

6872
BUNDLED WITH
69-
1.13.1
73+
1.14.5

Carthage/Checkouts/Quick/Externals/Nimble/LICENSE.md renamed to Carthage/Checkouts/Nimble/LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ Apache License
186186
same "printed page" as the copyright notice for easier
187187
identification within third-party archives.
188188

189-
Copyright 2014 Quick Team
189+
Copyright 2016 Quick Team
190190

191191
Licensed under the Apache License, Version 2.0 (the "License");
192192
you may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)