kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #923 from player-03/develop

Browse Source 
Allow setting a different Gradle PLUGIN version.
This commit is contained in:
Joshua Granick
2017-02-13 10:12:50 -08:00
committed by GitHub
parent 4dc184f337 9bbb6205be
commit 3191ca2463
4 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dependencies/extension-api/build.gradle vendored
View File

@@ -6,7 +6,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:::ANDROID_GRADLE_VERSION::' classpath 'com.android.tools.build:gradle:::ANDROID_GRADLE_PLUGIN::'
} }
} }

1
lime/tools/platforms/AndroidPlatform.hx
View File

@@ -313,6 +313,7 @@ class AndroidPlatform extends PlatformTarget {
context.ANDROID_EXTENSIONS = project.config.getArrayString ("android.extension"); 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_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_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 = []; context.ANDROID_LIBRARY_PROJECTS = [];
var escaped = ~/([ #!=\\:])/g; var escaped = ~/([ #!=\\:])/g;

4
templates/android/template/build.gradle
View File

@@ -7,7 +7,7 @@ buildscript {
} }
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:::ANDROID_GRADLE_VERSION::' classpath 'com.android.tools.build:gradle:::ANDROID_GRADLE_PLUGIN::'
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files
@@ -39,7 +39,7 @@ configure(subprojects.findAll {!it.file('build.gradle').exists() && it.file('bui
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:::ANDROID_GRADLE_VERSION::' classpath 'com.android.tools.build:gradle:::ANDROID_GRADLE_PLUGIN::'
} }
} }

2
templates/extension/dependencies/android/build.gradle
View File

@@ -6,7 +6,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:::ANDROID_GRADLE_VERSION::' classpath 'com.android.tools.build:gradle:::ANDROID_GRADLE_PLUGIN::'
} }
} }