From 0a26068805ad3eb0b6a6e1d95c2d2e86ed5620dc Mon Sep 17 00:00:00 2001 From: Diego Ivan Perez Michel Date: Sun, 18 Dec 2022 11:17:21 -0400 Subject: [PATCH 1/2] Safe get kotlinVersion --- android/build.gradle | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index fa6963f8..b6ea1b9e 100755 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,11 +1,15 @@ +def safeExtGet(prop, fallback) { + rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback +} + buildscript { ext { - kotlinVersion = '1.6.0' buildToolsVersion = '29.0.2' compileSdkVersion = 29 targetSdkVersion = 29 minSdkVersion = 18 } + ext.kotlinVersion = safeExtGet('kotlinVersion', '1.6.0') ext.detoxKotlinVersion = ext.kotlinVersion repositories { @@ -26,10 +30,6 @@ def DEFAULT_COMPILE_SDK_VERSION = 28 def DEFAULT_BUILD_TOOLS_VERSION = "28.0.3" def DEFAULT_TARGET_SDK_VERSION = 28 -def safeExtGet(prop, fallback) { - rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback -} - android { compileSdkVersion safeExtGet('compileSdkVersion', DEFAULT_COMPILE_SDK_VERSION) buildToolsVersion safeExtGet('buildToolsVersion', DEFAULT_BUILD_TOOLS_VERSION) From 76a1f52c94a96156378bddf41b423672e129b770 Mon Sep 17 00:00:00 2001 From: Diego Ivan Perez Michel Date: Sun, 18 Dec 2022 13:25:18 -0400 Subject: [PATCH 2/2] Move safeExtGet to ext --- android/build.gradle | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index b6ea1b9e..36e9df46 100755 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,8 +1,9 @@ -def safeExtGet(prop, fallback) { - rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback -} - buildscript { + // Simple helper that allows the root project to override versions declared by this library. + ext.safeExtGet = { prop, fallback -> + rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback + } + ext { buildToolsVersion = '29.0.2' compileSdkVersion = 29