diff --git a/Dockerfile b/Dockerfile index 59bb5f86..a6b4f360 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,12 +3,8 @@ FROM node:15 as dist ARG COMPILER_PARAM="" ENV COMPILER_PARAM=$COMPILER_PARAM -RUN apt update -RUN apt -y install git apt-transport-https software-properties-common -#RUN echo "deb http://dl.bintray.com/sbt/debian /" | tee -a /etc/apt/sources.list.d/sbt.list -#RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2EE0EA64E40A89B84B2DF73499E82A75642AC823 -RUN apt-get update -RUN apt-get -y install openjdk-8-jre +RUN echo "deb http://archive.debian.org/debian stretch main" > /etc/apt/sources.list +RUN apt-get update && apt-get install -y git apt-transport-https software-properties-common openjdk-8-jre RUN wget https://github.com/sbt/sbt/releases/download/v1.5.0/sbt-1.5.0.tgz RUN tar xzvf sbt-1.5.0.tgz -C /usr/share/ diff --git a/package-lock.json b/package-lock.json index bac44030..8fe05ca2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,18 +1,18 @@ { "name": "waves-ide", - "version": "2.3.4", + "version": "2.3.6", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "waves-ide", - "version": "2.3.4", + "version": "2.3.6", "license": "ISC", "dependencies": { "@waves.exchange/provider-web": "1.0.2", "@waves/js-test-env": "1.1.4-beta", - "@waves/ride-js": "2.2.2", - "@waves/ride-language-server": "^1.1.1", + "@waves/ride-js": "2.2.9", + "@waves/ride-language-server": "^1.1.4", "@waves/signer": "1.0.2", "@waves/ts-types": "1.0.7", "@waves/tx-json-schemas": "1.2.5-beta.3", @@ -871,9 +871,9 @@ } }, "node_modules/@waves/ride-js": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/@waves/ride-js/-/ride-js-2.2.2.tgz", - "integrity": "sha512-htphrTAgWRKuap8ZcWIigBvZ0QC9+fbge4aw8IN2Rzom0nRmGnVxbxrocl0ENt5nd0lXm9O1zwXd2i+l+Btg1Q==", + "version": "2.2.9", + "resolved": "https://registry.npmjs.org/@waves/ride-js/-/ride-js-2.2.9.tgz", + "integrity": "sha512-XSdF27XYyw2CDPSxov+dpx1C1e4q2B/nHRUiOO6l6qEY7W9ita4Zer+YSHgamqPmjsQyfCjNj6CujFZ7UJtdXg==", "dependencies": { "@jest/globals": "^27.5.1", "@waves/ts-lib-crypto": "^1.4.3", @@ -881,17 +881,23 @@ } }, "node_modules/@waves/ride-language-server": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@waves/ride-language-server/-/ride-language-server-1.1.1.tgz", - "integrity": "sha512-JP3DxBWi+vKqIG3b5QAR4/jnXHilHtZwNhb1aNmVpp8lE1JRTxFzpkCfCpnjsoQ1htHuu4XOsEZGw/KsVKKMBw==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/@waves/ride-language-server/-/ride-language-server-1.1.4.tgz", + "integrity": "sha512-ux2cOJA4/UQ8YsvPDkoekW1rpWd9unsRYESVJWNZ6tIrmZmzgBm7hK/A7r+inVbk23cUg+SdWj7fFl8Qs9rYrA==", "dependencies": { - "@waves/ride-js": "^2.1.3-beta.1", - "vscode-languageserver": "^4.1.3" + "@waves/ride-js": "^2.2.5", + "vscode-languageserver": "^4.1.3", + "vscode-uri": "^2.0.3" }, "engines": { "node": "*" } }, + "node_modules/@waves/ride-language-server/node_modules/vscode-uri": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-2.1.2.tgz", + "integrity": "sha512-8TEXQxlldWAuIODdukIb+TR5s+9Ds40eSJrw+1iDDA9IFORPjMELarNQE3myz5XIkWWpdprmJjm1/SxMlWOC8A==" + }, "node_modules/@waves/signer": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/@waves/signer/-/signer-1.0.2.tgz", @@ -14320,9 +14326,9 @@ } }, "@waves/ride-js": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/@waves/ride-js/-/ride-js-2.2.2.tgz", - "integrity": "sha512-htphrTAgWRKuap8ZcWIigBvZ0QC9+fbge4aw8IN2Rzom0nRmGnVxbxrocl0ENt5nd0lXm9O1zwXd2i+l+Btg1Q==", + "version": "2.2.9", + "resolved": "https://registry.npmjs.org/@waves/ride-js/-/ride-js-2.2.9.tgz", + "integrity": "sha512-XSdF27XYyw2CDPSxov+dpx1C1e4q2B/nHRUiOO6l6qEY7W9ita4Zer+YSHgamqPmjsQyfCjNj6CujFZ7UJtdXg==", "requires": { "@jest/globals": "^27.5.1", "@waves/ts-lib-crypto": "^1.4.3", @@ -14330,12 +14336,20 @@ } }, "@waves/ride-language-server": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@waves/ride-language-server/-/ride-language-server-1.1.1.tgz", - "integrity": "sha512-JP3DxBWi+vKqIG3b5QAR4/jnXHilHtZwNhb1aNmVpp8lE1JRTxFzpkCfCpnjsoQ1htHuu4XOsEZGw/KsVKKMBw==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/@waves/ride-language-server/-/ride-language-server-1.1.4.tgz", + "integrity": "sha512-ux2cOJA4/UQ8YsvPDkoekW1rpWd9unsRYESVJWNZ6tIrmZmzgBm7hK/A7r+inVbk23cUg+SdWj7fFl8Qs9rYrA==", "requires": { - "@waves/ride-js": "^2.1.3-beta.1", - "vscode-languageserver": "^4.1.3" + "@waves/ride-js": "^2.2.5", + "vscode-languageserver": "^4.1.3", + "vscode-uri": "^2.0.3" + }, + "dependencies": { + "vscode-uri": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-2.1.2.tgz", + "integrity": "sha512-8TEXQxlldWAuIODdukIb+TR5s+9Ds40eSJrw+1iDDA9IFORPjMELarNQE3myz5XIkWWpdprmJjm1/SxMlWOC8A==" + } } }, "@waves/signer": { diff --git a/package.json b/package.json index 151ece13..5117416f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "waves-ide", - "version": "2.3.5", + "version": "2.3.6", "description": "Waves smart contact IDE", "main": "index.js", "repository": "http://github.com/wavesplatform/waves-ide", @@ -31,7 +31,7 @@ "bb >= 10" ], "dependencies": { - "@waves/ride-js": "2.2.5", + "@waves/ride-js": "2.2.9", "@waves/ride-language-server": "^1.1.4", "@waves.exchange/provider-web": "1.0.2", "@waves/js-test-env": "1.1.4-beta",