summaryrefslogtreecommitdiff
path: root/Source/Android
diff options
context:
space:
mode:
authorMatthew Parlane <parlane@gmail.com>2014-12-21 14:31:05 +1300
committerMatthew Parlane <parlane@gmail.com>2014-12-21 14:31:05 +1300
commitf4ab1443fa5c9d0eedb5edc4c33e7da2bea56835 (patch)
tree7acb751339fe2c99ed14c53825a61a76e6bc756a /Source/Android
parentf2a07e43d145fd1f9e458754885edc676c2ca53f (diff)
parentb47cf7e70e50fd7bf622fd30743e7702fc743540 (diff)
Merge pull request #1725 from Sonicadvance1/update_gradle
Updates the gradle build file to the latest needed for Android Studio.
Diffstat (limited to 'Source/Android')
-rw-r--r--Source/Android/build.gradle7
1 files changed, 4 insertions, 3 deletions
diff --git a/Source/Android/build.gradle b/Source/Android/build.gradle
index d6a57836ea..449862aaf8 100644
--- a/Source/Android/build.gradle
+++ b/Source/Android/build.gradle
@@ -3,7 +3,7 @@ buildscript {
mavenCentral()
}
dependencies {
- classpath 'com.android.tools.build:gradle:0.12.+'
+ classpath 'com.android.tools.build:gradle:1.0.0+'
}
}
apply plugin: 'android'
@@ -25,7 +25,7 @@ android {
into 'lib/'
}
- tasks.withType(Compile) {
+ tasks.withType(JavaCompile) {
compileTask -> compileTask.dependsOn(nativeLibsToJar)
}
@@ -79,8 +79,9 @@ android {
// Signed by debug key disallowing distribution on Play Store.
// Attaches 'debug' suffix to version and package name, allowing installation alongside the release build.
debug {
- packageNameSuffix '.debug'
+ applicationIdSuffix ".debug"
versionNameSuffix '-debug'
+ jniDebuggable true
}
}
}