From fe2fa7492065600eaff3af042c2ab9ef479be6cf Mon Sep 17 00:00:00 2001 From: Andrew Matheny Date: Wed, 24 Oct 2018 11:12:12 -0400 Subject: [PATCH 1/2] Pull android tool versions from root project --- packages/core/android/build.gradle | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/packages/core/android/build.gradle b/packages/core/android/build.gradle index addef930e..a0741faed 100644 --- a/packages/core/android/build.gradle +++ b/packages/core/android/build.gradle @@ -12,13 +12,17 @@ buildscript { } } +def safeExtGet(prop, fallback) { + rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback +} + android { - compileSdkVersion 26 - buildToolsVersion = '26.0.3' + compileSdkVersion safeExtGet('compileSdkVersion', 26) + buildToolsVersion safeExtGet('buildToolsVersion', '26.0.3') defaultConfig { - minSdkVersion 16 - targetSdkVersion 26 + minSdkVersion safeExtGet('minSdkVersion', 16) + targetSdkVersion safeExtGet('targetSdkVersion', 26) versionCode 1 versionName '1.0' } From 496419559ed107be9a22f9db32755fefa28ef106 Mon Sep 17 00:00:00 2001 From: Andrew Matheny Date: Wed, 24 Oct 2018 13:16:33 -0400 Subject: [PATCH 2/2] Add fetching of root versions to integration template --- packages/integrations/template/android/build.gradle | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/packages/integrations/template/android/build.gradle b/packages/integrations/template/android/build.gradle index b2b3e0b4d..a7e0cb091 100644 --- a/packages/integrations/template/android/build.gradle +++ b/packages/integrations/template/android/build.gradle @@ -12,12 +12,16 @@ buildscript { } } +def safeExtGet(prop, fallback) { + rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback +} + android { - compileSdkVersion 26 + compileSdkVersion safeExtGet('compileSdkVersion', 26) defaultConfig { - minSdkVersion 16 - targetSdkVersion 26 + minSdkVersion safeExtGet('minSdkVersion', 16) + targetSdkVersion safeExtGet('targetSdkVersion', 26) versionCode 1 versionName '1.0'