Merge branch 'main' into dependabot/github_actions/ruby/setup-ruby-1.…

…187.0

.github/workflows/flutter_integration_test.yml

@@ -62,7 +62,7 @@ jobs:
 
       - name: create AVD and generate snapshot for caching
         if: steps.avd-cache.outputs.cache-hit != 'true'
-        uses: reactivecircus/android-emulator-runner@77986be26589807b8ebab3fde7bbf5c60dabec32 #pin@v2.31.0
+        uses: reactivecircus/android-emulator-runner@f0d1ed2dcad93c7479e8b2f2226c83af54494915 #pin@v2.32.0
         with:
           working-directory: ./flutter/example
           api-level: 21
@@ -74,7 +74,7 @@ jobs:
           script: echo 'Generated AVD snapshot for caching.'
 
       - name: launch android emulator & run android integration test
-        uses: reactivecircus/android-emulator-runner@77986be26589807b8ebab3fde7bbf5c60dabec32 #pin@v2.31.0
+        uses: reactivecircus/android-emulator-runner@f0d1ed2dcad93c7479e8b2f2226c83af54494915 #pin@v2.32.0
         with:
           working-directory: ./flutter/example
           api-level: 21

.github/workflows/flutter_test.yml

@@ -67,7 +67,7 @@ jobs:
 
       - name: create AVD and generate snapshot for caching
         if: steps.avd-cache.outputs.cache-hit != 'true'
-        uses: reactivecircus/android-emulator-runner@77986be26589807b8ebab3fde7bbf5c60dabec32 #pin@v2.31.0
+        uses: reactivecircus/android-emulator-runner@f0d1ed2dcad93c7479e8b2f2226c83af54494915 #pin@v2.32.0
         with:
           working-directory: ./flutter/example
           api-level: 31
@@ -84,7 +84,7 @@ jobs:
         run: flutter build apk --debug
 
       - name: launch android emulator & run android native test
-        uses: reactivecircus/android-emulator-runner@77986be26589807b8ebab3fde7bbf5c60dabec32 #pin@v2.31.0
+        uses: reactivecircus/android-emulator-runner@f0d1ed2dcad93c7479e8b2f2226c83af54494915 #pin@v2.32.0
         with:
           working-directory: ./flutter/example/android
           api-level: 31
@@ -97,7 +97,7 @@ jobs:
           script: ./gradlew testDebugUnitTest
 
       - name: launch android emulator & run android integration test
-        uses: reactivecircus/android-emulator-runner@77986be26589807b8ebab3fde7bbf5c60dabec32 #pin@v2.31.0
+        uses: reactivecircus/android-emulator-runner@f0d1ed2dcad93c7479e8b2f2226c83af54494915 #pin@v2.32.0
         with:
           working-directory: ./flutter/example
           api-level: 31

CHANGELOG.md

@@ -2,8 +2,26 @@
 
 ## Unreleased
 
+### Dependencies
+
+- Bump Android SDK from v7.11.0 to v7.12.0 ([#2173](https://github.com/getsentry/sentry-dart/pull/2173))
+  - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#7120)
+  - [diff](https://github.com/getsentry/sentry-java/compare/7.11.0...7.12.0)
+  - updates AGP to v7.4.2
+  - updates Kotlin to v1.8.0
+- Bump Cocoa SDK from v8.30.1 to v8.31.1 ([#2174](https://github.com/getsentry/sentry-dart/pull/2174))
+  - [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#8311)
+  - [diff](https://github.com/getsentry/sentry-cocoa/compare/8.30.1...8.31.1)
+
+## 8.4.0
+
 ### Features
 
+- Add API for pausing/resuming **iOS** and **macOS** app hang tracking ([#2134](https://github.com/getsentry/sentry-dart/pull/2134))
+  - This is useful to prevent the Cocoa SDK from reporting wrongly detected app hangs when the OS shows a system dialog for asking specific permissions.
+  - Use `SentryFlutter.pauseAppHangTracking()` and `SentryFlutter.resumeAppHangTracking()`
+- Capture total frames, frames delay, slow & frozen frames and attach to spans ([#2106](https://github.com/getsentry/sentry-dart/pull/2106))
+- Support WebAssembly compilation (dart2wasm) ([#2113](https://github.com/getsentry/sentry-dart/pull/2113))
 - Add flag to disable reporting of view hierarchy identifiers ([#2158](https://github.com/getsentry/sentry-dart/pull/2158))
   - Use `reportViewHierarchyIdentifiers` to enable or disable the option
 - Record dropped spans in client reports ([#2154](https://github.com/getsentry/sentry-dart/pull/2154))
@@ -26,9 +44,13 @@
 - Bump Cocoa SDK from v8.30.0 to v8.30.1 ([#2155](https://github.com/getsentry/sentry-dart/pull/2155))
   - [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#8301)
   - [diff](https://github.com/getsentry/sentry-cocoa/compare/8.30.0...8.30.1)
+- Bump Android SDK from v7.10.0 to v7.11.0 ([#2144](https://github.com/getsentry/sentry-dart/pull/2144))
+  - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#7110)
+  - [diff](https://github.com/getsentry/sentry-java/compare/7.10.0...7.11.0)
 
 ### Deprecated
 
+- User segment is now deprecated and will be removed in version 9.0.0. Use a custom tag or context instead. ([#2119](https://github.com/getsentry/sentry-dart/pull/2119))
 - Deprecate `setExtra` and `removeExtra` ([#2159](https://github.com/getsentry/sentry-dart/pull/2159))
   - Use the `Contexts` structure via `setContexts` instead
 
@@ -51,9 +73,6 @@
 - Bump Cocoa SDK from v8.29.0 to v8.30.0 ([#2132](https://github.com/getsentry/sentry-dart/pull/2132))
   - [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#8300)
   - [diff](https://github.com/getsentry/sentry-cocoa/compare/8.29.0...8.30.0)
-- Bump Android SDK from v7.10.0 to v7.11.0 ([#2144](https://github.com/getsentry/sentry-dart/pull/2144))
-  - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#7110)
-  - [diff](https://github.com/getsentry/sentry-java/compare/7.10.0...7.11.0)
 
 ## 8.3.0
 

dart/lib/src/version.dart

@@ -9,7 +9,7 @@
 library version;
 
 /// The SDK version reported to Sentry.io in the submitted events.
-const String sdkVersion = '8.4.0-beta.1';
+const String sdkVersion = '8.4.0';
 
 String sdkName(bool isWeb) => isWeb ? _browserSdkName : _ioSdkName;
 

dart/pubspec.yaml

@@ -1,5 +1,5 @@
 name: sentry
-version: 8.4.0-beta.1
+version: 8.4.0
 description: >
   A crash reporting library for Dart that sends crash reports to Sentry.io.
   This library supports Dart VM and Web. For Flutter consider sentry_flutter instead.

dio/lib/src/version.dart

@@ -1,5 +1,5 @@
 /// The SDK version reported to Sentry.io in the submitted events.
-const String sdkVersion = '8.4.0-beta.1';
+const String sdkVersion = '8.4.0';
 
 /// The package name reported to Sentry.io in the submitted events.
 const String packageName = 'pub:sentry_dio';

dio/pubspec.yaml

@@ -1,6 +1,6 @@
 name: sentry_dio
 description: An integration which adds support for performance tracing for the Dio package.
-version: 8.4.0-beta.1
+version: 8.4.0
 homepage: https://docs.sentry.io/platforms/dart/
 repository: https://github.com/getsentry/sentry-dart
 issue_tracker: https://github.com/getsentry/sentry-dart/issues
@@ -19,7 +19,7 @@ platforms:
 
 dependencies:
   dio: ^5.0.0
-  sentry: 8.4.0-beta.1
+  sentry: 8.4.0
 
 dev_dependencies:
   meta: ^1.3.0

drift/lib/src/version.dart

@@ -1,5 +1,5 @@
 /// The SDK version reported to Sentry.io in the submitted events.
-const String sdkVersion = '8.4.0-beta.1';
+const String sdkVersion = '8.4.0';
 
 /// The package name reported to Sentry.io in the submitted events.
 const String packageName = 'pub:sentry_drift';

drift/pubspec.yaml

@@ -1,6 +1,6 @@
 name: sentry_drift
 description: An integration which adds support for performance tracing for the drift package.
-version: 8.4.0-beta.1
+version: 8.4.0
 homepage: https://docs.sentry.io/platforms/flutter/
 repository: https://github.com/getsentry/sentry-dart
 issue_tracker: https://github.com/getsentry/sentry-dart/issues
@@ -17,7 +17,7 @@ platforms:
   web:
 
 dependencies:
-  sentry: 8.4.0-beta.1
+  sentry: 8.4.0
   meta: ^1.3.0
   drift: ^2.13.0
 

file/lib/src/version.dart

@@ -1,5 +1,5 @@
 /// The SDK version reported to Sentry.io in the submitted events.
-const String sdkVersion = '8.4.0-beta.1';
+const String sdkVersion = '8.4.0';
 
 /// The package name reported to Sentry.io in the submitted events.
 const String packageName = 'pub:sentry_file';

file/pubspec.yaml

@@ -1,6 +1,6 @@
 name: sentry_file
 description: An integration which adds support for performance tracing for dart.io.File.
-version: 8.4.0-beta.1
+version: 8.4.0
 homepage: https://docs.sentry.io/platforms/dart/
 repository: https://github.com/getsentry/sentry-dart
 issue_tracker: https://github.com/getsentry/sentry-dart/issues
@@ -17,7 +17,7 @@ platforms:
   windows:
 
 dependencies:
-  sentry: 8.4.0-beta.1
+  sentry: 8.4.0
   meta: ^1.3.0
 
 dev_dependencies:

flutter/android/build.gradle

@@ -1,12 +1,12 @@
 buildscript {
-    ext.kotlin_version = '1.6.21'
+    ext.kotlin_version = '1.8.0'
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.2'
+        classpath 'com.android.tools.build:gradle:7.4.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -60,7 +60,7 @@ android {
 }
 
 dependencies {
-    api 'io.sentry:sentry-android:7.11.0'
+    api 'io.sentry:sentry-android:7.12.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 
     // Required -- JUnit 4 framework

flutter/android/gradle.properties

@@ -1 +1,2 @@
 org.gradle.jvmargs=-Xmx1536M
+android.useAndroidX=true

flutter/example/android/build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.6.21'
+    ext.kotlin_version = '1.8.0'
 
     repositories {
         google()
@@ -8,7 +8,7 @@ buildscript {
 
     dependencies {
         classpath 'io.sentry:sentry-android-gradle-plugin:4.5.0'
-        classpath 'com.android.tools.build:gradle:7.2.2'
+        classpath 'com.android.tools.build:gradle:7.4.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'io.github.howardpang:androidNativeBundle:1.1.3'
     }

flutter/example/pubspec.yaml

@@ -1,6 +1,6 @@
 name: sentry_flutter_example
 description: Demonstrates how to use the sentry_flutter plugin.
-version: 8.4.0-beta.1
+version: 8.4.0
 
 publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 

flutter/ios/sentry_flutter.podspec

@@ -16,7 +16,7 @@ Sentry SDK for Flutter with support to native through sentry-cocoa.
                          :tag => s.version.to_s }
   s.source_files     = 'Classes/**/*'
   s.public_header_files = 'Classes/**/*.h'
-  s.dependency 'Sentry/HybridSDK', '8.30.1'
+  s.dependency 'Sentry/HybridSDK', '8.31.1'
   s.ios.dependency 'Flutter'
   s.osx.dependency 'FlutterMacOS'
   s.ios.deployment_target = '12.0'

flutter/lib/src/version.dart

@@ -1,5 +1,5 @@
 /// The SDK version reported to Sentry.io in the submitted events.
-const String sdkVersion = '8.4.0-beta.1';
+const String sdkVersion = '8.4.0';
 
 /// The default SDK name reported to Sentry.io in the submitted events.
 const String sdkName = 'sentry.dart.flutter';

flutter/pubspec.yaml

@@ -1,5 +1,5 @@
 name: sentry_flutter
-version: 8.4.0-beta.1
+version: 8.4.0
 description: Sentry SDK for Flutter. This package aims to support different Flutter targets by relying on the many platforms supported by Sentry with native SDKs.
 homepage: https://docs.sentry.io/platforms/flutter/
 repository: https://github.com/getsentry/sentry-dart
@@ -23,7 +23,7 @@ dependencies:
     sdk: flutter
   flutter_web_plugins:
     sdk: flutter
-  sentry: 8.4.0-beta.1
+  sentry: 8.4.0
   package_info_plus: '>=1.0.0'
   meta: ^1.3.0
   ffi: ^2.0.0

flutter/scripts/generate-cocoa-bindings.sh

@@ -33,7 +33,9 @@ subdir="Sentry.xcframework/macos-arm64_x86_64/Sentry.framework"
 unzip -q $temp/Sentry.xcframework.zip "$subdir/*" -d $temp
 mv "$temp/$subdir" $temp/Sentry.framework
 
+binding="lib/src/native/cocoa/binding.dart"
 dart run ffigen --config ffi-cocoa.yaml
-sed -i.bak 's|final class|class|g' lib/src/native/cocoa/binding.dart
-sed -i.bak 's|static int startProfilerForTrace_(SentryCocoa _lib, SentryId? traceId)|static int startProfilerForTrace_(SentryCocoa _lib, SentryId1? traceId)|g' lib/src/native/cocoa/binding.dart
-rm lib/src/native/cocoa/binding.dart.bak
+sed -i.bak 's|final class|class|g' $binding
+sed -i.bak 's|static int startProfilerForTrace_(SentryCocoa _lib, SentryId? traceId)|static int startProfilerForTrace_(SentryCocoa _lib, SentryId1? traceId)|g' $binding
+rm $binding.bak
+dart format $binding

hive/lib/src/version.dart

@@ -1,5 +1,5 @@
 /// The SDK version reported to Sentry.io in the submitted events.
-const String sdkVersion = '8.4.0-beta.1';
+const String sdkVersion = '8.4.0';
 
 /// The package name reported to Sentry.io in the submitted events.
 const String packageName = 'pub:sentry_hive';

hive/pubspec.yaml

@@ -1,6 +1,6 @@
 name: sentry_hive
 description: An integration which adds support for performance tracing for the hive package.
-version: 8.4.0-beta.1
+version: 8.4.0
 homepage: https://docs.sentry.io/platforms/flutter/
 repository: https://github.com/getsentry/sentry-dart
 issue_tracker: https://github.com/getsentry/sentry-dart/issues
@@ -17,7 +17,7 @@ platforms:
   web:
 
 dependencies:
-  sentry: 8.4.0-beta.1
+  sentry: 8.4.0
   hive: ^2.2.3
   meta: ^1.3.0
 

isar/lib/src/version.dart

@@ -1,5 +1,5 @@
 /// The SDK version reported to Sentry.io in the submitted events.
-const String sdkVersion = '8.4.0-beta.1';
+const String sdkVersion = '8.4.0';
 
 /// The package name reported to Sentry.io in the submitted events.
 const String packageName = 'pub:sentry_isar';

isar/pubspec.yaml

@@ -1,6 +1,6 @@
 name: sentry_isar
 description: An integration which adds support for performance tracing for the isar package.
-version: 8.4.0-beta.1
+version: 8.4.0
 homepage: https://docs.sentry.io/platforms/flutter/
 repository: https://github.com/getsentry/sentry-dart
 issue_tracker: https://github.com/getsentry/sentry-dart/issues
@@ -20,7 +20,7 @@ platforms:
 dependencies:
   isar: ^3.1.0
   isar_flutter_libs: ^3.1.0 # contains Isar Core
-  sentry: 8.4.0-beta.1
+  sentry: 8.4.0
   meta: ^1.3.0
   path: ^1.8.3
 

logging/lib/src/version.dart

@@ -1,5 +1,5 @@
 /// The SDK version reported to Sentry.io in the submitted events.
-const String sdkVersion = '8.4.0-beta.1';
+const String sdkVersion = '8.4.0';
 
 /// The package name reported to Sentry.io in the submitted events.
 const String packageName = 'pub:sentry_logging';

logging/pubspec.yaml

@@ -1,6 +1,6 @@
 name: sentry_logging
 description: An integration which adds support for recording log from the logging package.
-version: 8.4.0-beta.1
+version: 8.4.0
 homepage: https://docs.sentry.io/platforms/dart/
 repository: https://github.com/getsentry/sentry-dart
 issue_tracker: https://github.com/getsentry/sentry-dart/issues
@@ -19,7 +19,7 @@ platforms:
 
 dependencies:
   logging: ^1.0.0
-  sentry: 8.4.0-beta.1
+  sentry: 8.4.0
 
 dev_dependencies:
   lints: ^4.0.0

min_version_test/android/build.gradle

@@ -1,12 +1,12 @@
 buildscript {
-    ext.kotlin_version = '1.6.21'
+    ext.kotlin_version = '1.8.0'
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.2'
+        classpath 'com.android.tools.build:gradle:7.4.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

sqflite/lib/src/version.dart

@@ -1,5 +1,5 @@
 /// The SDK version reported to Sentry.io in the submitted events.
-const String sdkVersion = '8.4.0-beta.1';
+const String sdkVersion = '8.4.0';
 
 /// The package name reported to Sentry.io in the submitted events.
 const String packageName = 'pub:sentry_sqflite';

sqflite/pubspec.yaml

@@ -1,6 +1,6 @@
 name: sentry_sqflite
 description: An integration which adds support for performance tracing for the sqflite package.
-version: 8.4.0-beta.1
+version: 8.4.0
 homepage: https://docs.sentry.io/platforms/flutter/
 repository: https://github.com/getsentry/sentry-dart
 issue_tracker: https://github.com/getsentry/sentry-dart/issues
@@ -15,7 +15,7 @@ platforms:
   macos:
 
 dependencies:
-  sentry: 8.4.0-beta.1
+  sentry: 8.4.0
   sqflite: ^2.2.8
   sqflite_common: ^2.0.0
   meta: ^1.3.0