From c80c3c18dc4ab7c68d3bbcd838bd93ec4f3f3b62 Mon Sep 17 00:00:00 2001 From: Shelley Vohr Date: Fri, 8 Feb 2019 13:26:18 -0800 Subject: [PATCH] Revert "Bump v6.0.0-nightly.20190207" This reverts commit c8282efb75b61cddfd5205bb9a4b65cd48f48c7a. --- ELECTRON_VERSION | 2 +- atom/browser/resources/mac/Info.plist | 4 ++-- atom/browser/resources/win/atom.rc | 4 ++-- atom/common/atom_version.h | 2 +- package-lock.json | 32 ++++++++------------------- package.json | 4 ++-- 6 files changed, 17 insertions(+), 31 deletions(-) diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION index d4e77b568b4f..bd9d0d2ed02e 100644 --- a/ELECTRON_VERSION +++ b/ELECTRON_VERSION @@ -1 +1 @@ -6.0.0-nightly.20190207 \ No newline at end of file +6.0.0-nightly.20190123 \ No newline at end of file diff --git a/atom/browser/resources/mac/Info.plist b/atom/browser/resources/mac/Info.plist index e4155868577f..85d947bbb20b 100644 --- a/atom/browser/resources/mac/Info.plist +++ b/atom/browser/resources/mac/Info.plist @@ -17,9 +17,9 @@ CFBundleIconFile electron.icns CFBundleVersion - 6.0.0-nightly.20190207 + 6.0.0-nightly.20190123 CFBundleShortVersionString - 6.0.0-nightly.20190207 + 6.0.0-nightly.20190123 LSApplicationCategoryType public.app-category.developer-tools LSMinimumSystemVersion diff --git a/atom/browser/resources/win/atom.rc b/atom/browser/resources/win/atom.rc index 34b5079e627f..862a67a19eee 100644 --- a/atom/browser/resources/win/atom.rc +++ b/atom/browser/resources/win/atom.rc @@ -50,8 +50,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 6,0,0,20190207 - PRODUCTVERSION 6,0,0,20190207 + FILEVERSION 6,0,0,20190123 + PRODUCTVERSION 6,0,0,20190123 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L diff --git a/atom/common/atom_version.h b/atom/common/atom_version.h index b500350932a4..0b2c28b7b713 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.20190207 +#define ATOM_PRE_RELEASE_VERSION -nightly.20190123 // clang-format on #ifndef ATOM_STRINGIFY diff --git a/package-lock.json b/package-lock.json index de9e3007b0fa..ecaefc129753 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "electron", - "version": "6.0.0-nightly.20190207", + "version": "6.0.0-nightly.20190123", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -4474,15 +4474,13 @@ "version": "1.0.0", "resolved": false, "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", - "dev": true, - "optional": true + "dev": true }, "brace-expansion": { "version": "1.1.11", "resolved": false, "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "dev": true, - "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -4499,22 +4497,19 @@ "version": "1.1.0", "resolved": false, "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", - "dev": true, - "optional": true + "dev": true }, "concat-map": { "version": "0.0.1", "resolved": false, "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", - "dev": true, - "optional": true + "dev": true }, "console-control-strings": { "version": "1.1.0", "resolved": false, "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", - "dev": true, - "optional": true + "dev": true }, "core-util-is": { "version": "1.0.2", @@ -4645,8 +4640,7 @@ "version": "2.0.3", "resolved": false, "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", - "dev": true, - "optional": true + "dev": true }, "ini": { "version": "1.3.5", @@ -4660,7 +4654,6 @@ "resolved": false, "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", "dev": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -4677,7 +4670,6 @@ "resolved": false, "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "dev": true, - "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -4686,15 +4678,13 @@ "version": "0.0.8", "resolved": false, "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", - "dev": true, - "optional": true + "dev": true }, "minipass": { "version": "2.2.4", "resolved": false, "integrity": "sha512-hzXIWWet/BzWhYs2b+u7dRHlruXhwdgvlTMDKC6Cb1U7ps6Ac6yQlR39xsbjWJE377YTCtKwIXIpJ5oP+j5y8g==", "dev": true, - "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -4715,7 +4705,6 @@ "resolved": false, "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", "dev": true, - "optional": true, "requires": { "minimist": "0.0.8" } @@ -4804,8 +4793,7 @@ "version": "1.0.1", "resolved": false, "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", - "dev": true, - "optional": true + "dev": true }, "object-assign": { "version": "4.1.1", @@ -4819,7 +4807,6 @@ "resolved": false, "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "dev": true, - "optional": true, "requires": { "wrappy": "1" } @@ -4958,7 +4945,6 @@ "resolved": false, "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "dev": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -13341,4 +13327,4 @@ "dev": true } } -} \ No newline at end of file +} diff --git a/package.json b/package.json index 7b3eedc9d1a8..8b3a0d1e3d56 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "electron", - "version": "6.0.0-nightly.20190207", + "version": "6.0.0-nightly.20190123", "repository": "https://github.com/electron/electron", "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS", "devDependencies": { @@ -102,4 +102,4 @@ "git add" ] } -} \ No newline at end of file +}