Merge branch 'master' into 4.0.x (gradle properties)

Conflicts: bin/templates/cordova/lib/build.js
2026-05-11 00:00:05 +08:00 · 2015-01-08 15:43:22 -05:00
parent df4fbc272a c3610aa43c
commit 2083f683ad
6 changed files with 139 additions and 85 deletions
@@ -47,8 +47,8 @@ buildscript {
 apply plugin: 'android-library'

 android {
-    compileSdkVersion cordova.cordovaSdkVersion
-    buildToolsVersion cordova.cordovaBuildToolsVersion
+    compileSdkVersion cdvCompileSdkVersion
+    buildToolsVersion cdvBuildToolsVersion
    publishNonDefault true

    compileOptions {