From 6d205423f58917f382c890f43c7a3b493cb8d24b Mon Sep 17 00:00:00 2001 From: Samuel Attard Date: Sat, 29 Sep 2018 21:50:10 +1000 Subject: [PATCH] Revert "Bump v4.0.0-nightly.20180929" This reverts commit dac076dfb1f2e5afe086f664cfac5e9d0b0932f0. --- VERSION | 2 +- atom/browser/resources/win/atom.rc | 4 ++-- atom/common/atom_version.h | 2 +- package-lock.json | 30 ++++++++---------------------- package.json | 2 +- 5 files changed, 13 insertions(+), 27 deletions(-) diff --git a/VERSION b/VERSION index 6af7ce31823e..4ec46208f731 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.0.0-nightly.20180929 \ No newline at end of file +4.0.0-nightly.20180823 \ No newline at end of file diff --git a/atom/browser/resources/win/atom.rc b/atom/browser/resources/win/atom.rc index 073ecae1ef9c..ef266591f0bf 100644 --- a/atom/browser/resources/win/atom.rc +++ b/atom/browser/resources/win/atom.rc @@ -56,8 +56,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 4,0,0,20180929 - PRODUCTVERSION 4,0,0,20180929 + FILEVERSION 4,0,0,20180905 + PRODUCTVERSION 4,0,0,20180905 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L diff --git a/atom/common/atom_version.h b/atom/common/atom_version.h index a46fb5a9df2f..5a1560cd1223 100644 --- a/atom/common/atom_version.h +++ b/atom/common/atom_version.h @@ -9,7 +9,7 @@ #define ATOM_MINOR_VERSION 0 #define ATOM_PATCH_VERSION 0 // clang-format off -#define ATOM_PRE_RELEASE_VERSION -nightly.20180929 +#define ATOM_PRE_RELEASE_VERSION -nightly.20180905 // clang-format on #ifndef ATOM_STRINGIFY diff --git a/package-lock.json b/package-lock.json index 928f11437d69..02d13feb8682 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "electron", - "version": "4.0.0-nightly.20180929", + "version": "4.0.0-nightly.20180905", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -4287,14 +4287,12 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, - "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -4309,20 +4307,17 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "core-util-is": { "version": "1.0.2", @@ -4439,8 +4434,7 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "ini": { "version": "1.3.5", @@ -4452,7 +4446,6 @@ "version": "1.0.0", "bundled": true, "dev": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -4467,7 +4460,6 @@ "version": "3.0.4", "bundled": true, "dev": true, - "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -4475,14 +4467,12 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "minipass": { "version": "2.2.4", "bundled": true, "dev": true, - "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -4501,7 +4491,6 @@ "version": "0.5.1", "bundled": true, "dev": true, - "optional": true, "requires": { "minimist": "0.0.8" } @@ -4582,8 +4571,7 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "object-assign": { "version": "4.1.1", @@ -4595,7 +4583,6 @@ "version": "1.4.0", "bundled": true, "dev": true, - "optional": true, "requires": { "wrappy": "1" } @@ -4717,7 +4704,6 @@ "version": "1.0.2", "bundled": true, "dev": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", diff --git a/package.json b/package.json index f65e44c8175f..2a4d52436188 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "electron", - "version": "4.0.0-nightly.20180929", + "version": "4.0.0-nightly.20180905", "repository": "https://github.com/electron/electron", "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS", "devDependencies": {