Bump v2.0.0-beta.2

Fix crash when setting dock menu (2.0.x)

atom/browser/api/atom_api_session.cc

@@ -441,14 +441,15 @@ void DownloadIdCallback(content::DownloadManager* download_manager,
 }
 
 void SetDevToolsNetworkEmulationClientIdInIO(
-    brightray::URLRequestContextGetter* context_getter,
+    brightray::URLRequestContextGetter* url_request_context_getter,
     const std::string& client_id) {
-  if (!context_getter)
+  if (!url_request_context_getter)
     return;
-  auto network_delegate =
+  net::URLRequestContext* context =
-      static_cast<AtomNetworkDelegate*>(context_getter->network_delegate());
+      url_request_context_getter->GetURLRequestContext();
-  if (network_delegate)
+  AtomNetworkDelegate* network_delegate =
-    network_delegate->SetDevToolsNetworkEmulationClientId(client_id);
+      static_cast<AtomNetworkDelegate*>(context->network_delegate());
+  network_delegate->SetDevToolsNetworkEmulationClientId(client_id);
 }
 
 }  // namespace

atom/browser/api/atom_api_web_request.cc

@@ -37,6 +37,26 @@ namespace atom {
 
 namespace api {
 
+namespace {
+
+template<typename Method, typename Event, typename Listener>
+void CallNetworkDelegateMethod(
+    brightray::URLRequestContextGetter* url_request_context_getter,
+    Method method,
+    Event type,
+    URLPatterns patterns,
+    Listener listener) {
+  // Force creating network delegate.
+  net::URLRequestContext* context =
+      url_request_context_getter->GetURLRequestContext();
+  // Then call the method.
+  AtomNetworkDelegate* network_delegate =
+      static_cast<AtomNetworkDelegate*>(context->network_delegate());
+  (network_delegate->*method)(type, std::move(patterns), std::move(listener));
+}
+
+}  // namespace
+
 WebRequest::WebRequest(v8::Isolate* isolate,
                        AtomBrowserContext* browser_context)
     : browser_context_(browser_context) {
@@ -74,16 +94,15 @@ void WebRequest::SetListener(Method method, Event type, mate::Arguments* args) {
     return;
   }
 
-  auto url_request_context_getter =
+  brightray::URLRequestContextGetter* url_request_context_getter =
       browser_context_->url_request_context_getter();
   if (!url_request_context_getter)
     return;
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
-      base::Bind(method,
+      base::Bind(&CallNetworkDelegateMethod<Method, Event, Listener>,
-                 base::Unretained(static_cast<AtomNetworkDelegate*>(
+                 base::RetainedRef(url_request_context_getter),
-                     url_request_context_getter->network_delegate())),
+                 method, type, std::move(patterns), std::move(listener)));
-                 type, patterns, listener));
 }
 
 // static

atom/browser/net/atom_network_delegate.cc

@@ -227,22 +227,22 @@ AtomNetworkDelegate::~AtomNetworkDelegate() {
 
 void AtomNetworkDelegate::SetSimpleListenerInIO(
     SimpleEvent type,
-    const URLPatterns& patterns,
+    URLPatterns patterns,
-    const SimpleListener& callback) {
+    SimpleListener callback) {
   if (callback.is_null())
     simple_listeners_.erase(type);
   else
-    simple_listeners_[type] = { patterns, callback };
+    simple_listeners_[type] = { std::move(patterns), std::move(callback) };
 }
 
 void AtomNetworkDelegate::SetResponseListenerInIO(
     ResponseEvent type,
-    const URLPatterns& patterns,
+    URLPatterns patterns,
-    const ResponseListener& callback) {
+    ResponseListener callback) {
   if (callback.is_null())
     response_listeners_.erase(type);
   else
-    response_listeners_[type] = { patterns, callback };
+    response_listeners_[type] = { std::move(patterns), std::move(callback) };
 }
 
 void AtomNetworkDelegate::SetDevToolsNetworkEmulationClientId(

atom/browser/net/atom_network_delegate.h

@@ -62,11 +62,11 @@ class AtomNetworkDelegate : public brightray::NetworkDelegate {
   ~AtomNetworkDelegate() override;
 
   void SetSimpleListenerInIO(SimpleEvent type,
-                             const URLPatterns& patterns,
+                             URLPatterns patterns,
-                             const SimpleListener& callback);
+                             SimpleListener callback);
   void SetResponseListenerInIO(ResponseEvent type,
-                               const URLPatterns& patterns,
+                               URLPatterns patterns,
-                               const ResponseListener& callback);
+                               ResponseListener callback);
 
   void SetDevToolsNetworkEmulationClientId(const std::string& client_id);
 

atom/browser/resources/mac/Info.plist

@@ -17,9 +17,9 @@
   <key>CFBundleIconFile</key>
   <string>electron.icns</string>
   <key>CFBundleVersion</key>
-  <string>1.8.2</string>
+  <string>2.0.0</string>
   <key>CFBundleShortVersionString</key>
-  <string>1.8.2</string>
+  <string>2.0.0</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 1,8,2,2
+ FILEVERSION 2,0,0,2
- PRODUCTVERSION 1,8,2,2
+ PRODUCTVERSION 2,0,0,2
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -74,12 +74,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "GitHub, Inc."
             VALUE "FileDescription", "Electron"
-            VALUE "FileVersion", "1.8.2"
+            VALUE "FileVersion", "2.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", "1.8.2"
+            VALUE "ProductVersion", "2.0.0"
             VALUE "SquirrelAwareVersion", "1"
         END
     END

atom/common/atom_version.h

@@ -5,9 +5,9 @@
 #ifndef ATOM_COMMON_ATOM_VERSION_H_
 #define ATOM_COMMON_ATOM_VERSION_H_
 
-#define ATOM_MAJOR_VERSION 1
+#define ATOM_MAJOR_VERSION 2
-#define ATOM_MINOR_VERSION 8
+#define ATOM_MINOR_VERSION 0
-#define ATOM_PATCH_VERSION 2
+#define ATOM_PATCH_VERSION 0
 #define ATOM_PRE_RELEASE_VERSION -beta.2
 
 #ifndef ATOM_STRINGIFY

brightray/browser/url_request_context_getter.h

@@ -80,11 +80,6 @@ class URLRequestContextGetter : public net::URLRequestContextGetter {
 
   net::HostResolver* host_resolver();
   net::URLRequestJobFactory* job_factory() const { return job_factory_; }
-  net::NetworkDelegate* network_delegate() const {
-    if (url_request_context_)
-      return url_request_context_->network_delegate();
-    return nullptr;
-  }
 
  private:
   Delegate* delegate_;

electron.gyp

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

lib/browser/api/app.js

@@ -10,6 +10,8 @@ const electron = require('electron')
 const {deprecate, Menu} = electron
 const {EventEmitter} = require('events')
 
+let dockMenu = null
+
 // App is an EventEmitter.
 Object.setPrototypeOf(App.prototype, EventEmitter.prototype)
 EventEmitter.call(app)
@@ -49,7 +51,13 @@ if (process.platform === 'darwin') {
     hide: bindings.dockHide,
     show: bindings.dockShow,
     isVisible: bindings.dockIsVisible,
-    setMenu: bindings.dockSetMenu,
+    setMenu (menu) {
+      dockMenu = menu
+      bindings.dockSetMenu(menu)
+    },
+    getMenu () {
+      return dockMenu
+    },
     setIcon: bindings.dockSetIcon
   }
 }

package.json

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

script/ci-release-build.js

@@ -12,8 +12,7 @@ const circleCIJobs = [
 ]
 
 const jenkinsJobs = [
-  'electron-mas-x64-release',
+  'electron-release'
-  'electron-osx-x64-release'
 ]
 
 async function makeRequest (requestOptions, parseResponse) {

script/release.js

@@ -6,7 +6,6 @@ const assert = require('assert')
 const fs = require('fs')
 const { execSync } = require('child_process')
 const GitHub = require('github')
-const { GitProcess } = require('dugite')
 const nugget = require('nugget')
 const pkg = require('../package.json')
 const pkgVersion = `v${pkg.version}`
@@ -24,7 +23,6 @@ const github = new GitHub({
   followRedirects: false
 })
 github.authenticate({type: 'token', token: process.env.ELECTRON_GITHUB_TOKEN})
-const gitDir = path.resolve(__dirname, '..')
 
 async function getDraftRelease (version, skipValidation) {
   let releaseInfo = await github.repos.getReleases({owner: 'electron', repo: 'electron'})
@@ -62,16 +60,18 @@ async function validateReleaseAssets (release, validatingRelease) {
   })
   check((failureCount === 0), `All required GitHub assets exist for release`, true)
 
-  if (release.draft) {
+  if (!validatingRelease || !release.draft) {
-    await verifyAssets(release)
+    if (release.draft) {
-  } else {
+      await verifyAssets(release)
-    await verifyShasums(downloadUrls)
+    } else {
-      .catch(err => {
+      await verifyShasums(downloadUrls)
-        console.log(`${fail} error verifyingShasums`, err)
+        .catch(err => {
-      })
+          console.log(`${fail} error verifyingShasums`, err)
+        })
+    }
+    const s3Urls = s3UrlsForVersion(release.tag_name)
+    await verifyShasums(s3Urls, true)
   }
-  const s3Urls = s3UrlsForVersion(release.tag_name)
-  await verifyShasums(s3Urls, true)
 }
 
 function check (condition, statement, exitIfFail = false) {
@@ -276,7 +276,6 @@ async function makeRelease (releaseToValidate) {
     draftRelease = await getDraftRelease(pkgVersion, true)
     await validateReleaseAssets(draftRelease)
     await publishRelease(draftRelease)
-    await cleanupReleaseBranch()
     console.log(`${pass} SUCCESS!!! Release has been published. Please run ` +
       `"npm run publish-to-npm" to publish release to npm.`)
   }
@@ -444,25 +443,4 @@ async function validateChecksums (validationArgs) {
     `shasums defined in ${validationArgs.shaSumFile}.`)
 }
 
-async function cleanupReleaseBranch () {
-  console.log(`Cleaning up release branch.`)
-  let errorMessage = `Could not delete local release branch.`
-  let successMessage = `Successfully deleted local release branch.`
-  await callGit(['branch', '-D', 'release'], errorMessage, successMessage)
-  errorMessage = `Could not delete remote release branch.`
-  successMessage = `Successfully deleted remote release branch.`
-  return callGit(['push', 'origin', ':release'], errorMessage, successMessage)
-}
-
-async function callGit (args, errorMessage, successMessage) {
-  let gitResult = await GitProcess.exec(args, gitDir)
-  if (gitResult.exitCode === 0) {
-    console.log(`${pass} ${successMessage}`)
-    return true
-  } else {
-    console.log(`${fail} ${errorMessage} ${gitResult.stderr}`)
-    process.exit(1)
-  }
-}
-
 makeRelease(args.validateRelease)

spec/api-app-spec.js

@@ -7,7 +7,7 @@ const path = require('path')
 const {ipcRenderer, remote} = require('electron')
 const {closeWindow} = require('./window-helpers')
 
-const {app, BrowserWindow, ipcMain} = remote
+const {app, BrowserWindow, Menu, ipcMain} = remote
 
 const isCI = remote.getGlobal('isCi')
 
@@ -881,4 +881,18 @@ describe('app module', () => {
       }, /before app is ready/)
     })
   })
+
+  describe('dock.setMenu', () => {
+    before(function () {
+      if (process.platform !== 'darwin') {
+        this.skip()
+      }
+    })
+
+    it('keeps references to the menu', () => {
+      app.dock.setMenu(new Menu())
+      const v8Util = process.atomBinding('v8_util')
+      v8Util.requestGarbageCollectionForTesting()
+    })
+  })
 })

tools/dump-version-info.js

@@ -16,7 +16,7 @@ function getDate () {
 
 function getInfoForCurrentVersion () {
   var json = {}
-  json.version = process.versions['atom-shell']
+  json.version = process.versions.electron
   json.date = getDate()
 
   var names = ['node', 'v8', 'uv', 'zlib', 'openssl', 'modules', 'chrome']