summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2015-03-12 20:37:40 +0100
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2015-03-12 20:37:40 +0100
commitc6d57d7f42f5a00b1d2bb0dc4c022464b8e3a069 (patch)
tree4dbf4cdf822a9f51e56e8bc1b4315398be9e7774
parentab8f314e13bf6e1ff239495109f15db643e13f52 (diff)
sdremote: LibreOffice Remote for Impress version 2.2.0sdremote-2.2.0
first version with android wear support Change-Id: I528c838221f94be985c593925d01df231f25c6e4
-rw-r--r--android/sdremote/build.gradle10
-rw-r--r--android/sdremote/mobile/build.gradle12
-rw-r--r--android/sdremote/wear/build.gradle12
3 files changed, 23 insertions, 11 deletions
diff --git a/android/sdremote/build.gradle b/android/sdremote/build.gradle
index e26cdee..4b8d1bc 100644
--- a/android/sdremote/build.gradle
+++ b/android/sdremote/build.gradle
@@ -8,6 +8,16 @@ buildscript {
}
}
+// defaults for the two modules to have a single place to update
+ext {
+ compileSdkVersion = 21
+ buildToolsVersion = "21.1.2"
+
+ applicationId = "org.libreoffice.impressremote"
+ versionCode = 14
+ versionName = "2.2.0"
+}
+
allprojects {
repositories {
jcenter()
diff --git a/android/sdremote/mobile/build.gradle b/android/sdremote/mobile/build.gradle
index a5bb458..5443f2f 100644
--- a/android/sdremote/mobile/build.gradle
+++ b/android/sdremote/mobile/build.gradle
@@ -1,15 +1,16 @@
apply plugin: 'com.android.application'
android {
- compileSdkVersion 21
- buildToolsVersion "21.1.2"
+ compileSdkVersion rootProject.ext.compileSdkVersion
+ buildToolsVersion rootProject.ext.buildToolsVersion
defaultConfig {
- applicationId "org.libreoffice.impressremote"
+ applicationId rootProject.ext.applicationId
+ versionCode rootProject.ext.versionCode
+ versionName rootProject.ext.versionName
+
minSdkVersion 9
targetSdkVersion 20
- versionCode 13
- versionName "2.1.3"
}
lintOptions {
@@ -21,4 +22,5 @@ dependencies {
compile 'com.android.support:support-v4:21.0.3'
compile 'com.android.support:appcompat-v7:20.0.0'
compile 'com.google.android.gms:play-services:6.5.87'
+ wearApp project(':wear')
}
diff --git a/android/sdremote/wear/build.gradle b/android/sdremote/wear/build.gradle
index 2bbaccc..20888bc 100644
--- a/android/sdremote/wear/build.gradle
+++ b/android/sdremote/wear/build.gradle
@@ -1,16 +1,16 @@
apply plugin: 'com.android.application'
-
android {
- compileSdkVersion 21
- buildToolsVersion "21.1.2"
+ compileSdkVersion rootProject.ext.compileSdkVersion
+ buildToolsVersion rootProject.ext.buildToolsVersion
defaultConfig {
- applicationId "org.libreoffice.impressremote"
+ applicationId rootProject.ext.applicationId
+ versionCode rootProject.ext.versionCode
+ versionName rootProject.ext.versionName
+
minSdkVersion 20
targetSdkVersion 21
- versionCode 1
- versionName "1.1"
}
}