Revert D26470604: Bump Android compileSdkVersion and targetSdkVersion to 30
Differential Revision:
D26470604 (55c8833817
)
Original commit changeset: ffd490f6e547
fbshipit-source-id: 71926781696ab7b7fb2b109198a8d02c3286b05f
This commit is contained in:
Родитель
ee98e6a493
Коммит
5194183037
|
@ -617,7 +617,7 @@ jobs:
|
||||||
environment:
|
environment:
|
||||||
- ANDROID_HOME: "C:\\Android\\android-sdk"
|
- ANDROID_HOME: "C:\\Android\\android-sdk"
|
||||||
- ANDROID_NDK: "C:\\Android\\android-sdk\\ndk\\20.1.5948944"
|
- ANDROID_NDK: "C:\\Android\\android-sdk\\ndk\\20.1.5948944"
|
||||||
- ANDROID_BUILD_VERSION: 30
|
- ANDROID_BUILD_VERSION: 28
|
||||||
- ANDROID_TOOLS_VERSION: 29.0.3
|
- ANDROID_TOOLS_VERSION: 29.0.3
|
||||||
- GRADLE_OPTS: -Dorg.gradle.daemon=false
|
- GRADLE_OPTS: -Dorg.gradle.daemon=false
|
||||||
- NDK_VERSION: 20.1.5948944
|
- NDK_VERSION: 20.1.5948944
|
||||||
|
|
|
@ -378,7 +378,7 @@ task extractJNIFiles {
|
||||||
}
|
}
|
||||||
|
|
||||||
android {
|
android {
|
||||||
compileSdkVersion 30
|
compileSdkVersion 29
|
||||||
ndkVersion ANDROID_NDK_VERSION
|
ndkVersion ANDROID_NDK_VERSION
|
||||||
compileOptions {
|
compileOptions {
|
||||||
sourceCompatibility(JavaVersion.VERSION_1_8)
|
sourceCompatibility(JavaVersion.VERSION_1_8)
|
||||||
|
|
|
@ -4,8 +4,8 @@ buildscript {
|
||||||
ext {
|
ext {
|
||||||
buildToolsVersion = "29.0.3"
|
buildToolsVersion = "29.0.3"
|
||||||
minSdkVersion = 21
|
minSdkVersion = 21
|
||||||
compileSdkVersion = 30
|
compileSdkVersion = 29
|
||||||
targetSdkVersion = 30
|
targetSdkVersion = 29
|
||||||
ndkVersion = "20.1.5948944"
|
ndkVersion = "20.1.5948944"
|
||||||
}
|
}
|
||||||
repositories {
|
repositories {
|
||||||
|
|
Загрузка…
Ссылка в новой задаче