diff --git a/atom/browser/resources/mac/Info.plist b/atom/browser/resources/mac/Info.plist index caee1dd20ff8..75c4894501c8 100644 --- a/atom/browser/resources/mac/Info.plist +++ b/atom/browser/resources/mac/Info.plist @@ -17,9 +17,9 @@ CFBundleIconFile electron.icns CFBundleVersion - 2.0.2 + 3.0.0 CFBundleShortVersionString - 2.0.2 + 3.0.0 LSApplicationCategoryType public.app-category.developer-tools LSMinimumSystemVersion diff --git a/atom/browser/resources/win/atom.rc b/atom/browser/resources/win/atom.rc index afa4cc747aa0..cdfbe820a7a8 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 2,0,2,0 - PRODUCTVERSION 2,0,2,0 + FILEVERSION 3,0,0,1 + PRODUCTVERSION 3,0,0,1 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -74,12 +74,12 @@ BEGIN BEGIN VALUE "CompanyName", "GitHub, Inc." VALUE "FileDescription", "Electron" - VALUE "FileVersion", "2.0.2" + VALUE "FileVersion", "3.0.0" VALUE "InternalName", "electron.exe" VALUE "LegalCopyright", "Copyright (C) 2015 GitHub, Inc. All rights reserved." VALUE "OriginalFilename", "electron.exe" VALUE "ProductName", "Electron" - VALUE "ProductVersion", "2.0.2" + VALUE "ProductVersion", "3.0.0" VALUE "SquirrelAwareVersion", "1" END END diff --git a/atom/common/atom_version.h b/atom/common/atom_version.h index 0090c528d601..bd8dd92b260d 100644 --- a/atom/common/atom_version.h +++ b/atom/common/atom_version.h @@ -5,10 +5,10 @@ #ifndef ATOM_COMMON_ATOM_VERSION_H_ #define ATOM_COMMON_ATOM_VERSION_H_ -#define ATOM_MAJOR_VERSION 2 +#define ATOM_MAJOR_VERSION 3 #define ATOM_MINOR_VERSION 0 -#define ATOM_PATCH_VERSION 2 -// #define ATOM_PRE_RELEASE_VERSION +#define ATOM_PATCH_VERSION 0 +#define ATOM_PRE_RELEASE_VERSION -beta.1 #ifndef ATOM_STRINGIFY #define ATOM_STRINGIFY(n) ATOM_STRINGIFY_HELPER(n) diff --git a/electron.gyp b/electron.gyp index 6518c4b15f4f..a7de38573578 100644 --- a/electron.gyp +++ b/electron.gyp @@ -4,7 +4,7 @@ 'product_name%': 'Electron', 'company_name%': 'GitHub, Inc', 'company_abbr%': 'github', - 'version%': '2.0.2', + 'version%': '3.0.0-beta.1', 'js2c_input_dir': '<(SHARED_INTERMEDIATE_DIR)/js2c', }, 'includes': [ diff --git a/package.json b/package.json index 4e4dfffde3ad..b31a832ac350 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "electron", - "version": "2.0.2", + "version": "3.0.0-beta.1", "repository": "https://github.com/electron/electron", "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS", "devDependencies": { diff --git a/script/bump-version.py b/script/bump-version.py index 28424aaa8ee6..fad05fff1a52 100755 --- a/script/bump-version.py +++ b/script/bump-version.py @@ -192,7 +192,7 @@ def update_package_json(version, suffix): def tag_version(version, suffix): - execute(['git', 'commit', '-a', '-m', 'Bump v{0}'.format(version + suffix)]) + execute(['git', 'commit', '-a', '--no-verify', '-m', 'Bump v{0}'.format(version + suffix)]) if __name__ == '__main__': diff --git a/script/prepare-release.js b/script/prepare-release.js index 8021fa331da3..de42f53380dd 100755 --- a/script/prepare-release.js +++ b/script/prepare-release.js @@ -75,7 +75,7 @@ async function getReleaseNotes (currentBranch) { let githubOpts = { owner: 'electron', repo: 'electron', - base: `v${pkg.version}`, + base: `2a97e48465a3af9e5448a8d06c1d65d16c516e8f`, head: currentBranch } let releaseNotes