From 5d4a7dd5702d9973bb837f31d1b75d347e552a19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Hern=C3=A1ndez?= Date: Tue, 9 Aug 2016 12:48:00 +0200 Subject: [PATCH 1/2] GPII-1898: Update to node 6 --- package.json | 2 +- provisioning/chocolatey-packages.bat | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index dc9aa78ca..3a8ea2b02 100644 --- a/package.json +++ b/package.json @@ -22,5 +22,5 @@ "keywords": ["gpii", "accessibility", "settings", "fluid", "IoC", "Inversion of Control", "configuration", "evented"], "repository": "git://github.com/GPII/windows.git", "main": "./gpii.js", - "engines": { "node" : ">=4.2.1" } + "engines": { "node" : ">=6.3.1" } } diff --git a/provisioning/chocolatey-packages.bat b/provisioning/chocolatey-packages.bat index 37ba787b1..c24aacf5e 100755 --- a/provisioning/chocolatey-packages.bat +++ b/provisioning/chocolatey-packages.bat @@ -1,4 +1,4 @@ -choco install nodejs.install -version 4.4.3 --forcex86 -y +choco install nodejs.install -version 6.3.1 --forcex86 -y choco install python2 -y choco install innosetup -y setx /M PATH "%PATH%;C:\Program Files (x86)\nodejs;C:\tools\python2;C:\Program Files (x86)\Inno Setup 5" From 6a1d8fdb0836c6ff3aa9b355fa83ae8938680558 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Hern=C3=A1ndez?= Date: Wed, 21 Sep 2016 14:15:20 +0200 Subject: [PATCH 2/2] GPII-1898: Update reference to universal and add nan as dependency This solves: * https://issues.gpii.net/browse/GPII-1929 * https://issues.fluidproject.org/browse/FLUID-5940 --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 1f3173310..d8854e6e5 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,8 @@ "ref": "1", "ref-struct": "1", "ref-array": "1.1.2", - "universal": "gpii/universal#98561d07c0b49d4d565be9027adebf36c1d1fe82" + "universal": "gpii/universal#d8539f7b537b5020da27c327da382cc8684abc38", + "nan": "amatas/nan#GPII-1929" }, "devDependencies": { "grunt": "1.0.1",