From 044b399e6590d84065a9b186750f77bc9d851aac Mon Sep 17 00:00:00 2001 From: Dulmandakh Date: Wed, 22 Aug 2018 23:07:33 -0700 Subject: [PATCH] Bump compileSdkVersion to 27 and buildToolsVersion to 27.0.3 (#20777) Summary: I found that android support library 27.x (https://github.com/facebook/react-native/commit/874cca1ac258ec224bade999722d7a34c307def0) requires compileSdkVersion to be 27. Also found that many FB projects use SDK 27. Pull Request resolved: https://github.com/facebook/react-native/pull/20777 Differential Revision: D9478431 Pulled By: hramos fbshipit-source-id: ca100f6b5b39e7d112926124423f9510a0efc291 --- .buckconfig | 2 +- .circleci/config.yml | 6 +++--- ContainerShip/Dockerfile.android-base | 4 ++-- RNTester/android/app/build.gradle | 4 ++-- ReactAndroid/build.gradle | 4 ++-- appveyor.yml | 4 ++-- local-cli/templates/HelloWorld/android/build.gradle | 4 ++-- scripts/.tests.env | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.buckconfig b/.buckconfig index a4c6d696ba..0d97d1b1f6 100644 --- a/.buckconfig +++ b/.buckconfig @@ -1,6 +1,6 @@ [android] - target = android-26 + target = android-27 [download] max_number_of_retries = 3 diff --git a/.circleci/config.yml b/.circleci/config.yml index e7bfb892a6..ed652d7914 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -28,11 +28,11 @@ aliases: - &restore-cache-android-packages keys: - - v1-android-sdkmanager-packages-api-26-alpha-{{ checksum "scripts/.tests.env" }} + - v1-android-sdkmanager-packages-api-27-alpha-{{ checksum "scripts/.tests.env" }} - &save-cache-android-packages paths: - /opt/android/sdk - key: v1-android-sdkmanager-packages-api-26-alpha-{{ checksum "scripts/.tests.env" }} + key: v1-android-sdkmanager-packages-api-27-alpha-{{ checksum "scripts/.tests.env" }} - &restore-cache-gradle keys: @@ -334,7 +334,7 @@ js_defaults: &js_defaults android_defaults: &android_defaults <<: *defaults docker: - - image: circleci/android:api-26-node8-alpha + - image: circleci/android:api-27-node8-alpha resource_class: "large" environment: - TERM: "dumb" diff --git a/ContainerShip/Dockerfile.android-base b/ContainerShip/Dockerfile.android-base index 5d19bc7f1e..6cbc6438c7 100644 --- a/ContainerShip/Dockerfile.android-base +++ b/ContainerShip/Dockerfile.android-base @@ -18,8 +18,8 @@ LABEL maintainer="Héctor Ramos " # set default build arguments ARG SDK_VERSION=sdk-tools-linux-3859397.zip -ARG ANDROID_BUILD_VERSION=26 -ARG ANDROID_TOOLS_VERSION=26.0.3 +ARG ANDROID_BUILD_VERSION=27 +ARG ANDROID_TOOLS_VERSION=27.0.3 ARG BUCK_VERSION=v2018.07.23.01 ARG NDK_VERSION=17b ARG NODE_VERSION=8.10.0 diff --git a/RNTester/android/app/build.gradle b/RNTester/android/app/build.gradle index f69c094c17..3cacfe0409 100644 --- a/RNTester/android/app/build.gradle +++ b/RNTester/android/app/build.gradle @@ -84,8 +84,8 @@ def enableSeparateBuildPerCPUArchitecture = false def enableProguardInReleaseBuilds = true android { - compileSdkVersion 26 - buildToolsVersion "26.0.3" + compileSdkVersion 27 + buildToolsVersion "27.0.3" defaultConfig { applicationId "com.facebook.react.uiapp" diff --git a/ReactAndroid/build.gradle b/ReactAndroid/build.gradle index d14674d231..54a139e71f 100644 --- a/ReactAndroid/build.gradle +++ b/ReactAndroid/build.gradle @@ -245,8 +245,8 @@ task packageReactNdkLibsForBuck(dependsOn: packageReactNdkLibs, type: Copy) { } android { - compileSdkVersion 26 - buildToolsVersion "26.0.3" + compileSdkVersion 27 + buildToolsVersion "27.0.3" defaultConfig { minSdkVersion 16 diff --git a/appveyor.yml b/appveyor.yml index 3d5c4336a6..61fe51b306 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,8 +1,8 @@ environment: ANDROID_HOME: "C:\\android-sdk-windows" ANDROID_NDK: "C:\\android-sdk-windows\\android-ndk-r17b" - ANDROID_BUILD_VERSION: 26 - ANDROID_TOOLS_VERSION: 26.0.3 + ANDROID_BUILD_VERSION: 27 + ANDROID_TOOLS_VERSION: 27.0.3 GRADLE_OPTS: -Dorg.gradle.daemon=false diff --git a/local-cli/templates/HelloWorld/android/build.gradle b/local-cli/templates/HelloWorld/android/build.gradle index 116463797c..8638267d1b 100644 --- a/local-cli/templates/HelloWorld/android/build.gradle +++ b/local-cli/templates/HelloWorld/android/build.gradle @@ -32,9 +32,9 @@ allprojects { } ext { - buildToolsVersion = "26.0.3" + buildToolsVersion = "27.0.3" minSdkVersion = 16 - compileSdkVersion = 26 + compileSdkVersion = 27 targetSdkVersion = 26 supportLibVersion = "27.1.1" } diff --git a/scripts/.tests.env b/scripts/.tests.env index e9d918ec47..17a2ac9e13 100644 --- a/scripts/.tests.env +++ b/scripts/.tests.env @@ -4,9 +4,9 @@ ## ANDROID ## # Android SDK Build Tools revision -export ANDROID_SDK_BUILD_TOOLS_REVISION=26.0.3 +export ANDROID_SDK_BUILD_TOOLS_REVISION=27.0.3 # Android API Level we build with -export ANDROID_SDK_BUILD_API_LEVEL="26" +export ANDROID_SDK_BUILD_API_LEVEL="27" # Google APIs for Android level export ANDROID_GOOGLE_API_LEVEL="23" # Minimum Android API Level we target