github/cordova-android
github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2025-02-22 00:32:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

CB-12546: sort detected targets by numerical suffix when reporting most recent version of android sdk target installed.

Browse Source
This commit is contained in:
filmaj 2017-03-15 11:30:04 -07:00
parent 3554267adf
commit 1d8e6f53a1
1 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
bin/templates/cordova/lib/android_sdk.js vendored
View File

@ -22,9 +22,33 @@
var Q = require('q'), var Q = require('q'),
superspawn = require('cordova-common').superspawn; superspawn = require('cordova-common').superspawn;
var suffix_number_regex = /(\d+)$/;
// Used for sorting Android targets, example strings to sort:
// android-19
// android-L
// Google Inc.:Google APIs:20
// Google Inc.:Glass Development Kit Preview:20
// The idea is to sort based on largest "suffix" number - meaning the bigger
// the number at the end, the more recent the target, the closer to the
// start of the array.
function sort_by_largest_numerical_suffix(a, b) {
var suffix_a = a.match(suffix_number_regex);
var suffix_b = b.match(suffix_number_regex);
if (suffix_a && suffix_b) {
// If the two targets being compared have suffixes, return less than
// zero, or greater than zero, based on which suffix is larger.
return (parseInt(suffix_a[1]) > parseInt(suffix_b[1]) ? -1 : 1);
} else {
// If no suffix numbers were detected, leave the order as-is between
// elements a and b.
return 0;
}
}
module.exports.print_newest_available_sdk_target = function() { module.exports.print_newest_available_sdk_target = function() {
return module.exports.list_targets() return module.exports.list_targets()
.then(function(targets) { .then(function(targets) {
targets.sort(sort_by_largest_numerical_suffix);
console.log(targets[0]); console.log(targets[0]);
}); });
}; };