Merge branch 'main' into enha/flutter-min-version-test

Author: denrase

CHANGELOG.md

@@ -1,10 +1,18 @@
 # Changelog
 
+## Unreleased
+
+### Fixes
+
+- Disable `enableUserInteractionBreadcrumbs` on Android when `enableAutoNativeBreadcrumbs` is disabled ([#1131](https://github.com/getsentry/sentry-dart/pull/1131))
+
 ## 6.15.1
 
-### Various fixes & improvements
+### Dependencies
 
-- chore(deps): update Flutter SDK (metrics) to v3.3.8 (#1121) by @github-actions
+- Bump Cocoa SDK from v7.30.1 to v7.30.2 ([#1113](https://github.com/getsentry/sentry-dart/pull/1113))
+  - [changelog](https://github.com/getsentry/sentry-cocoa/blob/master/CHANGELOG.md#7302)
+  - [diff](https://github.com/getsentry/sentry-cocoa/compare/7.30.1...7.30.2)
 
 ## 6.15.0
 
@@ -24,9 +32,9 @@
 - Bump Android SDK from v6.6.0 to v6.7.0 ([#1105](https://github.com/getsentry/sentry-dart/pull/1105))
   - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#670)
   - [diff](https://github.com/getsentry/sentry-java/compare/6.6.0...6.7.0)
-- Bump Cocoa SDK from v7.30.0 to v7.30.2 ([#1113](https://github.com/getsentry/sentry-dart/pull/1113))
-  - [changelog](https://github.com/getsentry/sentry-cocoa/blob/master/CHANGELOG.md#7302)
-  - [diff](https://github.com/getsentry/sentry-cocoa/compare/7.30.0...7.30.2)
+- Bump Cocoa SDK from v7.30.0 to v7.30.1 ([#1104](https://github.com/getsentry/sentry-dart/pull/1104))
+  - [changelog](https://github.com/getsentry/sentry-cocoa/blob/master/CHANGELOG.md#7301)
+  - [diff](https://github.com/getsentry/sentry-cocoa/compare/7.30.0...7.30.1)
 
 ## 6.14.0
 

flutter/android/src/main/kotlin/io/sentry/flutter/SentryFlutterPlugin.kt

@@ -131,6 +131,7 @@ class SentryFlutterPlugin : FlutterPlugin, MethodCallHandler, ActivityAware {
         options.isEnableAppLifecycleBreadcrumbs = it
         options.isEnableSystemEventBreadcrumbs = it
         options.isEnableAppComponentBreadcrumbs = it
+        options.isEnableUserInteractionBreadcrumbs = it
       }
       args.getIfNotNull<Int>("maxBreadcrumbs") { options.maxBreadcrumbs = it }
       args.getIfNotNull<Int>("maxCacheItems") { options.maxCacheItems = it }

flutter/ios/Classes/SentryFlutterPluginApple.swift

@@ -205,15 +205,15 @@ public class SentryFlutterPluginApple: NSObject, FlutterPlugin {
 
                 if var sdk = event.sdk, self.isValidSdk(sdk: sdk) {
                     if let packages = arguments["packages"] as? [[String: String]] {
-                        if var sdkPackages = sdk["packages"] as? [[String: String]] {
+                        if let sdkPackages = sdk["packages"] as? [[String: String]] {
                             sdk["packages"] = sdkPackages + packages
                         } else {
                             sdk["packages"] = packages
                         }
                     }
 
                     if let integrations = arguments["integrations"] as? [String] {
-                        if var sdkIntegrations = sdk["integrations"] as? [String] {
+                        if let sdkIntegrations = sdk["integrations"] as? [String] {
                             sdk["integrations"] = sdkIntegrations + integrations
                         } else {
                             sdk["integrations"] = integrations