Bump OSS Android build to SDK 33 (#35196)
Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/35196 Changelog: [Android][Changed] - Bump Android compile and target SDK to 33 Reviewed By: cortinico Differential Revision: D41007003 fbshipit-source-id: e7866107fdcfafa778faa6c7f31835b8dd15647a
This commit is contained in:
Родитель
669318d06f
Коммит
394486eec5
|
@ -14,7 +14,7 @@
|
|||
# and build a Android application that can be used to run the
|
||||
# tests specified in the scripts/ directory.
|
||||
#
|
||||
FROM reactnativecommunity/react-native-android:6.0
|
||||
FROM reactnativecommunity/react-native-android:6.1
|
||||
|
||||
LABEL Description="React Native Android Test Image"
|
||||
LABEL maintainer="Héctor Ramos <hector@fb.com>"
|
||||
|
|
|
@ -102,7 +102,7 @@ executors:
|
|||
reactnativeandroid:
|
||||
<<: *defaults
|
||||
docker:
|
||||
- image: reactnativecommunity/react-native-android:6.0
|
||||
- image: reactnativecommunity/react-native-android:6.1
|
||||
resource_class: "xlarge"
|
||||
environment:
|
||||
- TERM: "dumb"
|
||||
|
@ -964,8 +964,8 @@ jobs:
|
|||
environment:
|
||||
- ANDROID_HOME: "C:\\Android\\android-sdk"
|
||||
- ANDROID_NDK: "C:\\Android\\android-sdk\\ndk\\20.1.5948944"
|
||||
- ANDROID_BUILD_VERSION: 31
|
||||
- ANDROID_TOOLS_VERSION: 31.0.0
|
||||
- ANDROID_BUILD_VERSION: 33
|
||||
- ANDROID_TOOLS_VERSION: 33.0.0
|
||||
- GRADLE_OPTS: -Dorg.gradle.daemon=false
|
||||
steps:
|
||||
- checkout_code_with_cache
|
||||
|
|
|
@ -363,8 +363,8 @@ task installArchives {
|
|||
}
|
||||
|
||||
android {
|
||||
buildToolsVersion = "31.0.0"
|
||||
compileSdkVersion 31
|
||||
buildToolsVersion = "33.0.0"
|
||||
compileSdkVersion 33
|
||||
|
||||
// Used to override the NDK path/version on internal CI or by allowing
|
||||
// users to customize the NDK path/version from their root project (e.g. for M1 support)
|
||||
|
@ -377,7 +377,7 @@ android {
|
|||
|
||||
defaultConfig {
|
||||
minSdkVersion(21)
|
||||
targetSdkVersion(31)
|
||||
targetSdkVersion(33)
|
||||
versionCode(1)
|
||||
versionName("1.0")
|
||||
|
||||
|
|
|
@ -86,7 +86,7 @@
|
|||
"prettier": "prettier --write \"./**/*.{js,md,yml,ts,tsx}\"",
|
||||
"format-check": "prettier --list-different \"./**/*.{js,md,yml,ts,tsx}\"",
|
||||
"update-lock": "npx yarn-deduplicate",
|
||||
"docker-setup-android": "docker pull reactnativecommunity/react-native-android:6.0",
|
||||
"docker-setup-android": "docker pull reactnativecommunity/react-native-android:6.1",
|
||||
"docker-build-android": "docker build -t reactnativeci/android -f .circleci/Dockerfiles/Dockerfile.android .",
|
||||
"test-android-run-instrumentation": "docker run --cap-add=SYS_ADMIN -it reactnativeci/android bash .circleci/Dockerfiles/scripts/run-android-docker-instrumentation-tests.sh",
|
||||
"test-android-run-unit": "docker run --cap-add=SYS_ADMIN -it reactnativeci/android bash .circleci/Dockerfiles/scripts/run-android-docker-unit-tests.sh",
|
||||
|
|
|
@ -86,8 +86,8 @@ def reactNativeArchitectures() {
|
|||
}
|
||||
|
||||
android {
|
||||
buildToolsVersion = "31.0.0"
|
||||
compileSdkVersion 31
|
||||
buildToolsVersion = "33.0.0"
|
||||
compileSdkVersion 33
|
||||
namespace "com.facebook.react.uiapp"
|
||||
|
||||
// Used to override the NDK path/version on internal CI or by allowing
|
||||
|
@ -114,7 +114,7 @@ android {
|
|||
defaultConfig {
|
||||
applicationId "com.facebook.react.uiapp"
|
||||
minSdkVersion 21
|
||||
targetSdkVersion 31
|
||||
targetSdkVersion 33
|
||||
versionCode 1
|
||||
versionName "1.0"
|
||||
testBuildType System.getProperty('testBuildType', 'debug') // This will later be used to control the test apk build type
|
||||
|
|
|
@ -4,15 +4,15 @@
|
|||
|
||||
## ANDROID ##
|
||||
# Android SDK Build Tools revision
|
||||
export ANDROID_SDK_BUILD_TOOLS_REVISION=31.0.0
|
||||
export ANDROID_SDK_BUILD_TOOLS_REVISION=33.0.0
|
||||
# Android API Level we build with
|
||||
export ANDROID_SDK_BUILD_API_LEVEL="31"
|
||||
export ANDROID_SDK_BUILD_API_LEVEL="33"
|
||||
# Google APIs for Android level
|
||||
export ANDROID_GOOGLE_API_LEVEL="23"
|
||||
# Minimum Android API SDK Level we target
|
||||
export ANDROID_SDK_MINIMUM_API_LEVEL="21"
|
||||
# Target API SDK level to build for
|
||||
export ANDROID_SDK_TARGET_API_LEVEL="31"
|
||||
export ANDROID_SDK_TARGET_API_LEVEL="33"
|
||||
# Android Image SDK level to install on the emulator
|
||||
export ANDROID_SYSTEM_IMAGE_API_LEVEL="21"
|
||||
|
||||
|
|
|
@ -2,10 +2,10 @@
|
|||
|
||||
buildscript {
|
||||
ext {
|
||||
buildToolsVersion = "31.0.0"
|
||||
buildToolsVersion = "33.0.0"
|
||||
minSdkVersion = 21
|
||||
compileSdkVersion = 31
|
||||
targetSdkVersion = 31
|
||||
compileSdkVersion = 33
|
||||
targetSdkVersion = 33
|
||||
|
||||
// We use NDK 23 which has both M1 support and is the side-by-side NDK version from AGP.
|
||||
ndkVersion = "23.1.7779620"
|
||||
|
|
Загрузка…
Ссылка в новой задаче