diff --git a/.circleci/Dockerfiles/Dockerfile.android b/.circleci/Dockerfiles/Dockerfile.android index c34c36f054ce72..c4f7d4d74a708d 100644 --- a/.circleci/Dockerfiles/Dockerfile.android +++ b/.circleci/Dockerfiles/Dockerfile.android @@ -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:2019-10-18 +FROM reactnativecommunity/react-native-android:1.0.5 LABEL Description="React Native Android Test Image" LABEL maintainer="Héctor Ramos " diff --git a/.circleci/config.yml b/.circleci/config.yml index 93ec94d0462fc9..3c65f5bb0cc0c2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -36,7 +36,7 @@ executors: reactnativeandroid: <<: *defaults docker: - - image: reactnativecommunity/react-native-android:2019-10-18 + - image: reactnativecommunity/react-native-android:1.0.5 resource_class: "large" environment: - TERM: "dumb" @@ -381,7 +381,7 @@ jobs: - run: name: Configure Environment Variables command: | - echo 'export PATH=/usr/local/opt/node@10/bin:$PATH' >> $BASH_ENV + echo 'export PATH=/usr/local/opt/node@12/bin:$PATH' >> $BASH_ENV source $BASH_ENV - with_brew_cache_span: @@ -389,7 +389,7 @@ jobs: - brew_install: package: watchman - brew_install: - package: node@10 + package: node@12 - run: name: "Brew: Tap wix/brew" command: HOMEBREW_NO_AUTO_UPDATE=1 brew tap wix/brew >/dev/null diff --git a/package.json b/package.json index 333f42b99c5ddc..622d187bdca5cb 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "license": "MIT", "repository": "github:facebook/react-native", "engines": { - "node": ">=10" + "node": ">=12" }, "jest-junit": { "outputDirectory": "reports/junit", @@ -64,7 +64,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", + "docker-setup-android": "docker pull reactnativecommunity/react-native-android:1.0.5", "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", diff --git a/scripts/.tests.env b/scripts/.tests.env index 831e4ff0b8426d..4335501729d3f7 100644 --- a/scripts/.tests.env +++ b/scripts/.tests.env @@ -10,7 +10,7 @@ export ANDROID_SDK_BUILD_API_LEVEL="28" # Google APIs for Android level export ANDROID_GOOGLE_API_LEVEL="23" # Minimum Android API Level we target -export ANDROID_SDK_TARGET_API_LEVEL="19" +export ANDROID_SDK_TARGET_API_LEVEL="21" # Android Virtual Device name export AVD_NAME="testAVD" # ABI to use in Android Virtual Device diff --git a/scripts/validate-ios-test-env.sh b/scripts/validate-ios-test-env.sh index 7aa3fb618af8b4..3f87c191448332 100755 --- a/scripts/validate-ios-test-env.sh +++ b/scripts/validate-ios-test-env.sh @@ -8,8 +8,7 @@ # testing environment. # # In particular, it checks that the minimum required Xcode version is installed. -# It also checks that the correct Node version is installed. Node 10 is not fully -# supported at the time and Node 6 is no longer supported. +# It also checks that the correct Node version is installed. # Function used to compare dot separated version numbers function version_gt() { test "$(printf '%s\n' "$@" | sort -V | head -n 1)" != "$1"; } @@ -24,7 +23,7 @@ fi # Check that the correct version of node is installed NODE_VERSION="$(command node --version | sed 's/[-/a-zA-Z]//g' |sed 's/.\{2\}$//')" -if (( $(echo "${NODE_VERSION} <= 6.0" | bc -l) )); then +if (( $(echo "${NODE_VERSION} < 12.0" | bc -l) )); then echo "Node ${NODE_VERSION} detected. This version of Node is not supported." echo "See https://reactnative.dev/docs/getting-started.html for instructions." exit 1