From 3276ed2c3302a193b3c9b8a3debcf191582880f6 Mon Sep 17 00:00:00 2001 From: Asher Date: Thu, 6 Jun 2019 20:54:32 -0700 Subject: [PATCH 1/3] Update version remove coins from dependencies --- gui/EasyDEX-GUI | 2 +- package.json | 9 ++++----- version | 4 ++-- version_build | 2 +- yarn.lock | 5 ----- 5 files changed, 8 insertions(+), 14 deletions(-) diff --git a/gui/EasyDEX-GUI b/gui/EasyDEX-GUI index 4b9152731..e6d9a5c7a 160000 --- a/gui/EasyDEX-GUI +++ b/gui/EasyDEX-GUI @@ -1 +1 @@ -Subproject commit 4b9152731880391d0542003c39fcbf3afc29d0db +Subproject commit e6d9a5c7a6bd921de404a9457163056af209b6a7 diff --git a/package.json b/package.json index 969a35122..9a71ed46a 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "Agama", "productName": "Agama", - "version": "0.6.0+13", + "version": "0.5.7", "description": "Agama Wallet Desktop App", "main": "main.js", "scripts": { @@ -41,7 +41,6 @@ "dependencies": { "adm-zip": "^0.4.7", "agama-wallet-lib": "git://github.com/VerusCoin/agama-wallet-lib#dev", - "coins": "https://github.com/jl777/coins.git", "arch": "^2.1.0", "async": "^2.6.0", "bigi": "^1.4.2", @@ -98,7 +97,7 @@ ], "asar": false, "mac": { - "artifactName": "${productName}-MacOS-v${version}-13-PBaaS-Cross-chain-Technology-Preview.${ext}", + "artifactName": "${productName}-MacOS-v${version}.${ext}", "icon": "assets/icons/agama_icons/agama_app_icon.icns", "target": [ "dmg", @@ -121,7 +120,7 @@ ] }, "linux": { - "artifactName": "${productName}-Linux-v${version}-13-PBaaS-Cross-chain-Technology-Preview.${ext}", + "artifactName": "${productName}-Linux-v${version}.${ext}", "icon": "assets/icons/agama_icons", "desktop": { "Encoding": "UTF-8" @@ -131,7 +130,7 @@ ] }, "win": { - "artifactName": "${productName}-Windows-v${version}-13-PBaaS-Cross-chain-Technology-Preview.${ext}", + "artifactName": "${productName}-Windows-v${version}.${ext}", "target": [ "nsis", "zip" diff --git a/version b/version index a644ef6ec..73eefacbd 100644 --- a/version +++ b/version @@ -1,3 +1,3 @@ -version=0.6.0-13-PBaaS-Cross-chain-Technology-Preview +version=0.5.7 type=beta -minversion=0.6.0-13-PBaaS-Cross-chain-Technology-Preview +minversion=0.5.7 diff --git a/version_build b/version_build index aebce48ed..dc2b74e60 100644 --- a/version_build +++ b/version_build @@ -1 +1 @@ -0.6.0-13-PBaaS-Cross-chain-Technology-Preview \ No newline at end of file +0.5.7 \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index 3257424d5..b279b3ff9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -569,7 +569,6 @@ bitcoinjs-message@^2.0.0: "bitcore-lib-zcash@git+https://github.com/zcash-hackworks/bitcore-lib-zcash": version "0.13.19" - uid e97ae1dd2e9f14d6076d5e5429c75d8965afa4ab resolved "git+https://github.com/zcash-hackworks/bitcore-lib-zcash#e97ae1dd2e9f14d6076d5e5429c75d8965afa4ab" dependencies: bn.js "=2.0.4" @@ -1054,10 +1053,6 @@ code-point-at@^1.0.0: resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= -"coins@https://github.com/jl777/coins.git": - version "0.0.0" - resolved "https://github.com/jl777/coins.git#3694bff905902b945c906322051be04cfb1d44e4" - "coinselect@github:bitcoinjs/coinselect": version "3.1.11" resolved "https://codeload.github.com/bitcoinjs/coinselect/tar.gz/288f24d221e5f1e5beac883043cc706914b2b2bd" From 0f8c06fc1f0d095de0611cc39e367a5a38c317d5 Mon Sep 17 00:00:00 2001 From: Asher Date: Thu, 6 Jun 2019 21:31:33 -0700 Subject: [PATCH 2/3] Update package version --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a6474f1a0..a426d49de 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,8 +9,8 @@ variables: DOCKER_DRIVER: overlay2 DEFAULT_VERUSCOIN_BRANCH: ${CI_COMMIT_REF_NAME} DEFAULT_EASYDEXGUI_BRANCH: ${CI_COMMIT_REF_NAME} - AGAMA_VERSION: 0.6.0-13-PBaaS-Cross-chain-Technology-Preview - VERUSCOIN_VERSION: 0.6.0-12-PBaaS-Cross-chain-Technology-Preview + AGAMA_VERSION: 0.5.7-rc2 + VERUSCOIN_VERSION: 0.5.7-rc2 KOMODO_VERSION: 0.3.3b-beta BINARY_SOURCE: VerusCoin EASYDEX_GUI_BUILD: build.tar.gz From 0d4bf9cd61b3de57460b4a6cee38a1c04c91b100 Mon Sep 17 00:00:00 2001 From: Asher Date: Thu, 6 Jun 2019 22:44:36 -0700 Subject: [PATCH 3/3] Update package version --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a426d49de..f54c1f520 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,8 +9,8 @@ variables: DOCKER_DRIVER: overlay2 DEFAULT_VERUSCOIN_BRANCH: ${CI_COMMIT_REF_NAME} DEFAULT_EASYDEXGUI_BRANCH: ${CI_COMMIT_REF_NAME} - AGAMA_VERSION: 0.5.7-rc2 - VERUSCOIN_VERSION: 0.5.7-rc2 + AGAMA_VERSION: 0.5.7 + VERUSCOIN_VERSION: 0.5.7 KOMODO_VERSION: 0.3.3b-beta BINARY_SOURCE: VerusCoin EASYDEX_GUI_BUILD: build.tar.gz