Merge remote-tracking branch 'upstream/main' into 34265-update-emoji-…

…offset
DylanDylann · Jan 22, 2024 · b469f07 · b469f07
2 parents 91a3497 + 333f758
commit b469f07
Show file tree

Hide file tree

Showing 447 changed files with 14,682 additions and 68,930 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -1,12 +1,13 @@
 const restrictedImportPaths = [
     {
         name: 'react-native',
-        importNames: ['useWindowDimensions', 'StatusBar', 'TouchableOpacity', 'TouchableWithoutFeedback', 'TouchableNativeFeedback', 'TouchableHighlight', 'Pressable'],
+        importNames: ['useWindowDimensions', 'StatusBar', 'TouchableOpacity', 'TouchableWithoutFeedback', 'TouchableNativeFeedback', 'TouchableHighlight', 'Pressable', 'Text'],
         message: [
             '',
             "For 'useWindowDimensions', please use 'src/hooks/useWindowDimensions' instead.",
             "For 'TouchableOpacity', 'TouchableWithoutFeedback', 'TouchableNativeFeedback', 'TouchableHighlight', 'Pressable', please use 'PressableWithFeedback' and/or 'PressableWithoutFeedback' from 'src/components/Pressable' instead.",
             "For 'StatusBar', please use 'src/libs/StatusBar' instead.",
+            "For 'Text', please use '@components/Text' instead.",
         ].join('\n'),
     },
     {

diff --git a/.github/actions/composite/buildAndroidAPKDelta/action.yml b/.github/actions/composite/buildAndroidAPKDelta/action.yml
diff --git a/...ions/composite/buildAndroidAPK/action.yml → ...s/composite/buildAndroidE2EAPK/action.yml b/...ions/composite/buildAndroidAPK/action.yml → ...s/composite/buildAndroidE2EAPK/action.yml
@@ -1,16 +1,35 @@
-name: Build an Android apk
+name: Build an Android apk for e2e tests
 description: Build an Android apk for an E2E test build and upload it as an artifact
 
 inputs:
   ARTIFACT_NAME:
     description: The name of the workflow artifact where the APK should be uploaded
     required: true
+  PACKAGE_SCRIPT_NAME:
+    description: The name of the npm script to run to build the APK
+    required: true
+  APP_OUTPUT_PATH:
+    description: The path to the built APK
+    required: true
+  MAPBOX_SDK_DOWNLOAD_TOKEN:
+    description: The token to use to download the MapBox SDK
+    required: true
 
 runs:
   using: composite
   steps:
+    - name: Configure MapBox SDK
+      run: ./scripts/setup-mapbox-sdk.sh ${{ inputs.MAPBOX_SDK_DOWNLOAD_TOKEN }}
+      shell: bash
+
     - uses: Expensify/App/.github/actions/composite/setupNode@main
 
+    - name: Setup Java
+      uses: actions/setup-java@v3
+      with:
+        distribution: "oracle"
+        java-version: "17"
+
     - uses: ruby/setup-ruby@a05e47355e80e57b9a67566a813648fa67d92011
       with:
         ruby-version: "2.7"
@@ -19,11 +38,11 @@ runs:
     - uses: gradle/gradle-build-action@3fbe033aaae657f011f88f29be9e65ed26bd29ef
 
     - name: Build APK
-      run: npm run android-build-e2e
+      run: npm run ${{ inputs.PACKAGE_SCRIPT_NAME }}
       shell: bash
 
     - name: Upload APK
       uses: actions/upload-artifact@65d862660abb392b8c4a3d1195a2108db131dd05
       with:
         name: ${{ inputs.ARTIFACT_NAME }}
-        path: android/app/build/outputs/apk/e2e/release/app-e2e-release.apk
+        path: ${{ inputs.APP_OUTPUT_PATH }}