Bump v2.1.0-unsupported-20180809

atom/browser/resources/mac/Info.plist

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

atom/browser/resources/win/atom.rc

@@ -56,8 +56,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,0,6,0
- PRODUCTVERSION 2,0,6,0
+ FILEVERSION 2,1,0-unsupported-20180809,0
+ PRODUCTVERSION 2,1,0-unsupported-20180809,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -74,12 +74,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "GitHub, Inc."
             VALUE "FileDescription", "Electron"
-            VALUE "FileVersion", "2.0.6"
+            VALUE "FileVersion", "2.1.0-unsupported-20180809"
             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.6"
+            VALUE "ProductVersion", "2.1.0-unsupported-20180809"
             VALUE "SquirrelAwareVersion", "1"
         END
     END

atom/common/atom_version.h

@@ -6,8 +6,8 @@
 #define ATOM_COMMON_ATOM_VERSION_H_
 
 #define ATOM_MAJOR_VERSION 2
-#define ATOM_MINOR_VERSION 0
-#define ATOM_PATCH_VERSION 6
+#define ATOM_MINOR_VERSION 1
+#define ATOM_PATCH_VERSION 0-unsupported-20180809
 // #define ATOM_PRE_RELEASE_VERSION
 
 #ifndef ATOM_STRINGIFY

electron.gyp

@@ -4,7 +4,7 @@
     'product_name%': 'Electron',
     'company_name%': 'GitHub, Inc',
     'company_abbr%': 'github',
-    'version%': '2.0.6',
+    'version%': '2.1.0-unsupported-20180809',
     'js2c_input_dir': '<(SHARED_INTERMEDIATE_DIR)/js2c',
   },
   'includes': [

package.json

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

script/prepare-release.js

@@ -21,8 +21,8 @@ const versionType = args._[0]
 
 assert(process.env.ELECTRON_GITHUB_TOKEN, 'ELECTRON_GITHUB_TOKEN not found in environment')
 if (!versionType && !args.notesOnly) {
-  console.log(`Usage: prepare-release versionType [major | minor | patch | beta]` +
-     ` (--stable) (--notesOnly) (--automaticRelease) (--branch)`)
+  console.log(`Usage: prepare-release versionType [major | minor | patch | beta | specificVersion]` +
+     ` (--stable) (--notesOnly) (--automaticRelease) (--branch) (--version)`)
   process.exit(1)
 }
 
@@ -33,7 +33,12 @@ github.authenticate({type: 'token', token: process.env.ELECTRON_GITHUB_TOKEN})
 function getNewVersion (dryRun) {
   console.log(`Bumping for new "${versionType}" version.`)
   let bumpScript = path.join(__dirname, 'bump-version.py')
-  let scriptArgs = [bumpScript, `--bump ${versionType}`]
+  let scriptArgs = [bumpScript]
+  if (versionType === 'specificVersion' && args.version) {
+    scriptArgs.push(`--version ${args.version}`)
+  } else {
+    scriptArgs.push(`--bump ${versionType}`)
+  }
   if (args.stable) {
     scriptArgs.push('--stable')
   }

script/publish-to-npm.js

@@ -1,3 +1,4 @@
+const args = require('minimist')(process.argv.slice(2))
 const temp = require('temp')
 const fs = require('fs')
 const path = require('path')
@@ -104,7 +105,11 @@ new Promise((resolve, reject) => {
   })
 })
 .then((release) => {
-  npmTag = release.prerelease ? 'beta' : 'latest'
+  if (args.tag) {
+    npmTag = args.tag
+  } else {
+    npmTag = release.prerelease ? 'beta' : 'latest'
+  }
 })
 .then(() => childProcess.execSync('npm pack', { cwd: tempDir }))
 .then(() => {