Resolve conflicts 'develop' into fix/ci-cd

.eslintrc.cjs

@@ -1,7 +1,11 @@
 /** @type {import('eslint').Linter.Config} */
 const config = {
   root: true,
-  extends: ['@react-native', 'plugin:security/recommended', 'prettier'],
+  extends: [
+    '@react-native',
+    'prettier',
+    'plugin:security/recommended',
+  ],
   parser: '@typescript-eslint/parser',
   parserOptions: {
     project: './tsconfig.json'

.github/workflows/android_ci.yml

@@ -27,7 +27,7 @@ jobs:
       - name: Use Node.js 21
         uses: actions/setup-node@v1
         with:
-          node-version: "21.1.0"
+          node-version: "21"
 
       - name: Install Yarn
         working-directory: ./

.github/workflows/appcenter_release_android.yml

@@ -38,10 +38,10 @@ jobs:
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      - name: Use Node.js 21
-        uses: actions/setup-node@v1
+      - name: Use Node.js
+        uses: actions/setup-node@v4
         with:
-          node-version: '21.1.0'
+          node-version: "21"
       - name: Install Yarn
         working-directory: ./
         run: npm install -g yarn

.github/workflows/ios_ci.yml

@@ -20,10 +20,10 @@ jobs:
           bundler: "Gemfile.lock"
           bundler-cache: true
 
-      - name: Use Node.js 21
+      - name: Use Node.js
         uses: actions/setup-node@v1
         with:
-          node-version: "21.1.0"
+          node-version: "21"
 
       - name: Install Yarn
         run: npm install -g yarn

android/app/src/debug/AndroidManifest.xml

@@ -6,7 +6,7 @@
 
     <application
         android:usesCleartextTraffic="true"
-        tools:targetApi="28"
+        tools:targetApi="33"
         tools:ignore="GoogleAppIndexingWarning">
         <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" android:exported="false" />
     </application>

android/app/tasks.gradle

@@ -25,7 +25,7 @@ private static String bumpVersionCode(String text, String key, boolean silent =
     def didMatch = matcher.size() == 1 && matcher.hasGroup()
     if (!didMatch) {
         if (silent) return text
-        else throw GradleException("Could not find $key in config.gradle")
+        else throw new FileNotFoundException("Could not find $key in config.gradle")
     }
     def versionCodeStr = matcher[0][1]
     def versionCode = Integer.valueOf(versionCodeStr)

ios/.ruby-version

@@ -1 +1 @@
-2.6.10
+2.6.10