Skip to content

[pull] master from atom:master #74

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 7 commits into from
Sep 20, 2021
Merged

[pull] master from atom:master #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5339e5d
bootstrap: Fix syntax error for Node older than 10
DeeDeeG Sep 14, 2021
17daccf
Remove duplicate `to`
Sep 18, 2021
f35e512
bootstrap: Update required Node to 10.12+
DeeDeeG Sep 14, 2021
925e59f
Merge pull request #23001 from DeeDeeG/raise-node-system-requirement
darangi Sep 20, 2021
dd4fae1
Merge pull request #22979 from DeeDeeG/update-system-requirements-che…
darangi Sep 20, 2021
0220902
Merge pull request #23000 from icecream17/patch-5
sadick254 Sep 20, 2021
234adb8
Remove deprecated code strings (#22952)
Sep 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions packages/one-dark-ui/lib/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
6 changes: 0 additions & 6 deletions packages/one-light-ui/lib/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
12 changes: 4 additions & 8 deletions script/lib/verify-machine-requirements.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.`
);
}
}
Expand Down Expand Up @@ -94,7 +90,7 @@ function verifyPython() {
env: process.env,
stdio: ['ignore', 'pipe', 'ignore']
});
} catch {}
} catch (e) {}

if (stdout) {
if (stdout.indexOf('+') !== -1)
Expand Down
2 changes: 1 addition & 1 deletion src/grammar-registry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
10 changes: 0 additions & 10 deletions src/main-process/atom-application.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 0 additions & 10 deletions vendor/jasmine.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down