summaryrefslogtreecommitdiff
path: root/android/test
diff options
context:
space:
mode:
authorDwayne Boone <dwayne@zeroc.com>2014-11-18 11:05:18 -0330
committerDwayne Boone <dwayne@zeroc.com>2014-11-18 11:05:18 -0330
commitce7f1063661a5ac128f1c2063d214bc2e5c2eafe (patch)
treef18374e607ff61994e16079b592e024706070c8c /android/test
parentSome README fixes (diff)
downloadice-ce7f1063661a5ac128f1c2063d214bc2e5c2eafe.tar.bz2
ice-ce7f1063661a5ac128f1c2063d214bc2e5c2eafe.tar.xz
ice-ce7f1063661a5ac128f1c2063d214bc2e5c2eafe.zip
Moved andoid sdk settings to gradle.properties
Diffstat (limited to 'android/test')
-rw-r--r--android/test/android/build.gradle8
1 files changed, 4 insertions, 4 deletions
diff --git a/android/test/android/build.gradle b/android/test/android/build.gradle
index 6d939cbac67..1b0c1e07968 100644
--- a/android/test/android/build.gradle
+++ b/android/test/android/build.gradle
@@ -12,13 +12,13 @@ apply from: "$rootProject.projectDir/../java/gradle/ice.gradle"
apply from: "$rootProject.projectDir/gradle/tests.gradle"
android {
- compileSdkVersion ice_compileSdkVersion
+ compileSdkVersion ice_compileSdkVersion.toInteger()
buildToolsVersion ice_buildToolsVersion
defaultConfig {
applicationId "com.zeroc.test"
- minSdkVersion ice_minSdkVersion
- targetSdkVersion ice_targetSdkVersion
+ minSdkVersion ice_minSdkVersion.toInteger()
+ targetSdkVersion ice_targetSdkVersion.toInteger()
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_6
targetCompatibility JavaVersion.VERSION_1_6
@@ -30,7 +30,7 @@ android {
runProguard false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard.cfg'
}
-
+
release {
runProguard false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard.cfg'