From 9af1ae8ed5ee9a38bbaba6f629683f587a7f9654 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Raymond=20M=C3=A9d=C3=A9d=C3=A9=20KPATCHAA?= Date: Fri, 15 Feb 2019 06:56:15 +0100 Subject: [PATCH 1/3] Updated to work with newer versions of RN --- android/build.gradle | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 87cd461e..4c5ce20b 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,23 +1,30 @@ +def safeExtGet(prop, fallback) { + rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback +} buildscript { repositories { + maven { + url 'https://maven.google.com/' + name 'Google' + } jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.2' + classpath 'com.android.tools.build:gradle:3.2.1' } } apply plugin: 'com.android.library' android { - compileSdkVersion 27 - buildToolsVersion '28.0.2' + compileSdkVersion safeExtGet('compileSdkVersion', 27) + buildToolsVersion safeExtGet('buildToolsVersion', '27.0.2') defaultConfig { - minSdkVersion 16 - targetSdkVersion 26 + minSdkVersion safeExtGet('minSdkVersion', 16) + targetSdkVersion safeExtGet('targetSdkVersion', 26) versionCode 1 versionName "1.0" manifestPlaceholders = [ @@ -34,6 +41,6 @@ repositories { } dependencies { - implementation 'com.facebook.react:react-native:+' + implementation "com.facebook.react:react-native:${safeExtGet('reactNativeVersion', '+')}" implementation "net.openid:appauth:0.7.1" } From 1dfdb277484ca1e8381c7c1ce31282caf5c0285b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Raymond=20M=C3=A9d=C3=A9d=C3=A9=20KPATCHAA?= Date: Mon, 18 Feb 2019 17:38:12 +0100 Subject: [PATCH 2/3] Revert back to compile as it could break projects using RN < 0.57 --- android/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 4c5ce20b..2444017d 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -41,6 +41,6 @@ repositories { } dependencies { - implementation "com.facebook.react:react-native:${safeExtGet('reactNativeVersion', '+')}" - implementation "net.openid:appauth:0.7.1" + compile 'com.facebook.react:react-native:'+safeExtGet('reactNativeVersion', '+') + compile 'net.openid:appauth:0.7.1' } From f9a5273926d5e32b8a17a5377e97d4e33d0d0f77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Raymond=20M=C3=A9d=C3=A9d=C3=A9=20KPATCHAA?= Date: Mon, 18 Feb 2019 17:39:33 +0100 Subject: [PATCH 3/3] Fix buildToolsVersion --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index 2444017d..f0313d95 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -20,7 +20,7 @@ apply plugin: 'com.android.library' android { compileSdkVersion safeExtGet('compileSdkVersion', 27) - buildToolsVersion safeExtGet('buildToolsVersion', '27.0.2') + buildToolsVersion safeExtGet('buildToolsVersion', '28.0.2') defaultConfig { minSdkVersion safeExtGet('minSdkVersion', 16)