From a3931e95317acaff5ceb1d2fb0f26ae67744c8a3 Mon Sep 17 00:00:00 2001 From: Dulmandakh Date: Tue, 15 May 2018 09:22:31 -0700 Subject: [PATCH] android compileSdkVersion 26, use buildToolsVersion 26.0.3 Summary: Starting August 2018, Google Play will require targetSdkVersion 26 for new applications, and November 2018 for application updates. This PR will use Android build tools 26.0.3 and compilerSdk 26, then support library version 26.0.2 to make targeting 26 easier in the future. I think this PR will help to people compile and test their applications, thus make transition easier (smoother). Also we'll have opportunity and time to migrate code to target 26. https://github.com/facebook/react-native/issues/18095 React Native on android must work as usual Closes https://github.com/facebook/react-native/pull/19257 Differential Revision: D8010354 Pulled By: mdvacca fbshipit-source-id: 63ba03585e918b38c2a2adb5d2f2e85d7ce46fae --- RNTester/android/app/build.gradle | 6 +++--- ReactAndroid/build.gradle | 6 +++--- local-cli/templates/HelloWorld/android/app/build.gradle | 6 +++--- local-cli/templates/HelloWorld/android/build.gradle | 8 ++++++++ 4 files changed, 17 insertions(+), 9 deletions(-) diff --git a/RNTester/android/app/build.gradle b/RNTester/android/app/build.gradle index 5e5503b5eb..c1149e6a5e 100644 --- a/RNTester/android/app/build.gradle +++ b/RNTester/android/app/build.gradle @@ -84,8 +84,8 @@ def enableSeparateBuildPerCPUArchitecture = false def enableProguardInReleaseBuilds = false android { - compileSdkVersion 23 - buildToolsVersion "23.0.1" + compileSdkVersion 26 + buildToolsVersion "26.0.3" defaultConfig { applicationId "com.facebook.react.uiapp" @@ -137,7 +137,7 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:appcompat-v7:23.0.1' + compile 'com.android.support:appcompat-v7:26.0.2' // Build React Native from source compile project(':ReactAndroid') diff --git a/ReactAndroid/build.gradle b/ReactAndroid/build.gradle index 503b814f32..29fdcd6aae 100644 --- a/ReactAndroid/build.gradle +++ b/ReactAndroid/build.gradle @@ -242,8 +242,8 @@ task packageReactNdkLibsForBuck(dependsOn: packageReactNdkLibs, type: Copy) { } android { - compileSdkVersion 23 - buildToolsVersion "23.0.1" + compileSdkVersion 26 + buildToolsVersion "26.0.3" defaultConfig { minSdkVersion 16 @@ -292,7 +292,7 @@ android { dependencies { compile fileTree(dir: 'src/main/third-party/java/infer-annotations/', include: ['*.jar']) compile 'javax.inject:javax.inject:1' - compile 'com.android.support:appcompat-v7:23.0.1' + compile 'com.android.support:appcompat-v7:26.0.2' compile 'com.facebook.fbui.textlayoutbuilder:textlayoutbuilder:1.0.0' compile 'com.facebook.fresco:fresco:1.9.0' compile 'com.facebook.fresco:imagepipeline-okhttp3:1.9.0' diff --git a/local-cli/templates/HelloWorld/android/app/build.gradle b/local-cli/templates/HelloWorld/android/app/build.gradle index ec6f302257..f9f5ebc2bb 100644 --- a/local-cli/templates/HelloWorld/android/app/build.gradle +++ b/local-cli/templates/HelloWorld/android/app/build.gradle @@ -94,8 +94,8 @@ def enableSeparateBuildPerCPUArchitecture = false def enableProguardInReleaseBuilds = false android { - compileSdkVersion 23 - buildToolsVersion "23.0.1" + compileSdkVersion 26 + buildToolsVersion "26.0.3" defaultConfig { applicationId "com.helloworld" @@ -138,7 +138,7 @@ android { dependencies { compile fileTree(dir: "libs", include: ["*.jar"]) - compile "com.android.support:appcompat-v7:23.0.1" + compile "com.android.support:appcompat-v7:26.0.2" compile "com.facebook.react:react-native:+" // From node_modules } diff --git a/local-cli/templates/HelloWorld/android/build.gradle b/local-cli/templates/HelloWorld/android/build.gradle index eed9972b5c..8bd0ba32b0 100644 --- a/local-cli/templates/HelloWorld/android/build.gradle +++ b/local-cli/templates/HelloWorld/android/build.gradle @@ -3,6 +3,10 @@ buildscript { repositories { jcenter() + maven { + url 'https://maven.google.com/' + name 'Google' + } } dependencies { classpath 'com.android.tools.build:gradle:2.2.3' @@ -16,6 +20,10 @@ allprojects { repositories { mavenLocal() jcenter() + maven { + url 'https://maven.google.com/' + name 'Google' + } maven { // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm url "$rootDir/../node_modules/react-native/android"