Merge branch 'main' into fix-text-selectable-in-flatlist

Author: fabOnReact

.buckconfig

@@ -1,14 +1,13 @@
 
 [android]
-  target = android-29
+  target = android-30
 
 [download]
   max_number_of_retries = 3
 
 [maven_repositories]
   central = https://repo1.maven.org/maven2
   google = https://maven.google.com/
-  jcenter = https://jcenter.bintray.com/
 
 [alias]
   rntester = //packages/rn-tester/android/app:app

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

.circleci/config.yml

@@ -27,6 +27,7 @@ executors:
   nodelts:
     <<: *defaults
     docker:
+      # Note: Version set separately for Windows builds, see below.
       - image: circleci/node:14
   nodeprevlts:
     <<: *defaults
@@ -35,7 +36,7 @@ executors:
   reactnativeandroid:
     <<: *defaults
     docker:
-      - image: reactnativecommunity/react-native-android:2.1
+      - image: reactnativecommunity/react-native-android:4.0
     resource_class: "large"
     environment:
       - TERM: "dumb"
@@ -51,7 +52,7 @@ executors:
   reactnativeios:
     <<: *defaults
     macos:
-      xcode: &_XCODE_VERSION "12.1.0"
+      xcode: &_XCODE_VERSION "12.5.0"
 
 # -------------------------
 #        COMMANDS
@@ -503,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 rsync zip -y
-
       # Install Buck
       - install_buck_tooling
 
@@ -617,13 +610,20 @@ jobs:
     environment:
       - ANDROID_HOME: "C:\\Android\\android-sdk"
       - ANDROID_NDK: "C:\\Android\\android-sdk\\ndk\\20.1.5948944"
-      - ANDROID_BUILD_VERSION: 28
-      - ANDROID_TOOLS_VERSION: 29.0.3
+      - ANDROID_BUILD_VERSION: 30
+      - ANDROID_TOOLS_VERSION: 30.0.2
       - GRADLE_OPTS: -Dorg.gradle.daemon=false
-      - NDK_VERSION: 20.1.5948944
+      - NDK_VERSION: 21.4.7075529
     steps:
       - checkout
 
+      - run:
+          name: Install Node
+          # Note: Version set separately for non-Windows builds, see above.
+          command: |
+            nvm install 14.17.0
+            nvm use 14.17.0
+
       # Setup Dependencies
       - run:
           name: Install Yarn
@@ -900,7 +900,7 @@ workflows:
           filters:
             branches:
               only:
-                - master
+                - main
     jobs:
       - nightly_job
 

.editorconfig

@@ -13,5 +13,12 @@ indent_size = 2
 [*.gradle]
 indent_size = 4
 
+[*.kts]
+indent_size = 4
+
 [BUCK]
 indent_size = 4
+
+# Windows files
+[*.bat]
+end_of_line = crlf

.eslintrc

@@ -21,6 +21,14 @@
         "@react-native/codegen/react-native-modules": 2
       }
     },
+    {
+      "files": [
+        "flow-typed/**/*.js",
+      ],
+      "rules": {
+        quotes: 0
+      }
+    },
     {
       "files": [
         "**/__fixtures__/**/*.js",

.flowconfig

@@ -30,6 +30,9 @@ flow/
 emoji=true
 
 exact_by_default=true
+indexed_access=false
+
+format.bracket_spacing=false
 
 module.file_ext=.js
 module.file_ext=.json
@@ -47,15 +50,13 @@ suppress_type=$FlowFixMeProps
 suppress_type=$FlowFixMeState
 suppress_type=$FlowFixMeEmpty
 
-experimental.abstract_locations=true
-
 [lints]
 sketchy-null-number=warn
 sketchy-null-mixed=warn
 sketchy-number=warn
 untyped-type-import=warn
 nonstrict-import=warn
-deprecated-type=warn
+deprecated-type=error
 unsafe-getters-setters=warn
 unnecessary-invariant=warn
 signature-verification-failure=warn
@@ -70,4 +71,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.145.0
+^0.156.0

.flowconfig.android

@@ -30,6 +30,9 @@ flow/
 emoji=true
 
 exact_by_default=true
+indexed_access=false
+
+format.bracket_spacing=false
 
 module.file_ext=.js
 module.file_ext=.json
@@ -47,15 +50,13 @@ suppress_type=$FlowFixMeProps
 suppress_type=$FlowFixMeState
 suppress_type=$FlowFixMeEmpty
 
-experimental.abstract_locations=true
-
 [lints]
 sketchy-null-number=warn
 sketchy-null-mixed=warn
 sketchy-number=warn
 untyped-type-import=warn
 nonstrict-import=warn
-deprecated-type=warn
+deprecated-type=error
 unsafe-getters-setters=warn
 unnecessary-invariant=warn
 signature-verification-failure=warn
@@ -70,4 +71,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.145.0
+^0.156.0

.gitattributes

@@ -0,0 +1,3 @@
+# Windows files should use crlf line endings
+# https://help.github.com/articles/dealing-with-line-endings/
+*.bat text eol=crlf

.github/label-actions.yml …thub/respond-to-issue-based-on-label.yml.github/label-actions.yml renamed to .github/respond-to-issue-based-on-label.yml .github/label-actions.yml renamed to .github/respond-to-issue-based-on-label.yml

@@ -1,4 +1,4 @@
-# Configuration for Label Actions - https://github.com/marketplace/actions/label-actions
+# Configuration for Respond To Issue Based on Label https://github.com/marketplace/actions/respond-to-issue-based-on-label
 
 "Type: Invalid":
   close: true

…thub/workflows/process-label-actions.yml .github/workflows/on-issue-labeled.yml.github/workflows/process-label-actions.yml renamed to .github/workflows/on-issue-labeled.yml .github/workflows/process-label-actions.yml renamed to .github/workflows/on-issue-labeled.yml

@@ -1,16 +1,16 @@
-name: Label Actions
+name: On Issue Labeled
 # This workflow is triggered when a label is added to an issue.
 on:
   issues:
     types: labeled
 
 jobs:
-  processLabelAction:
-    name: Process Label Action
+  respondToIssueBasedOnLabel:
+    name: Respond to Issue Based on Label
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Process Label Action
-        uses: hramos/label-actions@v1
+      - name: Respond to Issue Based on Label
+        uses: hramos/respond-to-issue-based-on-label@v2
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}