mirror of
https://github.com/apache/cordova-android.git
synced 2025-02-26 12:03:28 +08:00
CB-12895 : updated .eslintrc file in spec dir and set jasmine true and removed root is true
This commit is contained in:
parent
ac4ac935f6
commit
55d7cf3865
13
bin/templates/cordova/lib/check_reqs.js
vendored
13
bin/templates/cordova/lib/check_reqs.js
vendored
@ -110,11 +110,11 @@ module.exports.get_gradle_wrapper = function () {
|
|||||||
}
|
}
|
||||||
} else if (module.exports.isWindows()) {
|
} else if (module.exports.isWindows()) {
|
||||||
|
|
||||||
var result = child_process.spawnSync(path.join(__dirname,'getASPath.bat'));
|
var result = child_process.spawnSync(path.join(__dirname, 'getASPath.bat'));
|
||||||
//console.log('result.stdout =' + result.stdout.toString());
|
// console.log('result.stdout =' + result.stdout.toString());
|
||||||
//console.log('result.stderr =' + result.stderr.toString());
|
// console.log('result.stderr =' + result.stderr.toString());
|
||||||
|
|
||||||
if(result.stderr.toString().length > 0) {
|
if (result.stderr.toString().length > 0) {
|
||||||
var androidPath = path.join(process.env['ProgramFiles'], 'Android') + '/';
|
var androidPath = path.join(process.env['ProgramFiles'], 'Android') + '/';
|
||||||
if (fs.existsSync(androidPath)) {
|
if (fs.existsSync(androidPath)) {
|
||||||
program_dir = fs.readdirSync(androidPath);
|
program_dir = fs.readdirSync(androidPath);
|
||||||
@ -125,12 +125,11 @@ module.exports.get_gradle_wrapper = function () {
|
|||||||
} else { ++i; }
|
} else { ++i; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
// console.log('got android studio path from registry');
|
// console.log('got android studio path from registry');
|
||||||
// remove the (os independent) new line char at the end of stdout
|
// remove the (os independent) new line char at the end of stdout
|
||||||
// add gradle to match the above.
|
// add gradle to match the above.
|
||||||
androidStudioPath = path.join(result.stdout.toString().split('\r\n')[0],'gradle');
|
androidStudioPath = path.join(result.stdout.toString().split('\r\n')[0], 'gradle');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
2
spec/.eslintrc.yml
Normal file
2
spec/.eslintrc.yml
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
env:
|
||||||
|
jasmine: true
|
@ -1,12 +0,0 @@
|
|||||||
env:
|
|
||||||
jasmine: true
|
|
||||||
root: true
|
|
||||||
extends: semistandard
|
|
||||||
rules:
|
|
||||||
indent:
|
|
||||||
- error
|
|
||||||
- 4
|
|
||||||
camelcase: off
|
|
||||||
padded-blocks: off
|
|
||||||
operator-linebreak: off
|
|
||||||
no-throw-literal: off
|
|
@ -1,12 +0,0 @@
|
|||||||
env:
|
|
||||||
jasmine: true
|
|
||||||
root: true
|
|
||||||
extends: semistandard
|
|
||||||
rules:
|
|
||||||
indent:
|
|
||||||
- error
|
|
||||||
- 4
|
|
||||||
camelcase: off
|
|
||||||
padded-blocks: off
|
|
||||||
operator-linebreak: off
|
|
||||||
no-throw-literal: off
|
|
Loading…
Reference in New Issue
Block a user