Allow setting a different Gradle plugin version.
Turns out, the Gradle version (2.10) is NOT the same as the plugin version (2.1.0). These have to be treated separately.
This commit is contained in:
2
dependencies/extension-api/build.gradle
vendored
2
dependencies/extension-api/build.gradle
vendored
@@ -6,7 +6,7 @@ buildscript {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
classpath 'com.android.tools.build:gradle:2.1.0'
|
||||
classpath 'com.android.tools.build:gradle:::ANDROID_GRADLE_PLUGIN::'
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -313,6 +313,7 @@ class AndroidPlatform extends PlatformTarget {
|
||||
context.ANDROID_EXTENSIONS = project.config.getArrayString ("android.extension");
|
||||
context.ANDROID_PERMISSIONS = project.config.getArrayString ("android.permission", [ "android.permission.WAKE_LOCK", "android.permission.INTERNET", "android.permission.VIBRATE", "android.permission.ACCESS_NETWORK_STATE" ]);
|
||||
context.ANDROID_GRADLE_VERSION = project.config.getString ("android.gradle-version", "2.10");
|
||||
context.ANDROID_GRADLE_PLUGIN = project.config.getString ("android.gradle-plugin", "2.1.0");
|
||||
context.ANDROID_LIBRARY_PROJECTS = [];
|
||||
|
||||
var escaped = ~/([ #!=\\:])/g;
|
||||
|
||||
@@ -7,7 +7,7 @@ buildscript {
|
||||
}
|
||||
}
|
||||
dependencies {
|
||||
classpath 'com.android.tools.build:gradle:2.1.0'
|
||||
classpath 'com.android.tools.build:gradle:::ANDROID_GRADLE_PLUGIN::'
|
||||
|
||||
// NOTE: Do not place your application dependencies here; they belong
|
||||
// in the individual module build.gradle files
|
||||
@@ -39,7 +39,7 @@ configure(subprojects.findAll {!it.file('build.gradle').exists() && it.file('bui
|
||||
}
|
||||
|
||||
dependencies {
|
||||
classpath 'com.android.tools.build:gradle:2.1.0'
|
||||
classpath 'com.android.tools.build:gradle:::ANDROID_GRADLE_PLUGIN::'
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@ buildscript {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
classpath 'com.android.tools.build:gradle:2.1.0'
|
||||
classpath 'com.android.tools.build:gradle:::ANDROID_GRADLE_PLUGIN::'
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user