diff --git a/.circleci/Dockerfiles/Dockerfile.android b/.circleci/Dockerfiles/Dockerfile.android index 92bf645af1d2..0500df637c36 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:3.2 +FROM reactnativecommunity/react-native-android:4.0 LABEL Description="React Native Android Test Image" LABEL maintainer="Héctor Ramos " diff --git a/.circleci/config.yml b/.circleci/config.yml index 59f2eb6014e0..48759d49d514 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -36,7 +36,7 @@ executors: reactnativeandroid: <<: *defaults docker: - - image: reactnativecommunity/react-native-android:3.2 + - image: reactnativecommunity/react-native-android:4.0 resource_class: "large" environment: - TERM: "dumb" @@ -504,14 +504,6 @@ jobs: command: source scripts/android-setup.sh && launchAVD background: true - # Keep configuring Android dependencies while AVD boots up - # Note: The yarn gpg key needs to be refreshed to work around https://github.com/yarnpkg/yarn/issues/7866 - - run: - name: Install rsync, zip - command: | - curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - - apt-get update -y && apt-get install patch rsync zip -y - # Install Buck - install_buck_tooling diff --git a/package.json b/package.json index 16d897fa3706..c4c7730cab3a 100644 --- a/package.json +++ b/package.json @@ -68,7 +68,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:3.2", + "docker-setup-android": "docker pull reactnativecommunity/react-native-android:4.0", "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",