Skip to content
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.

Sign up for GitHub

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

Update Cursive to 0.12 #2831

Merged
merged 2 commits into from
May 20, 2019
Merged

Update Cursive to 0.12 #2831

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd66ffa
Update Cursive to 0.12
quentinlesceller May 16, 2019
968b48f
Update windows CI patch
quentinlesceller May 16, 2019
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
8 changes: 3 additions & 5 deletions .ci/win.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
diff --git a/Cargo.toml b/Cargo.toml
index fc8615b6..5ffbf06f 100644
index d4cda375..3e3124e9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -45,8 +45,8 @@ cursive = { version = "0.11.0", default-features = false, features = ["pancurses
@@ -45,8 +45,6 @@ cursive = { version = "0.12", default-features = false, features = ["pancurses-b
[target.'cfg(windows)'.dependencies.pancurses]
version = "0.16.0"
features = ["win32"]
-[target.'cfg(unix)'.dependencies]
-cursive = "0.11.0"
+#[target.'cfg(unix)'.dependencies]
+#cursive = "0.11.0"
-cursive = "0.12"

[build-dependencies]
built = "0.3"
72 changes: 60 additions & 12 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,12 @@ grin_servers = { path = "./servers", version = "1.1.0-beta.2" }
grin_util = { path = "./util", version = "1.1.0-beta.2" }

[target.'cfg(windows)'.dependencies]
cursive = { version = "0.11.0", default-features = false, features = ["pancurses-backend"] }
cursive = { version = "0.12", default-features = false, features = ["pancurses-backend"] }
[target.'cfg(windows)'.dependencies.pancurses]
version = "0.16.0"
features = ["win32"]
[target.'cfg(unix)'.dependencies]
cursive = "0.11.0"
cursive = "0.12"

[build-dependencies]
built = "0.3"
Expand Down