diff --git a/cmd/version.go b/cmd/version.go index 1555261dad8260e5e020855e618913007b478341..364bd0f0856c10212984bac2abdc64d38f57cd84 100644 --- a/cmd/version.go +++ b/cmd/version.go @@ -16,7 +16,7 @@ import ( ) // Change this value to set the version for this build -const currentVersion = "1.3.0" +const currentVersion = "1.4.0" func printVersion() { fmt.Printf("Elixxir Client v%s -- %s\n\n", globals.SEMVER, globals.GITVERSION) diff --git a/globals/version_vars.go b/globals/version_vars.go index 2550d5fbb7bfcccc71945cfae45ae777c6e0ab88..adb16b83a9a4d441e85e282929bd7d9d59a0409e 100644 --- a/globals/version_vars.go +++ b/globals/version_vars.go @@ -1,10 +1,10 @@ // Code generated by go generate; DO NOT EDIT. // This file was generated by robots at -// 2020-07-13 18:24:01.075203 -0400 EDT m=+0.019600533 +// 2020-07-30 15:27:18.7064291 -0700 PDT m=+0.065083001 package globals -const GITVERSION = `14124a0 run make release` -const SEMVER = "1.3.0" +const GITVERSION = `4ef845a Merge branch 'hotfix/integrateekv' into 'release'` +const SEMVER = "1.4.0" const DEPENDENCIES = `module gitlab.com/elixxir/client go 1.13 @@ -22,11 +22,12 @@ require ( github.com/spf13/jwalterweatherman v1.1.0 github.com/spf13/pflag v1.0.5 // indirect github.com/spf13/viper v1.6.2 - gitlab.com/elixxir/comms v0.0.0-20200713211810-fc01d622fa7f + gitlab.com/elixxir/comms v0.0.0-20200730220537-60dbe58afe94 gitlab.com/elixxir/crypto v0.0.0-20200707005343-97f868cbd930 + gitlab.com/elixxir/ekv v0.0.0-20200729182028-159355ea5842 gitlab.com/elixxir/primitives v0.0.0-20200706165052-9fe7a4fb99a3 - gitlab.com/xx_network/comms v0.0.0-20200710221038-0746770adb7c - golang.org/x/crypto v0.0.0-20200707235045-ab33eee955e0 + gitlab.com/xx_network/comms v0.0.0-20200730220144-eea32e8b696d + golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899 gopkg.in/ini.v1 v1.52.0 // indirect ) ` diff --git a/go.mod b/go.mod index 120f109f2522623795b05178af79d2cb81e84192..f483175c4086c6414c15f9cd2f863fc10c680e0e 100644 --- a/go.mod +++ b/go.mod @@ -15,11 +15,11 @@ require ( github.com/spf13/jwalterweatherman v1.1.0 github.com/spf13/pflag v1.0.5 // indirect github.com/spf13/viper v1.6.2 - gitlab.com/elixxir/comms v0.0.0-20200713211810-fc01d622fa7f + gitlab.com/elixxir/comms v0.0.0-20200730220537-60dbe58afe94 gitlab.com/elixxir/crypto v0.0.0-20200707005343-97f868cbd930 gitlab.com/elixxir/ekv v0.0.0-20200729182028-159355ea5842 gitlab.com/elixxir/primitives v0.0.0-20200706165052-9fe7a4fb99a3 - gitlab.com/xx_network/comms v0.0.0-20200710221038-0746770adb7c + gitlab.com/xx_network/comms v0.0.0-20200730220144-eea32e8b696d golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899 gopkg.in/ini.v1 v1.52.0 // indirect ) diff --git a/go.sum b/go.sum index 3ac6bfe0194fa4f42f6130abe583446dfa44feba..0222d5381d5434a6707b9200622d02e3c7197de4 100644 --- a/go.sum +++ b/go.sum @@ -161,18 +161,16 @@ github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGr github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= gitlab.com/elixxir/comms v0.0.0-20200707210150-b8ebd0951d23/go.mod h1:OsWMZ1O/R9fOkm+PoHnR3rkXfFtipGoPs73FuKuurHY= -gitlab.com/elixxir/comms v0.0.0-20200713211810-fc01d622fa7f h1:fHP3O4giCQ7UFRuQp3b2bXzk0pYFeprIqS6MprAL3UU= -gitlab.com/elixxir/comms v0.0.0-20200713211810-fc01d622fa7f/go.mod h1:3oNzl6QuYxOuSkVZdMKkllW0dZRdDoejzeCLSTezlNM= +gitlab.com/elixxir/comms v0.0.0-20200730220537-60dbe58afe94 h1:AY3Nm9QXAh8jRUyKdX0jsay4A4j4z7/ofJgJKbvIFmc= +gitlab.com/elixxir/comms v0.0.0-20200730220537-60dbe58afe94/go.mod h1:rlB+AA0mNMRq9GIR587cNw5RX4Cr8VOiVpZkFTTcukQ= gitlab.com/elixxir/crypto v0.0.0-20200707005343-97f868cbd930 h1:9qzfwyR12OYgn3j30qcHZHHVfWshWnH54lcAHppEROQ= gitlab.com/elixxir/crypto v0.0.0-20200707005343-97f868cbd930/go.mod h1:LHBAaEf48a0/AjU118rjoworH0LgXifhAqmNX3ZRvME= gitlab.com/elixxir/ekv v0.0.0-20200729182028-159355ea5842 h1:m1zDQ6UadpuMnV7nvnyR+DUXE3AisRnVjajTb1xZE4c= gitlab.com/elixxir/ekv v0.0.0-20200729182028-159355ea5842/go.mod h1:bXY0kgbV5BHYda4YY5/hiG5bjimGK+R3PYub5yM9C/s= gitlab.com/elixxir/primitives v0.0.0-20200706165052-9fe7a4fb99a3 h1:GTfflZBNLeBq3UApYog0J3+hytdkoRsDduGQji2wyEU= gitlab.com/elixxir/primitives v0.0.0-20200706165052-9fe7a4fb99a3/go.mod h1:OQgUZq7SjnE0b+8+iIAT2eqQF+2IFHn73tOo+aV11mg= -gitlab.com/xx_network/comms v0.0.0-20200709165104-1fcde4b1729d h1:Vpg93y1f3AzFHfZFqMjbrNpRSfUCjmOg0rMLqY0venE= -gitlab.com/xx_network/comms v0.0.0-20200709165104-1fcde4b1729d/go.mod h1:CX2wQaDwnnk68etjJzIzyJ9Qfxl01KuTKKLpgXRhIYY= -gitlab.com/xx_network/comms v0.0.0-20200710221038-0746770adb7c h1:CrjMh1b94pNLVk0Xb/E5k3jatSexbuwIry+14oWrHDA= -gitlab.com/xx_network/comms v0.0.0-20200710221038-0746770adb7c/go.mod h1:CX2wQaDwnnk68etjJzIzyJ9Qfxl01KuTKKLpgXRhIYY= +gitlab.com/xx_network/comms v0.0.0-20200730220144-eea32e8b696d h1:P4ceawldsxuwQ6LZHnUnemtiOJI9/QquYi8QkFuUbtI= +gitlab.com/xx_network/comms v0.0.0-20200730220144-eea32e8b696d/go.mod h1:76OCijGBxYOBV5Kt7z6K7vNg3n9I57aCQMmI8GTpoEM= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= diff --git a/version_vars.go.bak b/version_vars.go.bak index 7e3a3aefecf6dbc8ed1700f14ef545e0966e990c..67620a0b3f330cea5051e878a2c07ceea175125d 100644 --- a/version_vars.go.bak +++ b/version_vars.go.bak @@ -1,10 +1,10 @@ // Code generated by go generate; DO NOT EDIT. // This file was generated by robots at -// 2020-07-13 18:24:01.075203 -0400 EDT m=+0.019600533 +// 2020-07-30 15:27:18.7064291 -0700 PDT m=+0.065083001 package cmd -const GITVERSION = `14124a0 run make release` -const SEMVER = "1.3.0" +const GITVERSION = `4ef845a Merge branch 'hotfix/integrateekv' into 'release'` +const SEMVER = "1.4.0" const DEPENDENCIES = `module gitlab.com/elixxir/client go 1.13 @@ -22,11 +22,12 @@ require ( github.com/spf13/jwalterweatherman v1.1.0 github.com/spf13/pflag v1.0.5 // indirect github.com/spf13/viper v1.6.2 - gitlab.com/elixxir/comms v0.0.0-20200713211810-fc01d622fa7f + gitlab.com/elixxir/comms v0.0.0-20200730220537-60dbe58afe94 gitlab.com/elixxir/crypto v0.0.0-20200707005343-97f868cbd930 + gitlab.com/elixxir/ekv v0.0.0-20200729182028-159355ea5842 gitlab.com/elixxir/primitives v0.0.0-20200706165052-9fe7a4fb99a3 - gitlab.com/xx_network/comms v0.0.0-20200710221038-0746770adb7c - golang.org/x/crypto v0.0.0-20200707235045-ab33eee955e0 + gitlab.com/xx_network/comms v0.0.0-20200730220144-eea32e8b696d + golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899 gopkg.in/ini.v1 v1.52.0 // indirect ) `