mirror of
https://github.com/facebook/react-native.git
synced 2025-11-01 09:14:26 +00:00
Bump Android compileSdkVersion and targetSdkVersion to 30 (#31078)
Summary: ## Summary Bump Android compileSdkVersion and targetSdkVersion to 30 ## Changelog [Android][Changed] Bump Android compileSdkVersion and targetSdkVersion from 29 to 30 Pull Request resolved: https://github.com/facebook/react-native/pull/31078 Test Plan: Circle CI and Sandcastle Reviewed By: mdvacca Differential Revision: D26765188 Pulled By: hramos fbshipit-source-id: a971641cea4860df58ce6e9b0f14405bfc4e0979
This commit is contained in:
committed by
Facebook GitHub Bot
parent
be7f057bac
commit
6ccd0cdebb
+1
-1
@@ -1,6 +1,6 @@
|
||||
|
||||
[android]
|
||||
target = android-29
|
||||
target = android-30
|
||||
|
||||
[download]
|
||||
max_number_of_retries = 3
|
||||
|
||||
@@ -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:2.1
|
||||
FROM reactnativecommunity/react-native-android:3.2
|
||||
|
||||
LABEL Description="React Native Android Test Image"
|
||||
LABEL maintainer="Héctor Ramos <hector@fb.com>"
|
||||
|
||||
@@ -35,7 +35,7 @@ executors:
|
||||
reactnativeandroid:
|
||||
<<: *defaults
|
||||
docker:
|
||||
- image: reactnativecommunity/react-native-android:2.1
|
||||
- image: reactnativecommunity/react-native-android:3.2
|
||||
resource_class: "large"
|
||||
environment:
|
||||
- TERM: "dumb"
|
||||
@@ -617,7 +617,7 @@ jobs:
|
||||
environment:
|
||||
- ANDROID_HOME: "C:\\Android\\android-sdk"
|
||||
- ANDROID_NDK: "C:\\Android\\android-sdk\\ndk\\20.1.5948944"
|
||||
- ANDROID_BUILD_VERSION: 28
|
||||
- ANDROID_BUILD_VERSION: 30
|
||||
- ANDROID_TOOLS_VERSION: 29.0.3
|
||||
- GRADLE_OPTS: -Dorg.gradle.daemon=false
|
||||
- NDK_VERSION: 20.1.5948944
|
||||
|
||||
@@ -378,7 +378,7 @@ task extractJNIFiles {
|
||||
}
|
||||
|
||||
android {
|
||||
compileSdkVersion 29
|
||||
compileSdkVersion 30
|
||||
ndkVersion ANDROID_NDK_VERSION
|
||||
compileOptions {
|
||||
sourceCompatibility(JavaVersion.VERSION_1_8)
|
||||
|
||||
+1
-1
@@ -67,7 +67,7 @@
|
||||
"prettier": "prettier --write \"./**/*.{js,md,yml}\"",
|
||||
"format-check": "prettier --list-different \"./**/*.{js,md,yml}\"",
|
||||
"update-lock": "npx yarn-deduplicate",
|
||||
"docker-setup-android": "docker pull reactnativecommunity/react-native-android:2.1",
|
||||
"docker-setup-android": "docker pull reactnativecommunity/react-native-android:3.2",
|
||||
"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",
|
||||
|
||||
@@ -4,8 +4,8 @@ buildscript {
|
||||
ext {
|
||||
buildToolsVersion = "29.0.3"
|
||||
minSdkVersion = 21
|
||||
compileSdkVersion = 29
|
||||
targetSdkVersion = 29
|
||||
compileSdkVersion = 30
|
||||
targetSdkVersion = 30
|
||||
ndkVersion = "20.1.5948944"
|
||||
}
|
||||
repositories {
|
||||
|
||||
Reference in New Issue
Block a user