diff --git a/packages/one-dark-ui/lib/main.js b/packages/one-dark-ui/lib/main.js index 6640106168c..3b3850d9783 100644 --- a/packages/one-dark-ui/lib/main.js +++ b/packages/one-dark-ui/lib/main.js @@ -8,12 +8,6 @@ module.exports = { atom.config.observe(`${themeName}.tabCloseButton`, setTabCloseButton); atom.config.observe(`${themeName}.hideDockButtons`, setHideDockButtons); atom.config.observe(`${themeName}.stickyHeaders`, setStickyHeaders); - - // DEPRECATED: This can be removed at some point (added in Atom 1.17/1.18ish) - // It removes `layoutMode` - if (atom.config.get(`${themeName}.layoutMode`)) { - atom.config.unset(`${themeName}.layoutMode`); - } }, deactivate() { diff --git a/packages/one-light-ui/lib/main.js b/packages/one-light-ui/lib/main.js index f8a6a6d4943..68f545745cb 100644 --- a/packages/one-light-ui/lib/main.js +++ b/packages/one-light-ui/lib/main.js @@ -8,12 +8,6 @@ module.exports = { atom.config.observe(`${themeName}.tabCloseButton`, setTabCloseButton); atom.config.observe(`${themeName}.hideDockButtons`, setHideDockButtons); atom.config.observe(`${themeName}.stickyHeaders`, setStickyHeaders); - - // DEPRECATED: This can be removed at some point (added in Atom 1.17/1.18ish) - // It removes `layoutMode` - if (atom.config.get(`${themeName}.layoutMode`)) { - atom.config.unset(`${themeName}.layoutMode`); - } }, deactivate() { diff --git a/script/lib/verify-machine-requirements.js b/script/lib/verify-machine-requirements.js index ccc4a68411c..8b8420aac14 100644 --- a/script/lib/verify-machine-requirements.js +++ b/script/lib/verify-machine-requirements.js @@ -14,16 +14,12 @@ module.exports = function(ci) { function verifyNode() { const fullVersion = process.versions.node; const majorVersion = fullVersion.split('.')[0]; - if (majorVersion >= 6) { + const minorVersion = fullVersion.split('.')[1]; + if (majorVersion >= 11 || (majorVersion === '10' && minorVersion >= 12)) { console.log(`Node:\tv${fullVersion}`); - } else if (majorVersion >= 4) { - console.log(`Node:\tv${fullVersion}`); - console.warn( - '\tWarning: Building on Node below version 6 is deprecated. Please use Node 6.x+ to build Atom.' - ); } else { throw new Error( - `node v4+ is required to build Atom. node v${fullVersion} is installed.` + `node v10.12+ is required to build Atom. node v${fullVersion} is installed.` ); } } @@ -94,7 +90,7 @@ function verifyPython() { env: process.env, stdio: ['ignore', 'pipe', 'ignore'] }); - } catch {} + } catch (e) {} if (stdout) { if (stdout.indexOf('+') !== -1) diff --git a/src/grammar-registry.js b/src/grammar-registry.js index c5973e1aa3e..aa530b6a9c4 100644 --- a/src/grammar-registry.js +++ b/src/grammar-registry.js @@ -169,7 +169,7 @@ module.exports = class GrammarRegistry { } // Extended: Get the `languageId` that has been explicitly assigned to - // to the given buffer, if any. + // the given buffer, if any. // // Returns a {String} id of the language getAssignedLanguageId(buffer) { diff --git a/src/main-process/atom-application.js b/src/main-process/atom-application.js index c969e5f55da..cea5f070b5d 100644 --- a/src/main-process/atom-application.js +++ b/src/main-process/atom-application.js @@ -249,16 +249,6 @@ module.exports = class AtomApplication extends EventEmitter { global.atomApplication = this; - // DEPRECATED: This can be removed at some point (added in 1.13) - // It converts `useCustomTitleBar: true` to `titleBar: "custom"` - if ( - process.platform === 'darwin' && - this.config.get('core.useCustomTitleBar') - ) { - this.config.unset('core.useCustomTitleBar'); - this.config.set('core.titleBar', 'custom'); - } - this.applicationMenu = new ApplicationMenu( this.version, this.autoUpdateManager diff --git a/vendor/jasmine.js b/vendor/jasmine.js index 2cec4bf76eb..716fbeb7ed3 100644 --- a/vendor/jasmine.js +++ b/vendor/jasmine.js @@ -1190,16 +1190,6 @@ jasmine.Matchers = function(env, actual, spec, opt_isNot) { this.reportWasCalled_ = false; }; -// todo: @deprecated as of Jasmine 0.11, remove soon [xw] -jasmine.Matchers.pp = function(str) { - throw new Error("jasmine.Matchers.pp() is no longer supported, please use jasmine.pp() instead!"); -}; - -// todo: @deprecated Deprecated as of Jasmine 0.10. Rewrite your custom matchers to return true or false. [xw] -jasmine.Matchers.prototype.report = function(result, failing_message, details) { - throw new Error("As of jasmine 0.11, custom matchers must be implemented differently -- please see jasmine docs"); -}; - jasmine.Matchers.wrapInto_ = function(prototype, matchersClass) { for (var methodName in prototype) { if (methodName == 'report') continue;