chore: resolve conflicts from v6

Author: khushal87

.github/workflows/sample-distribution.yml

@@ -1,5 +1,7 @@
 name: sample-distribution
 
+## TODO: Make sure to revert the changes here when moving this to main. We want them right now to be able to have the SampleApp live with V6.
+
 concurrency:
   group: sample-distribution-${{ github.ref }}
   cancel-in-progress: true
@@ -13,7 +15,7 @@ on:
 
 jobs:
   build_and_deploy_ios_testflight_qa:
-    name: Build SampleApp iOS and Deploy-${{ github.ref == 'refs/heads/develop' }}
+    name: Build SampleApp iOS and Deploy-${{ github.ref == 'refs/heads/v6.0.0' }}
     runs-on: [macos-14]
     steps:
       - name: Connect Bot
@@ -33,17 +35,19 @@ jobs:
             ${{ runner.os }}-pods-
       - name: iOS Pods setup
         working-directory: examples/SampleApp/ios
-        run: bundle exec pod install
+        run: |
+          pod update hermes-engine --no-repo-update
+          bundle exec pod install
       - name: Build and release Testflight QA
         working-directory: examples/SampleApp
-        run: bundle exec fastlane deploy_to_testflight_qa deploy:${{ github.ref == 'refs/heads/develop' }};
+        run: bundle exec fastlane deploy_to_testflight_qa deploy:${{ github.ref == 'refs/heads/v6.0.0' }};
         env:
           MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
           MATCH_GIT_BASIC_AUTHORIZATION: ${{ secrets.MATCH_GIT_BASIC_AUTHORIZATION }}
           APPSTORE_API_KEY: ${{ secrets.APPSTORE_API_KEY }}
 
   build_and_deploy_android_s3:
-    name: Build SampleApp Android and Deploy-${{ github.ref == 'refs/heads/develop' }}
+    name: Build SampleApp Android and Deploy-${{ github.ref == 'refs/heads/v6.0.0' }}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
@@ -64,13 +68,13 @@ jobs:
           rm -rf $HOME/.gradle/caches/ && ./gradlew assembleRelease
       - name: Configure AWS credentials
         uses: aws-actions/configure-aws-credentials@v1
-        if: ${{ github.ref == 'refs/heads/develop' }}
+        if: ${{ github.ref == 'refs/heads/v6.0.0' }}
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           aws-region: us-east-1
       - name: Upload APK
-        if: ${{ github.ref == 'refs/heads/develop' }}
+        if: ${{ github.ref == 'refs/heads/v6.0.0' }}
         # https://getstream.io/downloads/rn-sample-app.apk
         run: |
           cp examples/SampleApp/android/app/build/outputs/apk/release/app-release.apk rn-sample-app.apk

examples/SampleApp/ios/Podfile.lock

@@ -1439,27 +1439,6 @@ PODS:
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
-  - react-native-cameraroll (7.8.1):
-    - DoubleConversion
-    - glog
-    - hermes-engine
-    - RCT-Folly (= 2024.01.01.00)
-    - RCTRequired
-    - RCTTypeSafety
-    - React-Core
-    - React-debug
-    - React-Fabric
-    - React-featureflags
-    - React-graphics
-    - React-ImageManager
-    - React-NativeModulesApple
-    - React-RCTFabric
-    - React-rendererdebug
-    - React-utils
-    - ReactCodegen
-    - ReactCommon/turbomodule/bridging
-    - ReactCommon/turbomodule/core
-    - Yoga
   - react-native-document-picker (9.3.1):
     - DoubleConversion
     - glog
@@ -2254,7 +2233,6 @@ DEPENDENCIES:
   - React-Mapbuffer (from `../node_modules/react-native/ReactCommon`)
   - React-microtasksnativemodule (from `../node_modules/react-native/ReactCommon/react/nativemodule/microtasks`)
   - react-native-blob-util (from `../node_modules/react-native-blob-util`)
-  - "react-native-cameraroll (from `../node_modules/@react-native-camera-roll/camera-roll`)"
   - react-native-document-picker (from `../node_modules/react-native-document-picker`)
   - react-native-image-picker (from `../node_modules/react-native-image-picker`)
   - "react-native-netinfo (from `../node_modules/@react-native-community/netinfo`)"
@@ -2403,8 +2381,6 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/ReactCommon/react/nativemodule/microtasks"
   react-native-blob-util:
     :path: "../node_modules/react-native-blob-util"
-  react-native-cameraroll:
-    :path: "../node_modules/@react-native-camera-roll/camera-roll"
   react-native-document-picker:
     :path: "../node_modules/react-native-document-picker"
   react-native-image-picker:
@@ -2500,7 +2476,7 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   boost: 1dca942403ed9342f98334bf4c3621f011aa7946
-  DoubleConversion: 76ab83afb40bddeeee456813d9c04f67f78771b5
+  DoubleConversion: f16ae600a246532c4020132d54af21d0ddb2a385
   FBLazyVector: 7075bb12898bc3998fd60f4b7ca422496cc2cdf7
   Firebase: 91fefd38712feb9186ea8996af6cbdef41473442
   FirebaseAnalytics: b5efc493eb0f40ec560b04a472e3e1a15d39ca13
@@ -2514,7 +2490,7 @@ SPEC CHECKSUMS:
   FirebaseRemoteConfigInterop: 6efda51fb5e2f15b16585197e26eaa09574e8a4d
   FirebaseSessions: dbd14adac65ce996228652c1fc3a3f576bdf3ecc
   fmt: 10c6e61f4be25dc963c36bd73fc7b1705fe975be
-  glog: 69ef571f3de08433d766d614c73a9838a06bf7eb
+  glog: 08b301085f15bcbb6ff8632a8ebaf239aae04e6a
   GoogleAppMeasurement: f3abf08495ef2cba7829f15318c373b8d9226491
   GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a
   GoogleUtilities: ea963c370a38a8069cc5f7ba4ca849a60b6d7d15
@@ -2555,7 +2531,6 @@ SPEC CHECKSUMS:
   React-Mapbuffer: 858e7be7b51da78fd6a12b2461d92ea44e88c0f2
   React-microtasksnativemodule: a221789bbd16b09f083a60a4bec8623e2dfbb59f
   react-native-blob-util: 356047c561b3506396852bc0d7988243f74dd77d
-  react-native-cameraroll: 1f91168f2e07c0cd971e181dbf86ee40dd685ac3
   react-native-document-picker: 1e082836a633ca9e7c75758036ff42535baaf36b
   react-native-image-picker: df6597d4b1878a443796be11eb2b7286ed10ece6
   react-native-netinfo: 076df4f9b07f6670acf4ce9a75aac8d34c2e2ccc