github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2026-05-30 00:00:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into StudioProjectCompat, fixing conflicts, need

Browse Source 
to re-add previous PR fix on the branch
This commit is contained in:
Joe Bowser
2017-10-18 11:04:44 -07:00
parent 8743e88550 93efe71080
commit 6cf6e20d2e
5 changed files with 74 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/templates/cordova/lib/emulator.js
Vendored
+3 -3
View File
@@ -207,11 +207,11 @@ module.exports.best_image = function () {
var closest = 9999;
var best = images[0];
var project_target = check_reqs.get_target().replace('android-', '');
var project_target = parseInt(check_reqs.get_target().replace('android-', ''));
for (var i in images) {
var target = images[i].target;
if (target) {
var num = target.split('(API level ')[1].replace(')', '');
if (target && target.indexOf('API level') > -1) {
var num = parseInt(target.split('(API level ')[1].replace(')', ''));
if (num === project_target) {
return images[i];
} else if (project_target - num < closest && project_target > num) {
bin/templates/project/build.gradle
+3 -3
View File
@@ -41,12 +41,12 @@ allprojects {
}
}
//This replaces project.properties
//This replaces project.properties w.r.t. build settings
project.ext {
defaultBuildToolsVersion="25.0.2" //String
defaultMinSdkVersion=19 //Integer - Minimum requirement is Android 4.4
defaultTargetSdkVersion=25 //Integer - We ALWAYS target the latest by default
defaultCompileSdkVersion=25 //Integer - We ALWAYS compile with the latest by default
defaultTargetSdkVersion=26 //Integer - We ALWAYS target the latest by default
defaultCompileSdkVersion=26 //Integer - We ALWAYS compile with the latest by default
}
}