diff --git a/Make.bat b/Make.bat index f1af88f68..3822cfd9f 100644 --- a/Make.bat +++ b/Make.bat @@ -273,16 +273,10 @@ REM Main build sequence Ends REM YARN END REM WGET - REM Comment out the below for loop as the latest version having - REM some problem https://github.com/nwjs/nw.js/issues/7902, so for - REM the time being hardcoded the version to 0.62.2 - REM FOR /f "tokens=2 delims='" %%i IN ('yarn info nw ^| findstr "latest: "') DO SET "NW_VERSION=%%i" - REM :GET_NW - REM wget https://dl.nwjs.io/v%NW_VERSION%/nwjs-v%NW_VERSION%-win-x64.zip -O "%TMPDIR%\nwjs-v%NW_VERSION%-win-x64.zip" - REM IF %ERRORLEVEL% NEQ 0 GOTO GET_NW - - SET "NW_VERSION=0.62.2" - wget https://dl.nwjs.io/v%NW_VERSION%/nwjs-v%NW_VERSION%-win-x64.zip -O "%TMPDIR%\nwjs-v%NW_VERSION%-win-x64.zip" + FOR /f "tokens=2 delims='" %%i IN ('yarn info nw ^| findstr "latest: "') DO SET "NW_VERSION=%%i" + :GET_NW + wget https://dl.nwjs.io/v%NW_VERSION%/nwjs-v%NW_VERSION%-win-x64.zip -O "%TMPDIR%\nwjs-v%NW_VERSION%-win-x64.zip" + IF %ERRORLEVEL% NEQ 0 GOTO GET_NW tar -C "%TMPDIR%" -xvf "%TMPDIR%\nwjs-v%NW_VERSION%-win-x64.zip" || EXIT /B 1 REM WGET END diff --git a/pkg/linux/build-functions.sh b/pkg/linux/build-functions.sh index 5cf36514c..e9c4c796a 100644 --- a/pkg/linux/build-functions.sh +++ b/pkg/linux/build-functions.sh @@ -130,11 +130,7 @@ _build_runtime() { # YARN END # WGET: - # Comment out the below line as the latest version having some - # problem https://github.com/nwjs/nw.js/issues/7902, so for the time being - # hardcoded the version to 0.62.2 - # NW_VERSION=$(yarn info nw | grep latest | awk -F "'" '{ print $2}') - NW_VERSION="0.62.2" + NW_VERSION=$(yarn info nw | grep latest | awk -F "'" '{ print $2}') pushd "${BUILDROOT}" > /dev/null || exit while true;do diff --git a/pkg/mac/build-functions.sh b/pkg/mac/build-functions.sh index 569ef41c1..77ced9170 100644 --- a/pkg/mac/build-functions.sh +++ b/pkg/mac/build-functions.sh @@ -34,11 +34,7 @@ _build_runtime() { # YARN END # WGET: - # Comment out the below line as the latest version having some - # problem https://github.com/nwjs/nw.js/issues/7902, so for the time being - # hardcoded the version to 0.62.2 - # NW_VERSION=$(yarn info nw | grep latest | awk -F "'" '{ print $2}') - NW_VERSION="0.62.2" + NW_VERSION=$(yarn info nw | grep latest | awk -F "'" '{ print $2}') pushd "${BUILD_ROOT}" > /dev/null || exit while true;do diff --git a/runtime/package.json b/runtime/package.json index 7129d6769..032b8de1d 100644 --- a/runtime/package.json +++ b/runtime/package.json @@ -25,7 +25,7 @@ }, "devDependencies": { "eslint": "^6.3.0", - "nw": "0.62.2" + "nw": "^0.70.0" }, "scripts": { "linter": "yarn eslint --no-eslintrc -c .eslintrc.js --ext .js ." diff --git a/runtime/yarn.lock b/runtime/yarn.lock index 1b9b19ab2..4544a62f8 100644 --- a/runtime/yarn.lock +++ b/runtime/yarn.lock @@ -1008,10 +1008,10 @@ number-is-nan@^1.0.0: resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0= -nw@0.62.2: - version "0.62.2" - resolved "https://registry.yarnpkg.com/nw/-/nw-0.62.2.tgz#a00e3e3caac5dc80da6897cfc6ef2af942b5c0fa" - integrity sha512-g9RNUUmumsMC75M5I5DGdPvszCEIefCHHZYOrMzpR6oQ6MrQmT29ejsBXBU5XVE2kfPJ5Eu9izvJTbc7uIqwgg== +nw@^0.70.0: + version "0.70.0" + resolved "https://registry.yarnpkg.com/nw/-/nw-0.70.0.tgz#a49cc7025671e031c5468d2eb9105fe7d1344680" + integrity sha512-dK807FvP14o1e4Nql1lrWKRORK7/DK4Ez3368M4cYhajsOK97y20Lq/m/pTX8m+rpnbhaMiEktvZ/lLOkw91EQ== dependencies: chalk "~1.1.3" decompress "^4.2.0"