Merge d0a8a29 into a615e7e

.github/workflows/codegen.yml

@@ -28,7 +28,8 @@ jobs:
  cd samples/react-native/ios
  node ../node_modules/react-native/scripts/generate-codegen-artifacts.js \
  --path .. \
- --outputPath codegen
+ --outputPath codegen \
+ --targetPlatform ios
  steps:
  - uses: actions/checkout@v4
  - run: corepack enable

.github/workflows/e2e.yml

@@ -164,15 +164,15 @@ jobs:
  strategy:
  fail-fast: false # keeps matrix running if one fails
  matrix:
- rn-version: ['0.65.3', '0.73.9']
+ rn-version: ['0.65.3', '0.75.4']
  rn-architecture: ['legacy', 'new']
  platform: ['android', 'ios']
  build-type: ['production']
  ios-use-frameworks: ['no', 'static', 'dynamic']
  engine: ['hermes', 'jsc']
  include:
  - platform: ios
- rn-version: '0.73.9'
+ rn-version: '0.75.4'
  runs-on: macos-14 # uses m1 https://github.blog/changelog/2024-01-30-github-actions-macos-14-sonoma-is-now-available/
  runtime: 'latest'
  device: 'iPhone 14'
@@ -185,7 +185,7 @@ jobs:
  runs-on: ubuntu-latest
  exclude:
  # exclude JSC for new RN versions (keeping the matrix manageable)
- - rn-version: '0.73.9'
+ - rn-version: '0.75.4'
  engine: 'jsc'
  # exclude all rn versions lower than 0.70.0 for new architecture
  - rn-version: '0.65.3'
@@ -304,15 +304,15 @@ jobs:
  strategy:
  fail-fast: false # keeps matrix running if one fails
  matrix:
- rn-version: ['0.65.3', '0.73.9']
+ rn-version: ['0.65.3', '0.75.4']
  rn-architecture: ['legacy', 'new']
  platform: ['android', 'ios']
  build-type: ['production']
  ios-use-frameworks: ['no'] # test only no framworks
  engine: ['hermes', 'jsc']
  include:
  - platform: ios
- rn-version: '0.73.9'
+ rn-version: '0.75.4'
  runs-on: macos-14 # uses m1 https://github.blog/changelog/2024-01-30-github-actions-macos-14-sonoma-is-now-available/
  runtime: 'latest'
  device: 'iPhone 14'
@@ -330,10 +330,10 @@ jobs:
  # e2e test only the default combinations
  - rn-version: '0.65.3'
  engine: 'hermes'
- - rn-version: '0.73.9'
+ - rn-version: '0.75.4'
  engine: 'jsc'
  # E2E timeout due to a race condition https://github.com/facebook/react-native/issues/42123#issuecomment-1881203719
- - rn-version: '0.73.9'
+ - rn-version: '0.75.4'
  platform: 'ios'
  rn-architecture: 'new'
  env:

.github/workflows/sample-application.yml

@@ -103,7 +103,6 @@ jobs:
  [[ "${{ matrix.platform }}" == "ios" ]] && cd react-native/ios
  [[ "${{ matrix.platform }}" == "macos" ]] && cd react-native-macos/macos
 
- export NO_FLIPPER=1 # Flipper is causing build issues on iOS, so we disable it
  [[ "${{ matrix.build-type }}" == "production" ]] && ENABLE_PROD=1 || ENABLE_PROD=0
  [[ "${{ matrix.rn-architecture }}" == "new" ]] && ENABLE_NEW_ARCH=1 || ENABLE_NEW_ARCH=0
  [[ "${{ matrix.ios-use-frameworks }}" == "dynamic-frameworks" ]] && export USE_FRAMEWORKS=dynamic

.github/workflows/testflight.yml

@@ -39,6 +39,7 @@ jobs:
  - name: Install Dependencies
  if: steps.deps-cache.outputs['cache-hit'] != 'true'
  run: |
+ corepack enable
  yarn install
  cd samples/react-native && yarn install
  - name: Build SDK
@@ -52,7 +53,7 @@ jobs:
 
  - name: Pod Install
  working-directory: samples/react-native/ios
- run: NO_FLIPPER=1 PRODUCTION=1 bundle exec pod install
+ run: PRODUCTION=1 bundle exec pod install
 
  - name: Run Fastlane
  working-directory: samples/react-native

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## Unreleased
+
+### Dependencies
+
+- Upgrade sample and E2E tests to RN 0.75 ([#4155](https://github.com/getsentry/sentry-react-native/pull/4155))
+
 ## 6.0.0-rc.1
 
 ### Fixes

dev-packages/e2e-tests/cli.mjs

@@ -50,11 +50,6 @@ if (!env.USE_FRAMEWORKS || env.USE_FRAMEWORKS === 'no') {
  delete env.USE_FRAMEWORKS;
 }
 
-if (platform == 'ios') {
- // Flipper is causing build issues on iOS, so we disable it
- env.NO_FLIPPER = 1;
-}
-
 const e2eDir = path.resolve(__dirname);
 const e2eTestPackageName = JSON.parse(fs.readFileSync(`${e2eDir}/package.json`, 'utf8')).name;
 const patchScriptsDir = path.resolve(e2eDir, 'patch-scripts');

dev-packages/e2e-tests/package.json

@@ -21,8 +21,8 @@
  "appium-xcuitest-driver": "5.13.0",
  "babel-jest": "^29.7.0",
  "jest": "^29.7.0",
- "react": "18.2.0",
- "react-native": "0.73.9",
+ "react": "18.3.1",
+ "react-native": "0.75.4",
  "typescript": "4.9.5",
  "webdriverio": "^8.27.0"
  },

samples/react-native/.gitignore

@@ -56,7 +56,7 @@ yarn-error.log
 *.jsbundle
 
 # Ruby / CocoaPods
-/ios/Pods/
+**/Pods/
 /vendor/bundle/
 
 # Temporary files created by Metro to check the health of the file watcher

samples/react-native/android/app/build.gradle

@@ -102,6 +102,9 @@ react {
  //
  // The list of flags to pass to the Hermes compiler. By default is "-O", "-output-source-map"
  // hermesFlags = ["-O", "-output-source-map"]
+
+ /* Autolinking */
+ autolinkLibrariesWithApp()
 }
 
 /**
@@ -196,7 +199,6 @@ android {
 dependencies {
  // The version of react-native is set by the React Native Gradle Plugin
  implementation("com.facebook.react:react-android")
- implementation("com.facebook.react:flipper-integration")
 
  if (hermesEnabled.toBoolean()) {
  implementation("com.facebook.react:hermes-android")
@@ -205,8 +207,6 @@ dependencies {
  }
 }
 
-apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)
-
 if (newArchEnabled.toBoolean()) {
  android {
  externalNativeBuild {

samples/react-native/android/app/src/main/AndroidManifest.xml

@@ -8,7 +8,8 @@
  android:icon="@mipmap/ic_launcher"
  android:roundIcon="@mipmap/ic_launcher_round"
  android:allowBackup="false"
- android:theme="@style/AppTheme">
+ android:theme="@style/AppTheme"
+ android:supportsRtl="true">
  <activity
  android:name=".MainActivity"
  android:label="@string/app_name"

samples/react-native/android/app/src/main/java/io/sentry/reactnative/sample/MainApplication.kt

@@ -9,7 +9,6 @@ import com.facebook.react.ReactPackage
 import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.load
 import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost
 import com.facebook.react.defaults.DefaultReactNativeHost
-import com.facebook.react.flipper.ReactNativeFlipper
 import com.facebook.soloader.SoLoader
 import io.sentry.Hint
 import io.sentry.SentryEvent
@@ -34,7 +33,7 @@ class MainApplication() : Application(), ReactApplication {
  }
 
  override val reactHost: ReactHost
- get() = getDefaultReactHost(this.applicationContext, reactNativeHost)
+ get() = getDefaultReactHost(applicationContext, reactNativeHost)
 
  override fun onCreate() {
  super.onCreate()
@@ -46,7 +45,6 @@ class MainApplication() : Application(), ReactApplication {
  // If you opted-in for the New Architecture, we load the native entry point for this app.
  load()
  }
- ReactNativeFlipper.initializeFlipper(this, reactNativeHost.reactInstanceManager)
  }
 
  private fun initializeSentry() {

samples/react-native/android/build.gradle

@@ -2,11 +2,11 @@
 buildscript {
  ext {
  buildToolsVersion = "34.0.0"
- minSdkVersion = 21
+ minSdkVersion = 23
  compileSdkVersion = 34
  targetSdkVersion = 34
- ndkVersion = "25.1.8937393"
- kotlinVersion = "1.8.0"
+ ndkVersion = "26.1.10909125"
+ kotlinVersion = "1.9.24"
  }
  repositories {
  google()

samples/react-native/android/gradle.properties

@@ -22,8 +22,6 @@ org.gradle.logging.level=lifecycle
 # Android operating system, and which are packaged with your app's APK
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
-# Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=true
 
 # Use this property to specify which architecture you want to build.
 # You can also override it from the CLI using

samples/react-native/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

samples/react-native/android/gradlew

@@ -55,7 +55,7 @@
 # Darwin, MinGW, and NonStop.
 #
 # (3) This script is generated from the Groovy template
-# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 # within the Gradle project.
 #
 # You can find Gradle at https://github.com/gradle/gradle/.
@@ -145,15 +145,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
 case $MAX_FD in #(
 max*)
 # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-# shellcheck disable=SC3045
+# shellcheck disable=SC2039,SC3045
 MAX_FD=$( ulimit -H -n ) ||
  warn "Could not query maximum file descriptor limit"
 esac
 case $MAX_FD in #(
 '' | soft) :;; #(
 *)
 # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-# shellcheck disable=SC3045
+# shellcheck disable=SC2039,SC3045
 ulimit -n "$MAX_FD" ||
 warn "Could not set maximum file descriptor limit to $MAX_FD"
 esac
@@ -202,11 +202,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command;
-# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-# shell script including quotes and variable substitutions, so put them in
-#  double quotes to make sure that they get re-expanded; and
-# * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+# and any embedded shellness will be escaped.
+# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#  treated as '${Hostname}' itself on the command line.
 
 set -- \
  "-Dorg.gradle.appname=$APP_BASE_NAME" \

samples/react-native/android/gradlew.bat

@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

samples/react-native/android/settings.gradle

@@ -1,4 +1,6 @@
+pluginManagement { includeBuild("../node_modules/@react-native/gradle-plugin") }
+plugins { id("com.facebook.react.settings") }
+extensions.configure(com.facebook.react.ReactSettingsExtension){ ex -> ex.autolinkLibrariesFromCommand() }
 rootProject.name = 'sentry-react-native-sample'
-apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
 include ':app'
 includeBuild('../node_modules/@react-native/gradle-plugin')

samples/react-native/ios/Podfile

@@ -7,16 +7,6 @@ require Pod::Executable.execute_command('node', ['-p',
 
 platform :ios, min_ios_version_supported
 prepare_react_native_project!
-# If you are using a `react-native-flipper` your iOS build will fail when `NO_FLIPPER=1` is set.
-# because `react-native-flipper` depends on (FlipperKit,...) that will be excluded
-#
-# To fix this you can also exclude `react-native-flipper` using a `react-native.config.js`
-# ```js
-# module.exports = {
-# dependencies: {
-# ...(process.env.NO_FLIPPER ? { 'react-native-flipper': { platforms: { ios: null } } } : {}),
-# ```
-flipper_config = ENV['NO_FLIPPER'] == "1" ? FlipperConfiguration.disabled : FlipperConfiguration.enabled
 linkage = ENV['USE_FRAMEWORKS']
 if linkage != nil
  Pod::UI.puts "Configuring Pod with #{linkage}ally linked Frameworks".green
@@ -39,11 +29,6 @@ target 'sentryreactnativesample' do
 
  use_react_native!(
  :path => config[:reactNativePath],
- # Enables Flipper.
- #
- # Note that if you have use_frameworks! enabled, Flipper will not work and
- # you should disable the next line.
- :flipper_configuration => flipper_config,
  # An absolute path to your application root.
  :app_path => "#{Pod::Config.instance.installation_root}/.."
  )
@@ -62,7 +47,8 @@ target 'sentryreactnativesample' do
  react_native_post_install(
  installer,
  config[:reactNativePath],
- :mac_catalyst_enabled => false
+ :mac_catalyst_enabled => false,
+ # :ccache_enabled => true
  )
  end
 end