From 5fe130a684fadc650c02d91038c9642a5ab4e60b Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Thu, 11 Jun 2015 12:13:18 +0800 Subject: [PATCH 1/2] Bump v0.28.0 --- atom.gyp | 2 +- atom/browser/resources/mac/Info.plist | 2 +- atom/browser/resources/win/atom.rc | 8 ++++---- atom/common/atom_version.h | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/atom.gyp b/atom.gyp index 795ae97e9f0c..3af90f0337ce 100644 --- a/atom.gyp +++ b/atom.gyp @@ -4,7 +4,7 @@ 'product_name%': 'Electron', 'company_name%': 'GitHub, Inc', 'company_abbr%': 'github', - 'version%': '0.27.3', + 'version%': '0.28.0', 'atom_source_root': 'CFBundleIconFile atom.icns CFBundleVersion - 0.27.3 + 0.28.0 LSMinimumSystemVersion 10.8.0 NSMainNibFile diff --git a/atom/browser/resources/win/atom.rc b/atom/browser/resources/win/atom.rc index 13c6eca6b97c..9a01132b82dd 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 0,27,3,0 - PRODUCTVERSION 0,27,3,0 + FILEVERSION 0,28,0,0 + PRODUCTVERSION 0,28,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -68,12 +68,12 @@ BEGIN BEGIN VALUE "CompanyName", "GitHub, Inc." VALUE "FileDescription", "Electron" - VALUE "FileVersion", "0.27.3" + VALUE "FileVersion", "0.28.0" VALUE "InternalName", "electron.exe" VALUE "LegalCopyright", "Copyright (C) 2015 GitHub, Inc. All rights reserved." VALUE "OriginalFilename", "electron.exe" VALUE "ProductName", "Electron" - VALUE "ProductVersion", "0.27.3" + VALUE "ProductVersion", "0.28.0" VALUE "SquirrelAwareVersion", "1" END END diff --git a/atom/common/atom_version.h b/atom/common/atom_version.h index a108d84985d8..3377653c3b7b 100644 --- a/atom/common/atom_version.h +++ b/atom/common/atom_version.h @@ -6,8 +6,8 @@ #define ATOM_VERSION_H #define ATOM_MAJOR_VERSION 0 -#define ATOM_MINOR_VERSION 27 -#define ATOM_PATCH_VERSION 3 +#define ATOM_MINOR_VERSION 28 +#define ATOM_PATCH_VERSION 0 #define ATOM_VERSION_IS_RELEASE 1 From 18fcd6990b204dca7b43b54c2fbb9556a7132954 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Thu, 11 Jun 2015 14:14:22 +0800 Subject: [PATCH 2/2] win: Fix running spec --- spec/webview-spec.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/webview-spec.coffee b/spec/webview-spec.coffee index 2b67fb5b0de3..a1a1724380cc 100644 --- a/spec/webview-spec.coffee +++ b/spec/webview-spec.coffee @@ -54,7 +54,7 @@ describe ' tag', -> assert.equal e.message, 'function' done() webview.addEventListener 'console-message', listener2 - webview.src = "file://#{fixtures}/pages/native-module.html" + webview.reload() webview.addEventListener 'did-finish-load', listener webview.setAttribute 'nodeintegration', 'on' webview.src = "file://#{fixtures}/pages/native-module.html"