From 988aec3b47558639e37bff6407eafc47ef6d354c Mon Sep 17 00:00:00 2001 From: Rayron Victor Date: Tue, 24 Apr 2018 11:49:06 -0300 Subject: [PATCH 1/2] Using SDK Version variables from root project Instead of assuming the `compileSdkVersion`, `targetSdkVersion`, etc, read it from the root project. Default `compileSdkVersion` and `targetSdkVersion` to the latest versions. Android Target API Level 26 will be required in August 2018. https://android-developers.googleblog.com/2017/12/improving-app-security-and-performance.html And the React Native team is already working on this: https://github.com/facebook/react-native/pull/17741 https://github.com/facebook/react-native/issues/18095 --- android/build.gradle | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 1d0061e..42a2d30 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -5,19 +5,27 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:2.2.3' + classpath 'com.android.tools.build:gradle:3.1.2' } } apply plugin: 'com.android.library' +def _ext = rootProject.ext + +def _reactNativeVersion = _ext.has('reactNative') ? _ext.reactNative : '+' +def _compileSdkVersion = _ext.has('compileSdkVersion') ? _ext.compileSdkVersion : 27 +def _buildToolsVersion = _ext.has('buildToolsVersion') ? _ext.buildToolsVersion : '27.0.3' +def _minSdkVersion = _ext.has('minSdkVersion') ? _ext.minSdkVersion : 16 +def _targetSdkVersion = _ext.has('targetSdkVersion') ? _ext.targetSdkVersion : 27 + android { - compileSdkVersion 23 - buildToolsVersion "23.0.1" + compileSdkVersion _compileSdkVersion + buildToolsVersion _buildToolsVersion defaultConfig { - minSdkVersion 16 - targetSdkVersion 22 + minSdkVersion _minSdkVersion + targetSdkVersion _targetSdkVersion versionCode 1 versionName "1.0" externalNativeBuild { @@ -30,20 +38,20 @@ android { abiFilters = project(":app").android.defaultConfig.ndk.abiFilters } } - + externalNativeBuild { cmake { path "CMakeLists.txt" } } - + sourceSets { main { jniLibs.srcDirs 'libnode/bin/' } main.assets.srcDirs += '../install/resources/nodejs-modules' } - + lintOptions { abortOnError false } @@ -54,7 +62,8 @@ repositories { } dependencies { - compile 'com.facebook.react:react-native:+' + //noinspection GradleDynamicVersion + implementation "com.facebook.react:react-native:${_reactNativeVersion}" } task CopyNodeProjectAssetsFolder (type:Sync) { @@ -341,4 +350,4 @@ if ("1".equals(shouldRebuildNativeModules)) { tasks.getByPath(":${project.name}:preBuild").dependsOn "GenerateNodeNativeAssetsLists${abi_name}" } project.android.sourceSets.main.assets.srcDirs+="${rootProject.buildDir}/nodejs-native-assets/" -} \ No newline at end of file +} From 9ba6712545c26cf4279a666daebad5b976f3cdc1 Mon Sep 17 00:00:00 2001 From: Rayron Victor Date: Tue, 24 Apr 2018 16:02:00 -0300 Subject: [PATCH 2/2] revert gradle plugin to 2.2.3 --- android/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 42a2d30..853af7e 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.1.2' + classpath 'com.android.tools.build:gradle:2.2.3' } } @@ -63,7 +63,7 @@ repositories { dependencies { //noinspection GradleDynamicVersion - implementation "com.facebook.react:react-native:${_reactNativeVersion}" + compile "com.facebook.react:react-native:${_reactNativeVersion}" } task CopyNodeProjectAssetsFolder (type:Sync) {