Merge branch 'main' into antonis/3995-appLaunchedInForeground

getsentry · Oct 9, 2024 · f632e1c · f632e1c
2 parents 94123f4 + f31859f
commit f632e1c
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,9 @@
 - Bump CLI from v2.36.6 to v2.37.0 ([#4153](https://github.com/getsentry/sentry-react-native/pull/4153))
   - [changelog](https://github.com/getsentry/sentry-cli/blob/master/CHANGELOG.md#2370)
   - [diff](https://github.com/getsentry/sentry-cli/compare/2.36.6...2.37.0)
+- Bump Cocoa SDK from v8.36.0 to v8.37.0 ([#4156](https://github.com/getsentry/sentry-react-native/pull/4156))
+  - [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#8370)
+  - [diff](https://github.com/getsentry/sentry-cocoa/compare/8.36.0...8.37.0)
 
 ## 5.33.2
 

diff --git a/README.md b/README.md
@@ -19,6 +19,14 @@ _Bad software is everywhere, and we're tired of it. Sentry is on a mission to he
 [![Discord Chat](https://img.shields.io/discord/621778831602221064?logo=discord&logoColor=ffffff&color=7389D8)](https://discord.gg/PXa5Apfe7K)
 [![Runs with Expo](https://img.shields.io/badge/Runs%20with%20Expo-4630EB.svg?style=flat-square&logo=EXPO&labelColor=f3f3f3&logoColor=000)](https://expo.dev/)
 
+## Releases
+
+This repo uses the following ways to release SDK updates:
+
+- `Pre-release`: We create pre-releases (alpha, beta, RC,…) for larger and potentially more impactful changes, such as new features or major versions.
+- `Latest`: We continuously release major/minor/hotfix versions from the `main` branch. These releases go through all our internal quality gates and are very safe to use and intended to be the default for most teams.
+- `Stable`: We promote releases from `Latest` when they have been used in the field for some time and in scale, considering time since release, adoption, and other quality and stability metrics. These releases will be indicated on [the releases page](https://github.com/getsentry/sentry-react-native/releases/) with the `Stable` suffix.
+
 ## Requirements
 
 - `react-native >= 0.65.0`

diff --git a/RNSentry.podspec b/RNSentry.podspec
@@ -37,7 +37,7 @@ Pod::Spec.new do |s|
 
   s.compiler_flags = other_cflags
 
-  s.dependency 'Sentry/HybridSDK', '8.36.0'
+  s.dependency 'Sentry/HybridSDK', '8.37.0'
 
   if defined? install_modules_dependencies
     # Default React Native dependencies for 0.71 and above (new and legacy architecture)

diff --git a/samples/react-native/android/app/build.gradle b/samples/react-native/android/app/build.gradle
@@ -146,6 +146,39 @@ android {
             keyPassword 'android'
         }
     }
+
+    if (System.getenv('SENTRY_SAMPLE_ENABLE_ABI_SPLIT') == 'true') {
+      splits {
+          abi {
+              enable true
+              reset()
+              include 'x86', 'arm64-v8a'
+              universalApk true
+          }
+      }
+      project.ext.versionCodes = ['armeabi': 1, 'armeabi-v7a': 2, 'arm64-v8a': 3, 'mips': 5, 'mips64': 6, 'x86': 8, 'x86_64': 9]
+      android.applicationVariants.all { variant ->
+          variant.outputs.each { output ->
+              output.versionCodeOverride =
+                  project.ext.versionCodes.get(output.getFilter(
+                      com.android.build.OutputFile.ABI), 0) * 10000000 + android.defaultConfig.versionCode
+          }
+      }
+    }
+
+    if (System.getenv('SENTRY_SAMPLE_ENABLE_FLAVORS') == 'true') {
+      flavorDimensions "version"
+      productFlavors {
+        regular {
+            dimension "version"
+        }
+        demo {
+            dimension "version"
+            applicationIdSuffix "demo"
+        }
+      }
+    }
+
     buildTypes {
         debug {
             signingConfig signingConfigs.debug

diff --git a/samples/react-native/package.json b/samples/react-native/package.json
@@ -17,7 +17,8 @@
     "clean-watchman": "watchman watch-del-all",
     "set-build-number": "npx react-native-version --skip-tag --never-amend --set-build",
     "set-version": "npm version --no-git-tag-version",
-    "postversion": "npx react-native-version --skip-tag --never-amend"
+    "postversion": "npx react-native-version --skip-tag --never-amend",
+    "build-android-release-splits-flavors": "export SENTRY_SAMPLE_ENABLE_ABI_SPLIT=true; export SENTRY_SAMPLE_ENABLE_FLAVORS=true; cd android; ./gradlew assembleRelease; cd .."
   },
   "dependencies": {
     "@react-navigation/bottom-tabs": "^6.5.12",