mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Bump v3.1.0-beta.1

Browse source
This commit is contained in:
Electron Bot 2018-11-29 19:38:53 -08:00
parent 957ac493e6
commit b23b72f9c3
5 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
atom/browser/resources/mac/Info.plist
View file

@ -17,9 +17,9 @@
<key>CFBundleIconFile</key> <key>CFBundleIconFile</key>
<string>electron.icns</string> <string>electron.icns</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>3.0.10</string> <string>3.1.0</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>3.0.10</string> <string>3.1.0</string>
<key>LSApplicationCategoryType</key> <key>LSApplicationCategoryType</key>
<string>public.app-category.developer-tools</string> <string>public.app-category.developer-tools</string>
<key>LSMinimumSystemVersion</key> <key>LSMinimumSystemVersion</key>

8
atom/browser/resources/win/atom.rc
View file

@ -56,8 +56,8 @@ END
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 3,0,10,0 FILEVERSION 3,1,0,1
PRODUCTVERSION 3,0,10,0 PRODUCTVERSION 3,1,0,1
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -74,12 +74,12 @@ BEGIN
BEGIN BEGIN
VALUE "CompanyName", "GitHub, Inc." VALUE "CompanyName", "GitHub, Inc."
VALUE "FileDescription", "Electron" VALUE "FileDescription", "Electron"
VALUE "FileVersion", "3.0.10" VALUE "FileVersion", "3.1.0"
VALUE "InternalName", "electron.exe" VALUE "InternalName", "electron.exe"
VALUE "LegalCopyright", "Copyright (C) 2015 GitHub, Inc. All rights reserved." VALUE "LegalCopyright", "Copyright (C) 2015 GitHub, Inc. All rights reserved."
VALUE "OriginalFilename", "electron.exe" VALUE "OriginalFilename", "electron.exe"
VALUE "ProductName", "Electron" VALUE "ProductName", "Electron"
VALUE "ProductVersion", "3.0.10" VALUE "ProductVersion", "3.1.0"
VALUE "SquirrelAwareVersion", "1" VALUE "SquirrelAwareVersion", "1"
END END
END END

6
atom/common/atom_version.h
View file

@ -6,9 +6,9 @@
#define ATOM_COMMON_ATOM_VERSION_H_ #define ATOM_COMMON_ATOM_VERSION_H_
#define ATOM_MAJOR_VERSION 3 #define ATOM_MAJOR_VERSION 3
#define ATOM_MINOR_VERSION 0 #define ATOM_MINOR_VERSION 1
#define ATOM_PATCH_VERSION 10 #define ATOM_PATCH_VERSION 0
// #define ATOM_PRE_RELEASE_VERSION #define ATOM_PRE_RELEASE_VERSION -beta.1
#ifndef ATOM_STRINGIFY #ifndef ATOM_STRINGIFY
#define ATOM_STRINGIFY(n) ATOM_STRINGIFY_HELPER(n) #define ATOM_STRINGIFY(n) ATOM_STRINGIFY_HELPER(n)

2
electron.gyp
View file

@ -4,7 +4,7 @@
'product_name%': 'Electron', 'product_name%': 'Electron',
'company_name%': 'GitHub, Inc', 'company_name%': 'GitHub, Inc',
'company_abbr%': 'github', 'company_abbr%': 'github',
'version%': '3.1.0-beta.0', 'version%': '3.1.0-beta.1',
'js2c_input_dir': '<(SHARED_INTERMEDIATE_DIR)/js2c', 'js2c_input_dir': '<(SHARED_INTERMEDIATE_DIR)/js2c',
}, },
'includes': [ 'includes': [

2
package.json
View file

@ -1,6 +1,6 @@
{ {
"name": "electron", "name": "electron",
"version": "3.1.0-beta.0", "version": "3.1.0-beta.1",
"repository": "https://github.com/electron/electron", "repository": "https://github.com/electron/electron",
"description": "Build cross platform desktop apps with JavaScript, HTML, and CSS", "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
"devDependencies": { "devDependencies": {