Merge branch 'main' of https://github.com/facebook/react-native into realize-last-focused

Author: NickGerleman

.buckconfig

@@ -1,6 +1,6 @@
 
 [android]
-  target = android-30
+  target = android-31
 
 [download]
   max_number_of_retries = 3

.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:5.1
+FROM reactnativecommunity/react-native-android:5.2
 
 LABEL Description="React Native Android Test Image"
 LABEL maintainer="Héctor Ramos <[email protected]>"

.circleci/Dockerfiles/scripts/run-android-ci-instrumentation-tests.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

.circleci/Dockerfiles/scripts/run-android-docker-instrumentation-tests.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (c) Facebook, Inc. and its affiliates.
+# Copyright (c) Meta Platforms, Inc. and affiliates.
 #
 # This source code is licensed under the MIT license found in the
 # LICENSE file in the root directory of this source tree.

.circleci/Dockerfiles/scripts/run-android-docker-unit-tests.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (c) Facebook, Inc. and its affiliates.
+# Copyright (c) Meta Platforms, Inc. and affiliates.
 #
 # This source code is licensed under the MIT license found in the
 # LICENSE file in the root directory of this source tree.

.circleci/Dockerfiles/scripts/run-ci-e2e-tests.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (c) Facebook, Inc. and its affiliates.
+# Copyright (c) Meta Platforms, Inc. and affiliates.
 #
 # This source code is licensed under the MIT license found in the
 # LICENSE file in the root directory of this source tree.

.circleci/Dockerfiles/scripts/run-instrumentation-tests-via-adb-shell.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (c) Facebook, Inc. and its affiliates.
+# Copyright (c) Meta Platforms, Inc. and affiliates.
 #
 # This source code is licensed under the MIT license found in the
 # LICENSE file in the root directory of this source tree.

.circleci/config.yml

@@ -36,7 +36,7 @@ executors:
   reactnativeandroid:
     <<: *defaults
     docker:
-      - image: reactnativecommunity/react-native-android:5.1
+      - image: reactnativecommunity/react-native-android:5.2
     resource_class: "large"
     environment:
       - TERM: "dumb"
@@ -78,7 +78,9 @@ commands:
     steps:
       - restore_cache:
           keys:
-            - v4-yarn-cache-{{ arch }}-{{ checksum "yarn.lock" }}
+            - v5-yarn-cache-{{ .Environment.CIRCLE_JOB }}-{{ arch }}-{{ checksum "yarn.lock" }}
+            - v5-yarn-cache-{{ .Environment.CIRCLE_JOB }}-{{ arch }}
+            - v5-yarn-cache-{{ .Environment.CIRCLE_JOB }}
       - run:
           name: "Yarn: Install Dependencies"
           command: |
@@ -90,13 +92,7 @@ commands:
       - save_cache:
           paths:
             - ~/.cache/yarn
-          key: v4-yarn-cache-{{ arch }}-{{ checksum "yarn.lock" }}
-
-  build_codegen:
-    steps:
-      - run:
-          name: "Codegen: Build react-native-codegen package"
-          command: cd packages/react-native-codegen && yarn build
+          key: v5-yarn-cache-{{ .Environment.CIRCLE_JOB }}-{{ arch }}-{{ checksum "yarn.lock" }}
 
   install_buck_tooling:
     steps:
@@ -242,7 +238,7 @@ jobs:
           command: |
             curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
             apt update && apt install -y shellcheck jq
-            apt-get install openssl ca-certificates
+            apt-get -y install openssl ca-certificates
             update-ca-certificates
             curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
             apt update && apt install -y shellcheck jq
@@ -373,7 +369,6 @@ jobs:
       - setup_artifacts
       - setup_ruby
       - run_yarn
-      - build_codegen
 
       - run: |
           cd packages/rn-tester
@@ -590,7 +585,8 @@ jobs:
           name: Setup the Android Template
           command: |
             cd template
-            sed -i 's/1000\.0\.0/file\:\.\./g' package.json
+            # We replace the "react-native" dependency version with file:.. so we use it from source.
+            sed -i 's/\"react-native\"\:.*/\"react-native\"\: \"file\:\.\.\"/g' package.json
             npm install
             # react-native-community/cli is needed as the Android template is referencing a .gradle file inside it.
             npm i @react-native-community/cli
@@ -649,10 +645,9 @@ jobs:
     environment:
       - ANDROID_HOME: "C:\\Android\\android-sdk"
       - ANDROID_NDK: "C:\\Android\\android-sdk\\ndk\\20.1.5948944"
-      - ANDROID_BUILD_VERSION: 30
-      - ANDROID_TOOLS_VERSION: 30.0.2
+      - ANDROID_BUILD_VERSION: 31
+      - ANDROID_TOOLS_VERSION: 31.0.0
       - GRADLE_OPTS: -Dorg.gradle.daemon=false
-      - NDK_VERSION: 21.4.7075529
     steps:
       - checkout
 
@@ -698,7 +693,6 @@ jobs:
             sdkmanager "build-tools;%ANDROID_TOOLS_VERSION%"
             sdkmanager "add-ons;addon-google_apis-google-23"
             sdkmanager "extras;android;m2repository"
-            sdkmanager "ndk;%NDK_VERSION%"
 
       # -------------------------
       # Run Tests
@@ -749,6 +743,19 @@ jobs:
   # -------------------------
   #      JOBS: Releases
   # -------------------------
+  prepare_package_for_release:
+    executor: reactnativeios
+    steps:
+      - checkout
+      - run_yarn
+      - add_ssh_keys:
+          fingerprints:
+            - "1c:98:e0:3a:52:79:95:29:12:cd:b4:87:5b:41:e2:bb"
+      - run:
+          name: "Set new react-native version and commit changes"
+          command: |
+            node ./scripts/prepare-package-for-release.js
+
   build_npm_package:
     parameters:
       publish_npm_args:
@@ -847,7 +854,6 @@ workflows:
               only:
                 - main
                 - /^pull\/.*$/
-                - /^(\d+)\.(\d+)-stable$/
       - test_js:
           run_disabled_tests: false
           filters:
@@ -915,10 +921,25 @@ workflows:
 
   releases:
     jobs:
+      # This job will trigger on relevant release branch pushes.
+      # It prepares the package and triggers `build_npm_package` for release
+      - prepare_package_for_release:
+          name: prepare_package_for_release
+          # Since CircleCI does not support branch AND tag filters, we manually check in job
+          # and no-op if there is no `publish-v{version}` tag set.
+          filters:
+            branches:
+              only:
+                - /^(\d+)\.(\d+)-stable$/
+
+      # This job will trigger when a version tag is pushed (by prepare_package_for_release)
       - build_npm_package:
           name: build_and_publish_npm_package
           context: react-native-bot
           publish_npm_args: --release
+          # CircleCI filters are OR-ed, with all branches triggering by default and tags excluded by default
+          # CircleCI env-vars are only set with the branch OR tag that triggered the job, not both.
+          # In this case, CIRCLE_BRANCH is unset, but CIRCLE_TAG is set
           filters:
             # Both of the following conditions must be included!
             # Ignore any commit on any branch by default.

.eslintrc

@@ -6,7 +6,7 @@
   ],
 
   "plugins": [
-    "@react-native/eslint-plugin-codegen"
+    "@react-native/eslint-plugin-specs"
   ],
 
   "overrides": [
@@ -18,7 +18,7 @@
         "@react-native-community/no-haste-imports": 2,
         "@react-native-community/error-subclass-name": 2,
         "@react-native-community/platform-colors": 2,
-        "@react-native/codegen/react-native-modules": 2
+        "@react-native/specs/react-native-modules": 2
       }
     },
     {

.flowconfig

@@ -70,4 +70,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.165.0
+^0.168.0