From 9b52098a8f68bb010dbe884e558d65fbf3684894 Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Sun, 6 Jan 2019 14:58:49 +0000 Subject: [PATCH] Build: centralise the place for all versions. --- app/build.gradle | 4 ++-- build.gradle | 13 +++++++++++-- cert4android | 2 +- ical4android | 2 +- vcard4android | 2 +- 5 files changed, 16 insertions(+), 7 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 464f7adb..f83df65d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -12,8 +12,8 @@ apply plugin: 'kotlin-android' apply plugin: 'kotlin-kapt' android { - compileSdkVersion 28 - buildToolsVersion '28.0.3' + compileSdkVersion rootProject.ext.compileSdkVersion + buildToolsVersion rootProject.ext.buildToolsVersion defaultConfig { applicationId "com.etesync.syncadapter" diff --git a/build.gradle b/build.gradle index 03e5d50b..8246804a 100644 --- a/build.gradle +++ b/build.gradle @@ -6,16 +6,24 @@ * http://www.gnu.org/licenses/gpl.html */ +ext { + kotlin_version = '1.2.71' + gradle_version = '3.2.1' + compileSdkVersion = 28 + buildToolsVersion = '28.0.3' +} + // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.3.11' + ext.kotlin_version = '1.2.71' + ext.gradle_version = '3.2.1' repositories { jcenter() google() } dependencies { - classpath 'com.android.tools.build:gradle:3.2.1' + classpath "com.android.tools.build:gradle:$gradle_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -30,4 +38,5 @@ allprojects { } } + apply plugin: 'android-reporting' diff --git a/cert4android b/cert4android index b84178da..594fcba6 160000 --- a/cert4android +++ b/cert4android @@ -1 +1 @@ -Subproject commit b84178da93eefc40aa09e360bc39da60ae371820 +Subproject commit 594fcba6289bc7812c1dccc3a84c7e677f29dd7a diff --git a/ical4android b/ical4android index 2437b0b7..485ad1bf 160000 --- a/ical4android +++ b/ical4android @@ -1 +1 @@ -Subproject commit 2437b0b7aedf4fa1907a88c72781cff4c8291e40 +Subproject commit 485ad1bfe8af3db40e8ddac056b56e4b505410de diff --git a/vcard4android b/vcard4android index 42d5cc3f..66e08cd3 160000 --- a/vcard4android +++ b/vcard4android @@ -1 +1 @@ -Subproject commit 42d5cc3f8b16c628fa13a5a3b0f211e6660fb084 +Subproject commit 66e08cd395dea798e833cf30f0c396ad6a87c9ea