From be8665937b1261bf5ad0af365cc93615e95fa1ae Mon Sep 17 00:00:00 2001 From: Asher Date: Fri, 18 Oct 2019 16:28:00 -0700 Subject: [PATCH 1/2] Update EasyDEX ref --- gui/EasyDEX-GUI | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gui/EasyDEX-GUI b/gui/EasyDEX-GUI index bf5238ecf..3d87ddb19 160000 --- a/gui/EasyDEX-GUI +++ b/gui/EasyDEX-GUI @@ -1 +1 @@ -Subproject commit bf5238ecf5e89fb5ba2328f965990bd8e38be18f +Subproject commit 3d87ddb19ea20d34a467e67eaddf57bcfa820d8c From 8e879253e19117af9adc3b79b7440948aae0a3f5 Mon Sep 17 00:00:00 2001 From: Asher Date: Fri, 18 Oct 2019 16:36:10 -0700 Subject: [PATCH 2/2] Update version --- .gitlab-ci.yml | 4 ++-- gui/EasyDEX-GUI | 2 +- package.json | 2 +- version | 4 ++-- version_build | 2 +- yarn.lock | 36 ++---------------------------------- 6 files changed, 9 insertions(+), 41 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f5b593d42..c63f45010 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,8 +8,8 @@ stages: variables: DOCKER_DRIVER: overlay2 DEFAULT_VERUSCOIN_BRANCH: ${CI_COMMIT_REF_NAME} - AGAMA_VERSION: 0.5.9-1 - VERUSCOIN_VERSION: 0.5.9-1 + AGAMA_VERSION: 0.5.9-2 + VERUSCOIN_VERSION: 0.5.9-2 KOMODO_VERSION: 0.4.0a BINARY_SOURCE: VerusCoin EASYDEX_GUI_BUILD: build.tar.gz diff --git a/gui/EasyDEX-GUI b/gui/EasyDEX-GUI index 3d87ddb19..bbf833b51 160000 --- a/gui/EasyDEX-GUI +++ b/gui/EasyDEX-GUI @@ -1 +1 @@ -Subproject commit 3d87ddb19ea20d34a467e67eaddf57bcfa820d8c +Subproject commit bbf833b5113fdddab5922e9125b0a5ac57c2c40c diff --git a/package.json b/package.json index d27e2da32..e2b1f1963 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "Agama", "productName": "Agama", - "version": "0.5.9-1", + "version": "0.5.9-2", "description": "Agama Wallet Desktop App", "main": "main.js", "scripts": { diff --git a/version b/version index 0ec93247b..fb7cab42f 100644 --- a/version +++ b/version @@ -1,3 +1,3 @@ -version=0.5.9-1 +version=0.5.9-2 type=beta -minversion=0.5.9-1 +minversion=0.5.9-2 diff --git a/version_build b/version_build index a28cb46a0..18c7275b6 100644 --- a/version_build +++ b/version_build @@ -1 +1 @@ -0.5.9-1 +0.5.9-2 diff --git a/yarn.lock b/yarn.lock index f8dd2d88e..933437da6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1255,7 +1255,7 @@ debug@^4.1.1, debug@~4.1.0: dependencies: ms "^2.1.1" -debuglog@*, debuglog@^1.0.1: +debuglog@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492" integrity sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI= @@ -2396,7 +2396,7 @@ import-lazy@^2.1.0: resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43" integrity sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM= -imurmurhash@*, imurmurhash@^0.1.4: +imurmurhash@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= @@ -2986,11 +2986,6 @@ lockfile@^1.0.4: dependencies: signal-exit "^3.0.2" -lodash._baseindexof@*: - version "3.1.0" - resolved "https://registry.yarnpkg.com/lodash._baseindexof/-/lodash._baseindexof-3.1.0.tgz#fe52b53a1c6761e42618d654e4a25789ed61822c" - integrity sha1-/lK1OhxnYeQmGNZU5KJXie1hgiw= - lodash._baseuniq@~4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/lodash._baseuniq/-/lodash._baseuniq-4.6.0.tgz#0ebb44e456814af7905c6212fa2c9b2d51b841e8" @@ -2999,33 +2994,11 @@ lodash._baseuniq@~4.6.0: lodash._createset "~4.0.0" lodash._root "~3.0.0" -lodash._bindcallback@*: - version "3.0.1" - resolved "https://registry.yarnpkg.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz#e531c27644cf8b57a99e17ed95b35c748789392e" - integrity sha1-5THCdkTPi1epnhftlbNcdIeJOS4= - -lodash._cacheindexof@*: - version "3.0.2" - resolved "https://registry.yarnpkg.com/lodash._cacheindexof/-/lodash._cacheindexof-3.0.2.tgz#3dc69ac82498d2ee5e3ce56091bafd2adc7bde92" - integrity sha1-PcaayCSY0u5ePOVgkbr9Ktx73pI= - -lodash._createcache@*: - version "3.1.2" - resolved "https://registry.yarnpkg.com/lodash._createcache/-/lodash._createcache-3.1.2.tgz#56d6a064017625e79ebca6b8018e17440bdcf093" - integrity sha1-VtagZAF2JeeevKa4AY4XRAvc8JM= - dependencies: - lodash._getnative "^3.0.0" - lodash._createset@~4.0.0: version "4.0.3" resolved "https://registry.yarnpkg.com/lodash._createset/-/lodash._createset-4.0.3.tgz#0f4659fbb09d75194fa9e2b88a6644d363c9fe26" integrity sha1-D0ZZ+7CddRlPqeK4imZE02PJ/iY= -lodash._getnative@*, lodash._getnative@^3.0.0: - version "3.9.1" - resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5" - integrity sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U= - lodash._root@~3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/lodash._root/-/lodash._root-3.0.1.tgz#fba1c4524c19ee9a5f8136b4609f017cf4ded692" @@ -3041,11 +3014,6 @@ lodash.isfinite@^3.3.2: resolved "https://registry.yarnpkg.com/lodash.isfinite/-/lodash.isfinite-3.3.2.tgz#fb89b65a9a80281833f0b7478b3a5104f898ebb3" integrity sha1-+4m2WpqAKBgz8LdHizpRBPiY67M= -lodash.restparam@*: - version "3.6.1" - resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805" - integrity sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU= - lodash.union@~4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/lodash.union/-/lodash.union-4.6.0.tgz#48bb5088409f16f1821666641c44dd1aaae3cd88"