From 71157301cae8550e70b50952b416e17fcf5dce37 Mon Sep 17 00:00:00 2001 From: Igor <16898357+IgorVanian@users.noreply.github.com> Date: Thu, 26 Jan 2023 18:29:14 +0100 Subject: [PATCH 1/2] fix androidXVersion --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index ba37f5e..a6459d3 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -58,7 +58,7 @@ dependencies { implementation "com.android.support:support-annotations:$supportLibVersion" implementation "com.android.support:customtabs:$supportLibVersion" } else { - def defaultAndroidXVersion = "1.+" + def defaultAndroidXVersion = "1.5.+" if (androidXVersion == null) { androidXVersion = defaultAndroidXVersion } From 41491c17601840050c862d1e7bbf70fb218a700e Mon Sep 17 00:00:00 2001 From: Igor <16898357+IgorVanian@users.noreply.github.com> Date: Mon, 30 Jan 2023 10:23:34 +0100 Subject: [PATCH 2/2] separate browser and annotation ver --- android/build.gradle | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index a6459d3..73578b4 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -53,17 +53,22 @@ dependencies { implementation 'com.facebook.react:react-native:+' implementation 'org.greenrobot:eventbus:3.1.0' def supportLibVersion = safeExtGet('supportLibVersion', safeExtGet('supportVersion', null)) - def androidXVersion = safeExtGet('androidXVersion', null) - if (supportLibVersion && androidXVersion == null) { + def androidXAnnotationVersion = safeExtGet('androidXAnnotationVersion', null) + def androidXBrowserVersion = safeExtGet('androidXBrowserVersion', null) + if (supportLibVersion) { implementation "com.android.support:support-annotations:$supportLibVersion" implementation "com.android.support:customtabs:$supportLibVersion" } else { - def defaultAndroidXVersion = "1.5.+" - if (androidXVersion == null) { - androidXVersion = defaultAndroidXVersion + def defaultAndroidXAnnotationVersion = "1.5.+" + def defaultAndroidXBrowserVersion = "1.4.+" + if (androidXAnnotationVersion == null) { + androidXAnnotationVersion = defaultAndroidXAnnotationVersion } - def androidXAnnotation = safeExtGet('androidXAnnotation', androidXVersion) - def androidXBrowser = safeExtGet('androidXBrowser', androidXVersion) + if (androidXBrowserVersion == null) { + androidXBrowserVersion = defaultAndroidXBrowserVersion + } + def androidXAnnotation = safeExtGet('androidXAnnotation', androidXAnnotationVersion) + def androidXBrowser = safeExtGet('androidXBrowser', androidXBrowserVersion) implementation "androidx.annotation:annotation:$androidXAnnotation" implementation "androidx.browser:browser:$androidXBrowser" }