From 1a53b6eb403ada2a4214a3d91108594ffa6d8b72 Mon Sep 17 00:00:00 2001 From: Marcin Omelan Date: Fri, 22 Jun 2018 10:34:11 +0200 Subject: [PATCH 1/3] android lib: update to build.gradle --- lib/android/build.gradle | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/lib/android/build.gradle b/lib/android/build.gradle index 32bf86b..4e62f52 100644 --- a/lib/android/build.gradle +++ b/lib/android/build.gradle @@ -1,24 +1,23 @@ apply plugin: 'com.android.library' +def DEFAULT_COMPILE_SDK_VERSION = 27 +def DEFAULT_BUILD_TOOLS_VERSION = "27.0.3" +def DEFAULT_MIN_SDK_VERSION = 16 +def DEFAULT_TARGET_SDK_VERSION = 27 + android { - compileSdkVersion 23 - buildToolsVersion "25" + compileSdkVersion rootProject.hasProperty('compileSdkVersion') ? rootProject.compileSdkVersion : DEFAULT_COMPILE_SDK_VERSION + buildToolsVersion rootProject.hasProperty('buildToolsVersion') ? rootProject.compileSdkVersion : DEFAULT_BUILD_TOOLS_VERSION defaultConfig { - minSdkVersion 16 - targetSdkVersion 25 + minSdkVersion rootProject.hasProperty('minSdkVersion') ? rootProject.targetSdkVersion : DEFAULT_MIN_SDK_VERSION + targetSdkVersion rootProject.hasProperty('targetSdkVersion') ? rootProject.targetSdkVersion : DEFAULT_TARGET_SDK_VERSION versionCode 1 versionName "1.0" } - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - } - } } dependencies { - compile 'com.facebook.react:react-native:+' + implementation 'com.facebook.react:react-native:+' } From afb49ea771c5be83188a475c15a191b919d62e70 Mon Sep 17 00:00:00 2001 From: Marcin Omelan Date: Tue, 26 Jun 2018 09:33:24 +0200 Subject: [PATCH 2/3] typo targetSdkVersion -> minSdkVersion --- lib/android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/android/build.gradle b/lib/android/build.gradle index 4e62f52..f879218 100644 --- a/lib/android/build.gradle +++ b/lib/android/build.gradle @@ -10,7 +10,7 @@ android { buildToolsVersion rootProject.hasProperty('buildToolsVersion') ? rootProject.compileSdkVersion : DEFAULT_BUILD_TOOLS_VERSION defaultConfig { - minSdkVersion rootProject.hasProperty('minSdkVersion') ? rootProject.targetSdkVersion : DEFAULT_MIN_SDK_VERSION + minSdkVersion rootProject.hasProperty('minSdkVersion') ? rootProject.minSdkVersion : DEFAULT_MIN_SDK_VERSION targetSdkVersion rootProject.hasProperty('targetSdkVersion') ? rootProject.targetSdkVersion : DEFAULT_TARGET_SDK_VERSION versionCode 1 versionName "1.0" From e2b94053fc0f359dd7e4745ab943679c6b7ed186 Mon Sep 17 00:00:00 2001 From: Marcin Omelan Date: Tue, 26 Jun 2018 09:36:05 +0200 Subject: [PATCH 3/3] typo compileSdkVersion -> buildToolsVersion --- lib/android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/android/build.gradle b/lib/android/build.gradle index f879218..81a62b7 100644 --- a/lib/android/build.gradle +++ b/lib/android/build.gradle @@ -7,7 +7,7 @@ def DEFAULT_TARGET_SDK_VERSION = 27 android { compileSdkVersion rootProject.hasProperty('compileSdkVersion') ? rootProject.compileSdkVersion : DEFAULT_COMPILE_SDK_VERSION - buildToolsVersion rootProject.hasProperty('buildToolsVersion') ? rootProject.compileSdkVersion : DEFAULT_BUILD_TOOLS_VERSION + buildToolsVersion rootProject.hasProperty('buildToolsVersion') ? rootProject.buildToolsVersion : DEFAULT_BUILD_TOOLS_VERSION defaultConfig { minSdkVersion rootProject.hasProperty('minSdkVersion') ? rootProject.minSdkVersion : DEFAULT_MIN_SDK_VERSION