Merge branch 'main' into feat/windows-native

getsentry · Sep 18, 2024 · 1a2cc39 · 1a2cc39
2 parents 575de3f + 3b7bfe8
commit 1a2cc39
Show file tree

Hide file tree

Showing 19 changed files with 831 additions and 989 deletions.
diff --git a/.github/workflows/testflight.yml b/.github/workflows/testflight.yml
@@ -16,7 +16,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: subosito/flutter-action@44ac965b96f18d999802d4b807e3256d5a3f9fa1 # pin@v2.16.0
       - run: xcodes select 15.0.1
-      - uses: ruby/setup-ruby@52753b7da854d5c07df37391a986c76ab4615999 # pin@v1.191.0
+      - uses: ruby/setup-ruby@a6b46b8a08edb18935835849f2a17072d5cc8c73 # pin@v1.192.0
         with:
           ruby-version: '2.7.5'
           bundler-cache: true

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## Unreleased
+
+### Enhancements
+
+- Improve app start integration ([#2266](https://github.com/getsentry/sentry-dart/pull/2266))
+  - Fixes ([#2103](https://github.com/getsentry/sentry-dart/issues/2103))
+  - Fixes ([#2233](https://github.com/getsentry/sentry-dart/issues/2233))
+
 ## 8.9.0
 
 ### Features

diff --git a/flutter/example/integration_test/integration_test.dart b/flutter/example/integration_test/integration_test.dart
@@ -8,7 +8,6 @@ import 'package:flutter/widgets.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:http/http.dart';
 import 'package:sentry_flutter/sentry_flutter.dart';
-import 'package:sentry_flutter/src/integrations/native_app_start_integration.dart';
 import 'package:sentry_flutter_example/main.dart';
 
 void main() {
@@ -26,8 +25,6 @@ void main() {
   // Using fake DSN for testing purposes.
   Future<void> setupSentryAndApp(WidgetTester tester,
       {String? dsn, BeforeSendCallback? beforeSendCallback}) async {
-    NativeAppStartIntegration.isIntegrationTest = true;
-
     await setupSentry(
       () async {
         await tester.pumpWidget(SentryScreenshotWidget(

diff --git a/flutter/example/ios/Runner/AppDelegate.swift b/flutter/example/ios/Runner/AppDelegate.swift
@@ -2,7 +2,7 @@ import UIKit
 import Flutter
 import Sentry
 
-@UIApplicationMain
+@main
 @objc class AppDelegate: FlutterAppDelegate {
   private let _channel = "example.flutter.sentry.io"
 

diff --git a/flutter/example/lib/user_feedback_dialog.dart b/flutter/example/lib/user_feedback_dialog.dart
@@ -143,7 +143,7 @@ class _SentryLogo extends StatelessWidget {
     var color = Colors.white;
     final brightenss = Theme.of(context).brightness;
     if (brightenss == Brightness.light) {
-      color = const Color(0xff362d59).withOpacity(1.0);
+      color = const Color(0xff362d59);
     }
 
     return FittedBox(

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