From e5b6b4baad35456b9a0a39cd9f875e308fb9bad7 Mon Sep 17 00:00:00 2001
From: Benoit Lavenier <benoit.lavenier@e-is.pro>
Date: Thu, 11 May 2023 17:38:23 +0200
Subject: [PATCH] Prepare release 1.7.0-rc2
---
.local/build_osx.sh | 2 +-
install.sh | 11 +++++------
package.json | 6 +++---
run.sh | 8 ++++++--
src/package.json | 6 +++---
5 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/.local/build_osx.sh b/.local/build_osx.sh
index a699877..a624a07 100755
--- a/.local/build_osx.sh
+++ b/.local/build_osx.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-VERSION=1.3.11
+VERSION=1.6.12
EXPECTED_ASSETS="cesium-desktop-v${VERSION}-osx-x64.zip"
export EXPECTED_ASSETS
diff --git a/install.sh b/install.sh
index 489d4a6..9a38468 100755
--- a/install.sh
+++ b/install.sh
@@ -2,12 +2,11 @@
PROJECT_DIR=$(pwd)
DOWNLOADS_DIR=${PROJECT_DIR}/downloads
-NW_VERSION=0.42.2
-#NW_BASENAME=nwjs
-NW_BASENAME=nwjs-sdk
-CHROMIUM_MAJOR_VERSION=78
-CESIUM_DEFAULT_VERSION=1.6.7
-NODE_VERSION=10
+NW_VERSION=${NW_VERSION:-"0.76.0"}
+NW_BASENAME=${NW_BASENAME:-"nwjs"}
+CHROMIUM_MAJOR_VERSION=113
+CESIUM_DEFAULT_VERSION=1.6.12
+NODE_VERSION=19
# Check first arguments = version
if [[ $1 =~ ^[0-9]+.[0-9]+.[0-9]+((a|b)[0-9]+)?$ ]];
diff --git a/package.json b/package.json
index 6f5d11c..f158049 100644
--- a/package.json
+++ b/package.json
@@ -17,11 +17,11 @@
"readmeFilename": "README.md",
"dependencies": {
"bs58": "^4.0.1",
- "cli-color": "^2.0.0",
- "js-yaml": "^3.13.1",
+ "cli-color": "^2.0.3",
+ "js-yaml": "^3.14.1",
"co": "^4.6.0",
"request": "^2.88.2",
- "request-promise": "^4.2.5",
+ "request-promise": "^4.2.6",
"stringstream": "^0.0.6"
}
}
diff --git a/run.sh b/run.sh
index de4ddc5..3a08334 100755
--- a/run.sh
+++ b/run.sh
@@ -1,13 +1,17 @@
#!/bin/bash
+# Use SDK, to be able to debug
+export NW_BASENAME="nwjs"
+
PROJECT_DIR=$(pwd)
-VERSION=$1
+export VERSION=$1
+
if [[ "${VERSION}" = "DEV" ]]; then
# Installing default version
./install.sh
[[ ! $? -eq 0 ]] && exit 1
- # Copying DEV files
+ # Then copying DEV files
if [[ -d "${PROJECT_DIR}/../../www/dist" ]]; then
echo "Copying DEV files..."
mkdir -p ${PROJECT_DIR}/www/cesium
diff --git a/src/package.json b/src/package.json
index 4da52de..bc28c52 100644
--- a/src/package.json
+++ b/src/package.json
@@ -15,11 +15,11 @@
},
"dependencies": {
"bs58": "^4.0.1",
- "cli-color": "^2.0.0",
- "js-yaml": "^3.13.1",
+ "cli-color": "^2.0.3",
+ "js-yaml": "^3.14.1",
"co": "^4.6.0",
"request": "^2.88.2",
- "request-promise": "^4.2.5",
+ "request-promise": "^4.2.6",
"stringstream": "^0.0.6"
}
}
--
GitLab