Merge branch 'main' into alwx/improvement/5868

Author: alwx

.github/workflows/e2e-v2.yml

@@ -232,7 +232,7 @@ jobs:
         platform: ['android', 'ios']
         build-type: ['production']
         ios-use-frameworks: ['no', 'static', 'dynamic']
-        engine: ['hermes', 'jsc']
+        engine: ['hermes']
         include:
           # Use Xcode 16 for older RN versions
           - platform: ios
@@ -245,9 +245,6 @@ jobs:
           - platform: android
             runs-on: ["ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04", "runner_group_id:10"]
         exclude:
-          # exclude JSC for new RN versions (keeping the matrix manageable)
-          - rn-version: '0.84.0'
-            engine: 'jsc'
           # exclude all rn versions lower than 0.80.0 for new architecture
           - rn-version: '0.71.19'
             rn-architecture: 'new'

dev-packages/e2e-tests/package.json

@@ -17,9 +17,9 @@
     "@sentry/react-native": "8.5.0",
     "@types/node": "^20.9.3",
     "@types/react": "^18.2.64",
-    "appium": "2.4.1",
-    "appium-uiautomator2-driver": "2.43.4",
-    "appium-xcuitest-driver": "5.15.1",
+    "appium": "3.2.2",
+    "appium-uiautomator2-driver": "7.0.0",
+    "appium-xcuitest-driver": "10.32.1",
     "babel-jest": "^29.7.0",
     "jest": "^29.7.0",
     "react": "18.3.1",

package.json

@@ -59,14 +59,12 @@
     "See: https://github.com/appium/appium-chromedriver/pull/424"
   ],
   "resolutions": {
-    "appium-chromedriver@npm:5.6.73/@xmldom/xmldom": "0.8.10",
+    "appium-chromedriver@npm:8.2.19/@xmldom/xmldom": "0.8.10",
     "@istanbuljs/load-nyc-config@npm:1.1.0/js-yaml": "^3.14.2",
     "@yarnpkg/parsers@npm:3.0.0-rc.46/js-yaml": "^3.14.2",
     "cosmiconfig@npm:5.2.1/js-yaml": "^3.14.2",
     "front-matter@npm:4.0.2/js-yaml": "^3.14.2",
     "js-yaml": "^4.1.1",
-    "ajv-formats@npm:2.1.1/ajv": "^8.18.0",
-    "appium@npm:2.4.1/ajv": "^8.18.0",
     "detox@npm:20.46.0/ajv": "^8.18.0",
     "@eslint/eslintrc@npm:2.1.4/ajv": "^6.14.0",
     "@eslint/eslintrc@npm:3.3.3/ajv": "^6.14.0",
@@ -130,7 +128,8 @@
     "on-headers": "^1.1.0",
     "diff": "^5.2.2",
     "tar": "^7.5.11",
-    "tmp": "^0.2.4"
+    "tmp": "^0.2.4",
+    "@appium/support@npm:6.1.1/yauzl": "^3.2.1"
   },
   "version": "0.0.0",
   "name": "sentry-react-native",

samples/react-native-macos/Gemfile

@@ -4,5 +4,5 @@ source 'https://rubygems.org'
 ruby "3.3.0"
 
 gem 'cocoapods', '1.15.2'
-gem 'activesupport', '>= 6.1.7.5', '< 7.1.0'
+gem 'activesupport', '>= 6.1.7.5', '< 7.3.0'
 gem 'fastlane', '2.220.0'

samples/react-native-macos/Gemfile.lock

@@ -5,11 +5,18 @@ GEM
       base64
       nkf
       rexml
-    activesupport (7.0.8.6)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+    activesupport (7.2.3.1)
+      base64
+      benchmark (>= 0.3)
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.3.1)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
-      minitest (>= 5.1)
-      tzinfo (~> 2.0)
+      logger (>= 1.4.2)
+      minitest (>= 5.1, < 6)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
     algoliasearch (1.27.5)
@@ -38,6 +45,7 @@ GEM
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
     base64 (0.2.0)
+    benchmark (0.5.0)
     bigdecimal (4.0.1)
     claide (1.1.0)
     cocoapods (1.15.2)
@@ -81,12 +89,14 @@ GEM
     colored2 (3.1.2)
     commander (4.6.0)
       highline (~> 2.0.0)
-    concurrent-ruby (1.3.4)
+    concurrent-ruby (1.3.6)
+    connection_pool (3.0.2)
     declarative (0.0.20)
     digest-crc (0.6.5)
       rake (>= 12.0.0, < 14.0.0)
     domain_name (0.6.20240107)
     dotenv (2.8.1)
+    drb (2.2.3)
     emoji_regex (3.2.3)
     escape (0.0.4)
     ethon (0.16.0)
@@ -208,7 +218,7 @@ GEM
     http-cookie (1.0.7)
       domain_name (~> 0.5)
     httpclient (2.8.3)
-    i18n (1.14.6)
+    i18n (1.14.8)
       concurrent-ruby (~> 1.0)
     jmespath (1.6.2)
     json (2.7.3)
@@ -217,7 +227,7 @@ GEM
     logger (1.7.0)
     mini_magick (4.13.2)
     mini_mime (1.1.5)
-    minitest (5.25.1)
+    minitest (5.27.0)
     molinillo (0.8.0)
     multi_json (1.15.0)
     multipart-post (2.4.1)
@@ -241,6 +251,7 @@ GEM
     ruby-macho (2.5.1)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
+    securerandom (0.4.1)
     security (0.1.5)
     signet (0.19.0)
       addressable (~> 2.8)
@@ -284,7 +295,7 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  activesupport (>= 6.1.7.5, < 7.1.0)
+  activesupport (>= 6.1.7.5, < 7.3.0)
   cocoapods (= 1.15.2)
   fastlane (= 2.220.0)
 

samples/react-native/Gemfile

@@ -4,7 +4,7 @@ source 'https://rubygems.org'
 # ruby "3.4.0"
 
 gem 'cocoapods', '1.15.2'
-gem 'activesupport', '>= 6.1.7.5', '< 7.1.0'
+gem 'activesupport', '>= 6.1.7.5', '< 7.3.0'
 gem 'fastlane', '2.220.0'
 gem 'xcodeproj', '< 1.26.0'
 

samples/react-native/Gemfile.lock

@@ -6,12 +6,18 @@ GEM
       nkf
       rexml
     abbrev (0.1.2)
-    activesupport (6.1.7.10)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+    activesupport (7.2.3.1)
+      base64
+      benchmark (>= 0.3)
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.3.1)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
-      minitest (>= 5.1)
-      tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
+      logger (>= 1.4.2)
+      minitest (>= 5.1, < 6)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
     algoliasearch (1.27.5)
@@ -84,14 +90,16 @@ GEM
     colored2 (3.1.2)
     commander (4.6.0)
       highline (~> 2.0.0)
-    concurrent-ruby (1.3.4)
+    concurrent-ruby (1.3.6)
+    connection_pool (3.0.2)
     csv (3.3.5)
     declarative (0.0.20)
     digest-crc (0.6.5)
       rake (>= 12.0.0, < 14.0.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     dotenv (2.8.1)
+    drb (2.2.3)
     emoji_regex (3.2.3)
     escape (0.0.4)
     ethon (0.16.0)
@@ -212,7 +220,7 @@ GEM
     http-cookie (1.0.8)
       domain_name (~> 0.5)
     httpclient (2.8.3)
-    i18n (1.14.6)
+    i18n (1.14.8)
       concurrent-ruby (~> 1.0)
     jmespath (1.6.2)
     json (2.7.3)
@@ -222,7 +230,7 @@ GEM
     memoist (0.16.2)
     mini_magick (4.13.2)
     mini_mime (1.1.5)
-    minitest (5.25.1)
+    minitest (5.27.0)
     molinillo (0.8.0)
     multi_json (1.15.0)
     multipart-post (2.4.1)
@@ -248,6 +256,7 @@ GEM
     ruby-macho (2.5.1)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
+    securerandom (0.4.1)
     security (0.1.5)
     signet (0.18.0)
       addressable (~> 2.8)
@@ -284,7 +293,6 @@ GEM
       rouge (~> 2.0.7)
     xcpretty-travis-formatter (1.0.1)
       xcpretty (~> 0.2, >= 0.0.7)
-    zeitwerk (2.6.18)
 
 PLATFORMS
   arm64-darwin-22
@@ -295,7 +303,7 @@ PLATFORMS
 
 DEPENDENCIES
   abbrev
-  activesupport (>= 6.1.7.5, < 7.1.0)
+  activesupport (>= 6.1.7.5, < 7.3.0)
   benchmark
   bigdecimal
   cocoapods (= 1.15.2)