diff options
| -rw-r--r-- | android/build.gradle | 6 | ||||
| -rw-r--r-- | android/demo/chat/build.gradle | 6 | ||||
| -rw-r--r-- | android/demo/hello/build.gradle | 6 | ||||
| -rw-r--r-- | android/demo/library/build.gradle | 6 | ||||
| -rw-r--r-- | android/gradle.properties | 6 | ||||
| -rw-r--r-- | android/test/android/build.gradle | 8 | ||||
| -rw-r--r-- | distribution/src/common/gradle.properties.android | 6 |
7 files changed, 25 insertions, 19 deletions
diff --git a/android/build.gradle b/android/build.gradle index e9457daf62e..a86c7212638 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -23,12 +23,6 @@ subprojects { apply plugin: 'idea' apply from: "$rootProject.projectDir/gradle/props.gradle" - // The Android versions used by subprojects. - ext.ice_compileSdkVersion = 17 - ext.ice_buildToolsVersion = "21.1.1" - ext.ice_minSdkVersion = 17 - ext.ice_targetSdkVersion = 17 - repositories { if (distJarDir != null) { flatDir { diff --git a/android/demo/chat/build.gradle b/android/demo/chat/build.gradle index 65bad85d1bd..31bc2839dfa 100644 --- a/android/demo/chat/build.gradle +++ b/android/demo/chat/build.gradle @@ -21,13 +21,13 @@ slice { } android { - compileSdkVersion ice_compileSdkVersion + compileSdkVersion ice_compileSdkVersion.toInteger() buildToolsVersion ice_buildToolsVersion defaultConfig { applicationId "com.zeroc.chat" - 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 diff --git a/android/demo/hello/build.gradle b/android/demo/hello/build.gradle index da4999cf133..4b8d9c06c4c 100644 --- a/android/demo/hello/build.gradle +++ b/android/demo/hello/build.gradle @@ -20,13 +20,13 @@ slice { } android { - compileSdkVersion ice_compileSdkVersion + compileSdkVersion ice_compileSdkVersion.toInteger() buildToolsVersion ice_buildToolsVersion defaultConfig { applicationId "com.zeroc.hello" - 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 diff --git a/android/demo/library/build.gradle b/android/demo/library/build.gradle index 038c55caf8a..fd9864f5caf 100644 --- a/android/demo/library/build.gradle +++ b/android/demo/library/build.gradle @@ -21,13 +21,13 @@ slice { } android { - compileSdkVersion ice_compileSdkVersion + compileSdkVersion ice_compileSdkVersion.toInteger() buildToolsVersion ice_buildToolsVersion defaultConfig { applicationId "com.zeroc.library" - 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 diff --git a/android/gradle.properties b/android/gradle.properties index e8f6ab32143..4d945bec4d5 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -9,6 +9,12 @@ iceVersion = 3.6b +// The Android versions used for the Ice build. +ice_buildToolsVersion = 21.1.1 +ice_compileSdkVersion = 17 +ice_minSdkVersion = 17 +ice_targetSdkVersion = 17 + // // Oracle Berkeley DB JAR location. Should only need to be set if Berkeley DB // is installed in a non-standard location. 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' diff --git a/distribution/src/common/gradle.properties.android b/distribution/src/common/gradle.properties.android index 7c575f3e7f7..0c75f5e5188 100644 --- a/distribution/src/common/gradle.properties.android +++ b/distribution/src/common/gradle.properties.android @@ -9,6 +9,12 @@ iceVersion = 3.6b +// The Android versions used for the Ice build. +ice_buildToolsVersion = "21.1.1" +ice_compileSdkVersion = 17 +ice_minSdkVersion = 17 +ice_targetSdkVersion = 17 + // // Set iceHome to location of Ice installation if Ice was installed in a // non-standard location. |