Bump compileSdkVersion to 27 and buildToolsVersion to 27.0.3 (#20777)
Summary:
I found that android support library 27.x (874cca1ac2
) 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
This commit is contained in:
Родитель
e3165c6506
Коммит
044b399e65
|
@ -1,6 +1,6 @@
|
||||||
|
|
||||||
[android]
|
[android]
|
||||||
target = android-26
|
target = android-27
|
||||||
|
|
||||||
[download]
|
[download]
|
||||||
max_number_of_retries = 3
|
max_number_of_retries = 3
|
||||||
|
|
|
@ -28,11 +28,11 @@ aliases:
|
||||||
|
|
||||||
- &restore-cache-android-packages
|
- &restore-cache-android-packages
|
||||||
keys:
|
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
|
- &save-cache-android-packages
|
||||||
paths:
|
paths:
|
||||||
- /opt/android/sdk
|
- /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
|
- &restore-cache-gradle
|
||||||
keys:
|
keys:
|
||||||
|
@ -334,7 +334,7 @@ js_defaults: &js_defaults
|
||||||
android_defaults: &android_defaults
|
android_defaults: &android_defaults
|
||||||
<<: *defaults
|
<<: *defaults
|
||||||
docker:
|
docker:
|
||||||
- image: circleci/android:api-26-node8-alpha
|
- image: circleci/android:api-27-node8-alpha
|
||||||
resource_class: "large"
|
resource_class: "large"
|
||||||
environment:
|
environment:
|
||||||
- TERM: "dumb"
|
- TERM: "dumb"
|
||||||
|
|
|
@ -18,8 +18,8 @@ LABEL maintainer="Héctor Ramos <hector@fb.com>"
|
||||||
|
|
||||||
# set default build arguments
|
# set default build arguments
|
||||||
ARG SDK_VERSION=sdk-tools-linux-3859397.zip
|
ARG SDK_VERSION=sdk-tools-linux-3859397.zip
|
||||||
ARG ANDROID_BUILD_VERSION=26
|
ARG ANDROID_BUILD_VERSION=27
|
||||||
ARG ANDROID_TOOLS_VERSION=26.0.3
|
ARG ANDROID_TOOLS_VERSION=27.0.3
|
||||||
ARG BUCK_VERSION=v2018.07.23.01
|
ARG BUCK_VERSION=v2018.07.23.01
|
||||||
ARG NDK_VERSION=17b
|
ARG NDK_VERSION=17b
|
||||||
ARG NODE_VERSION=8.10.0
|
ARG NODE_VERSION=8.10.0
|
||||||
|
|
|
@ -84,8 +84,8 @@ def enableSeparateBuildPerCPUArchitecture = false
|
||||||
def enableProguardInReleaseBuilds = true
|
def enableProguardInReleaseBuilds = true
|
||||||
|
|
||||||
android {
|
android {
|
||||||
compileSdkVersion 26
|
compileSdkVersion 27
|
||||||
buildToolsVersion "26.0.3"
|
buildToolsVersion "27.0.3"
|
||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
applicationId "com.facebook.react.uiapp"
|
applicationId "com.facebook.react.uiapp"
|
||||||
|
|
|
@ -245,8 +245,8 @@ task packageReactNdkLibsForBuck(dependsOn: packageReactNdkLibs, type: Copy) {
|
||||||
}
|
}
|
||||||
|
|
||||||
android {
|
android {
|
||||||
compileSdkVersion 26
|
compileSdkVersion 27
|
||||||
buildToolsVersion "26.0.3"
|
buildToolsVersion "27.0.3"
|
||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
minSdkVersion 16
|
minSdkVersion 16
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
environment:
|
environment:
|
||||||
ANDROID_HOME: "C:\\android-sdk-windows"
|
ANDROID_HOME: "C:\\android-sdk-windows"
|
||||||
ANDROID_NDK: "C:\\android-sdk-windows\\android-ndk-r17b"
|
ANDROID_NDK: "C:\\android-sdk-windows\\android-ndk-r17b"
|
||||||
ANDROID_BUILD_VERSION: 26
|
ANDROID_BUILD_VERSION: 27
|
||||||
ANDROID_TOOLS_VERSION: 26.0.3
|
ANDROID_TOOLS_VERSION: 27.0.3
|
||||||
|
|
||||||
GRADLE_OPTS: -Dorg.gradle.daemon=false
|
GRADLE_OPTS: -Dorg.gradle.daemon=false
|
||||||
|
|
||||||
|
|
|
@ -32,9 +32,9 @@ allprojects {
|
||||||
}
|
}
|
||||||
|
|
||||||
ext {
|
ext {
|
||||||
buildToolsVersion = "26.0.3"
|
buildToolsVersion = "27.0.3"
|
||||||
minSdkVersion = 16
|
minSdkVersion = 16
|
||||||
compileSdkVersion = 26
|
compileSdkVersion = 27
|
||||||
targetSdkVersion = 26
|
targetSdkVersion = 26
|
||||||
supportLibVersion = "27.1.1"
|
supportLibVersion = "27.1.1"
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,9 +4,9 @@
|
||||||
|
|
||||||
## ANDROID ##
|
## ANDROID ##
|
||||||
# Android SDK Build Tools revision
|
# 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
|
# 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
|
# Google APIs for Android level
|
||||||
export ANDROID_GOOGLE_API_LEVEL="23"
|
export ANDROID_GOOGLE_API_LEVEL="23"
|
||||||
# Minimum Android API Level we target
|
# Minimum Android API Level we target
|
||||||
|
|
Загрузка…
Ссылка в новой задаче