From 953c5785380f1f5f8cdedafba34c8ab57b0494e5 Mon Sep 17 00:00:00 2001 From: Silas Davis <silas@monax.io> Date: Thu, 8 Mar 2018 12:34:14 +0000 Subject: [PATCH] Fix IAVL transitive dependency to make Burrow easier to depend on. Signed-off-by: Silas Davis <silas@monax.io> --- Gopkg.lock | 2 +- Gopkg.toml | 10 ++++++---- scripts/deps/bos.sh | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index 98678fa2..0c65789c 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -480,6 +480,6 @@ [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "a684012f3c0a87d734862677fb39258daded36e6499720b99fb6fa95f483052e" + inputs-digest = "305882cc35ee7345aa49517218d941e2892c5d418426973b9f9f73d9b8149330" solver-name = "gps-cdcl" solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml index 89c4b74d..b2922635 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -1,8 +1,14 @@ +required = ["github.com/tendermint/iavl"] + [prune] go-tests = true unused-packages = true non-go = true +[[constraint]] + name = "github.com/tendermint/iavl" + version = "~0.2.0" + [[constraint]] name = "github.com/BurntSushi/toml" version = "0.3.0" @@ -39,10 +45,6 @@ name = "github.com/jawher/mow.cli" version = "1.0.3" -[[constraint]] - branch = "master" - name = "github.com/monax/keys" - [[constraint]] name = "github.com/spf13/cobra" version = "0.0.1" diff --git a/scripts/deps/bos.sh b/scripts/deps/bos.sh index 75c3e20e..6cded7e4 100755 --- a/scripts/deps/bos.sh +++ b/scripts/deps/bos.sh @@ -1,4 +1,4 @@ #!/usr/bin/env bash # The git revision of Bosmarmot/bos we will build and install into ./bin/ for integration tests -echo "d12b45c733a02c0c6dd70fc7e0563e5e3ef4a68c" \ No newline at end of file +echo "9da71e7278d340ecfdf47e72eb9e9e2bba8d3e7a" \ No newline at end of file -- GitLab