Merge branch 'v7.0.0' into fix/checks-in-some-tests-broken

denrase · denrase · commit 7aff6acfc7e1 · 2023-03-14T16:50:29.000+01:00
diff --git a/.github/workflows/min_version_test.yml b/.github/workflows/min_version_test.yml
@@ -15,8 +15,7 @@ jobs:
         with:
           access_token: ${{ github.token }}
 
-  build:
-    name: Build
+  build-android:
     runs-on: macos-latest
     timeout-minutes: 30
 
@@ -32,9 +31,25 @@ jobs:
         with:
           flutter-version: '3.0.0'
       # Add flutter build web (missing index)
-      - name: Build
+      - name: Build Android
         run: |
           cd min_version_test
           flutter pub get
-          flutter build ios --no-codesign
-          flutter build appbundle
+          flutter build appbundle
+
+  build-ios:
+    runs-on: macos-latest
+    timeout-minutes: 30
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: subosito/flutter-action@dbf1fa04f4d2e52c33185153d06cdb5443aa189d # pin@v2
+        with:
+          flutter-version: '3.0.0'
+      # Add flutter build web (missing index)
+      - name: Build iOS
+        run: |
+          cd min_version_test
+          flutter pub get
+          flutter build ios --no-codesign
diff --git a/dart/lib/src/event_processor/deduplication_event_processor.dart b/dart/lib/src/event_processor/deduplication_event_processor.dart
@@ -1,6 +1,7 @@
 import 'dart:async';
 import 'dart:collection';
 import '../event_processor.dart';
+import '../hint.dart';
 import '../protocol.dart';
 import '../sentry_options.dart';
 
@@ -26,7 +27,7 @@ class DeduplicationEventProcessor extends EventProcessor {
   final SentryOptions _options;
 
   @override
-  FutureOr<SentryEvent?> apply(SentryEvent event, {hint}) {
+  FutureOr<SentryEvent?> apply(SentryEvent event, {Hint? hint}) {
     if (event is SentryTransaction) {
       return event;
     }
diff --git a/dart/lib/src/event_processor/exception/io_exception_event_processor.dart b/dart/lib/src/event_processor/exception/io_exception_event_processor.dart
@@ -1,5 +1,6 @@
 import 'dart:io';
 
+import '../../hint.dart';
 import '../../protocol.dart';
 import '../../sentry_options.dart';
 import 'exception_event_processor.dart';
@@ -13,7 +14,7 @@ class IoExceptionEventProcessor implements ExceptionEventProcessor {
   final SentryOptions _options;
 
   @override
-  SentryEvent apply(SentryEvent event, {dynamic hint}) {
+  SentryEvent apply(SentryEvent event, {Hint? hint}) {
     final throwable = event.throwable;
     if (throwable is HttpException) {
       return _applyHttpException(throwable, event);
diff --git a/dart/lib/src/event_processor/exception/web_exception_event_processor.dart b/dart/lib/src/event_processor/exception/web_exception_event_processor.dart
@@ -1,3 +1,4 @@
+import '../../hint.dart';
 import '../../protocol.dart';
 import '../../sentry_options.dart';
 import 'exception_event_processor.dart';
@@ -7,5 +8,5 @@ ExceptionEventProcessor exceptionEventProcessor(SentryOptions _) =>
 
 class WebExcptionEventProcessor implements ExceptionEventProcessor {
   @override
-  SentryEvent apply(SentryEvent event, {dynamic hint}) => event;
+  SentryEvent apply(SentryEvent event, {Hint? hint}) => event;
 }
diff --git a/dart/lib/src/scope.dart b/dart/lib/src/scope.dart
@@ -143,7 +143,7 @@ class Scope {
 
   Scope(this._options);
 
-  Breadcrumb? _addBreadCrumbSync(Breadcrumb breadcrumb, {dynamic hint}) {
+  Breadcrumb? _addBreadCrumbSync(Breadcrumb breadcrumb, {Hint? hint}) {
     // bail out if maxBreadcrumbs is zero
     if (_options.maxBreadcrumbs == 0) {
       return null;
@@ -188,7 +188,7 @@ class Scope {
   }
 
   /// Adds a breadcrumb to the breadcrumbs queue
-  Future<void> addBreadcrumb(Breadcrumb breadcrumb, {dynamic hint}) async {
+  Future<void> addBreadcrumb(Breadcrumb breadcrumb, {Hint? hint}) async {
     final addedBreadcrumb = _addBreadCrumbSync(breadcrumb, hint: hint);
     if (addedBreadcrumb != null) {
       await _callScopeObservers((scopeObserver) async =>
diff --git a/dart/lib/src/version.dart b/dart/lib/src/version.dart
@@ -17,7 +17,7 @@ String sdkName(bool isWeb) => isWeb ? _browserSdkName : _ioSdkName;
 const String _ioSdkName = 'sentry.dart';
 
 /// The SDK name for web projects reported to Sentry.io in the submitted events.
-const String _browserSdkName = 'sentry.dart.browser';
+const String _browserSdkName = '$_ioSdkName.browser';
 
 /// The name of the SDK platform reported to Sentry.io in the submitted events.
 ///
diff --git a/dart/test/scope_test.dart b/dart/test/scope_test.dart
@@ -617,7 +617,7 @@ void main() {
       scopeObserver: fixture.mockScopeObserver,
       beforeBreadcrumbCallback: (
         Breadcrumb? breadcrumb, {
-        dynamic hint,
+        Hint? hint,
       }) {
         return breadcrumb?.copyWith(message: "modified");
       },
diff --git a/flutter/android/src/main/kotlin/io/sentry/flutter/SentryFlutterPlugin.kt b/flutter/android/src/main/kotlin/io/sentry/flutter/SentryFlutterPlugin.kt
@@ -18,6 +18,7 @@ import io.sentry.Sentry
 import io.sentry.DateUtils
 import io.sentry.android.core.ActivityFramesTracker
 import io.sentry.android.core.AppStartState
+import io.sentry.android.core.BuildConfig.VERSION_NAME
 import io.sentry.android.core.LoadClass
 import io.sentry.android.core.SentryAndroid
 import io.sentry.android.core.SentryAndroidOptions
@@ -165,16 +166,18 @@ class SentryFlutterPlugin : FlutterPlugin, MethodCallHandler, ActivityAware {
 
       args.getIfNotNull<Boolean>("sendClientReports") { options.isSendClientReports = it }
 
-      args.getIfNotNull<Map<String, Any>>("sdk") { sdk ->
-        val name = sdk["name"] as? String
-        val version = sdk["version"] as? String
-        if (name != null && version != null) {
-          val sdkVersion = SdkVersion(name, version)
-          options.setSentryClientName("$name/$version")
-          options.setSdkVersion(sdkVersion)
-        }
+      val name = "sentry.java.android.flutter"
+
+      var sdkVersion = options.sdkVersion
+      if (sdkVersion == null) {
+        sdkVersion = SdkVersion(name, VERSION_NAME)
+      } else {
+        sdkVersion.name = name
       }
 
+      options.sdkVersion = sdkVersion
+      options.sentryClientName = "$name/$VERSION_NAME"
+
       options.setBeforeSend { event, _ ->
         setEventOriginTag(event)
         addPackages(event, options.sdkVersion)
@@ -476,10 +479,10 @@ class SentryFlutterPlugin : FlutterPlugin, MethodCallHandler, ActivityAware {
   private fun addPackages(event: SentryEvent, sdk: SdkVersion?) {
     event.sdk?.let {
       if (it.name == flutterSdk) {
-        sdk?.packages?.forEach { sentryPackage ->
+        sdk?.packageSet?.forEach { sentryPackage ->
           it.addPackage(sentryPackage.name, sentryPackage.version)
         }
-        sdk?.integrations?.forEach { integration ->
+        sdk?.integrationSet?.forEach { integration ->
           it.addIntegration(integration)
         }
       }
diff --git a/flutter/example/macos/Runner.xcodeproj/project.pbxproj b/flutter/example/macos/Runner.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 51;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXAggregateTarget section */
@@ -209,7 +209,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0920;
-				LastUpgradeCheck = 0930;
+				LastUpgradeCheck = 1300;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					33CC10EC2044A3C60003C045 = {
@@ -262,6 +262,7 @@
 /* Begin PBXShellScriptBuildPhase section */
 		3399D490228B24CF009A79C7 /* ShellScript */ = {
 			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
diff --git a/flutter/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/flutter/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1000"
+   LastUpgradeVersion = "1300"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/flutter/ios/Classes/SentryFlutterPluginApple.swift b/flutter/ios/Classes/SentryFlutterPluginApple.swift
@@ -226,11 +226,9 @@ public class SentryFlutterPluginApple: NSObject, FlutterPlugin {
                 #endif
             }
 
-            if let sdk = arguments["sdk"] as? [String: Any?],
-               let name = sdk["name"] as? String,
-               let version = sdk["version"] as? String {
-               PrivateSentrySDKOnly.setSdkName(name, andVersionString: version)
-            }
+            let name = "sentry.cocoa.flutter"
+            let version = PrivateSentrySDKOnly.getSdkVersionString()
+            PrivateSentrySDKOnly.setSdkName(name, andVersionString: version)
 
             // note : for now, in sentry-cocoa, beforeSend is not called before captureEnvelope
             options.beforeSend = { event in
diff --git a/flutter/lib/src/event_processor/flutter_exception_event_processor.dart b/flutter/lib/src/event_processor/flutter_exception_event_processor.dart
@@ -3,7 +3,7 @@ import 'package:sentry/sentry.dart';
 
 class FlutterExceptionEventProcessor implements EventProcessor {
   @override
-  SentryEvent apply(SentryEvent event, {dynamic hint}) {
+  SentryEvent apply(SentryEvent event, {Hint? hint}) {
     final exception = event.throwable;
     if (exception is NetworkImageLoadException) {
       return _applyNetworkImageLoadException(event, exception);
diff --git a/flutter/lib/src/event_processor/native_app_start_event_processor.dart b/flutter/lib/src/event_processor/native_app_start_event_processor.dart
@@ -18,7 +18,7 @@ class NativeAppStartEventProcessor extends EventProcessor {
   final SentryNative _native;
 
   @override
-  FutureOr<SentryEvent?> apply(SentryEvent event, {hint}) async {
+  FutureOr<SentryEvent?> apply(SentryEvent event, {Hint? hint}) async {
     final appStartEnd = _native.appStartEnd;
 
     if (appStartEnd != null &&
diff --git a/flutter/lib/src/event_processor/screenshot_event_processor.dart b/flutter/lib/src/event_processor/screenshot_event_processor.dart
@@ -19,7 +19,7 @@ class ScreenshotEventProcessor extends EventProcessor {
       sentryScreenshotWidgetGlobalKey.currentContext != null;
 
   @override
-  FutureOr<SentryEvent?> apply(SentryEvent event, {hint}) async {
+  FutureOr<SentryEvent?> apply(SentryEvent event, {Hint? hint}) async {
     if (event.exceptions == null &&
         event.throwable == null &&
         _hasSentryScreenshotWidget) {
diff --git a/flutter/lib/src/integrations/load_contexts_integration.dart b/flutter/lib/src/integrations/load_contexts_integration.dart
@@ -40,7 +40,7 @@ class _LoadContextsIntegrationEventProcessor extends EventProcessor {
   final SentryFlutterOptions _options;
 
   @override
-  FutureOr<SentryEvent?> apply(SentryEvent event, {hint}) async {
+  FutureOr<SentryEvent?> apply(SentryEvent event, {Hint? hint}) async {
     try {
       final loadContexts = await _channel.invokeMethod('loadContexts');
 
diff --git a/flutter/lib/src/integrations/load_image_list_integration.dart b/flutter/lib/src/integrations/load_image_list_integration.dart
@@ -36,7 +36,7 @@ class _LoadImageListIntegrationEventProcessor extends EventProcessor {
   final SentryFlutterOptions _options;
 
   @override
-  FutureOr<SentryEvent?> apply(SentryEvent event, {hint}) async {
+  FutureOr<SentryEvent?> apply(SentryEvent event, {Hint? hint}) async {
     if (event.needsSymbolication()) {
       try {
         // we call on every event because the loaded image list is cached
diff --git a/metrics/flutter.properties b/metrics/flutter.properties
@@ -1,2 +1,2 @@
-version = 3.7.6
+version = 3.7.7
 repo = https://github.com/flutter/flutter
