Avoid dependency conflict with package_info_plus v4

.github/workflows/flutter_integration_test.yml

@@ -55,7 +55,7 @@ jobs:
           profile: Nexus 6
           script: flutter test integration_test/integration_test.dart --verbose
   test-ios:
-    runs-on: macos-12
+    runs-on: macos-latest
     timeout-minutes: 30
     defaults:
       run:

CHANGELOG.md

@@ -4,8 +4,13 @@
 
 ### Fixes
 
-- Fix battery level convertion for iOS 16.4 ([#1433](https://github.com/getsentry/sentry-dart/pull/1433))
+- Fix battery level conversion for iOS 16.4 ([#1433](https://github.com/getsentry/sentry-dart/pull/1433))
 - Adds a namespace for compatibility with AGP 8.0. ([#1427](https://github.com/getsentry/sentry-dart/pull/1427))
+- Avoid dependency conflict with package_info_plus v4 ([#1440](https://github.com/getsentry/sentry-dart/pull/1440))
+
+### Breaking Changes
+
+- Android `minSdkVersion` is now 19 (Flutter already defines 19-20 as best effort)
 
 ## 7.5.2
 

dart/example_web/pubspec.yaml

@@ -11,7 +11,7 @@ dependencies:
     path: ../../dart
 
 dev_dependencies:
-  build_runner: ^2.1.8
-  build_web_compilers: ^3.2.2
+  build_runner: ^2.4.2
+  build_web_compilers: ^4.0.3
   lints: ^2.0.0
-  webdev: ^2.7.6
+  webdev: ^3.0.4

dart/lib/src/run_zoned_guarded_integration.dart

@@ -56,9 +56,9 @@ class RunZonedGuardedIntegration extends Integration<SentryOptions> {
 
     // marks the span status if none to `internal_error` in case there's an
     // unhandled error
-    hub.configureScope((scope) => {
-          scope.span?.status ??= const SpanStatus.internalError(),
-        });
+    hub.configureScope(
+      (scope) => scope.span?.status ??= const SpanStatus.internalError(),
+    );
 
     await hub.captureEvent(event, stackTrace: stackTrace);
   }

dart/lib/src/sentry_isolate.dart

@@ -80,9 +80,9 @@ class SentryIsolate {
 
       // marks the span status if none to `internal_error` in case there's an
       // unhandled error
-      hub.configureScope((scope) => {
-            scope.span?.status ??= const SpanStatus.internalError(),
-          });
+      hub.configureScope(
+        (scope) => scope.span?.status ??= const SpanStatus.internalError(),
+      );
 
       await hub.captureEvent(event, stackTrace: stackTrace);
     }

flutter/android/build.gradle

@@ -34,7 +34,7 @@ android {
     }
 
     defaultConfig {
-        minSdkVersion 16
+        minSdkVersion 19
         targetSdkVersion 33
 
         ndk {

flutter/example/android/app/build.gradle

@@ -48,7 +48,7 @@ android {
 
     defaultConfig {
         applicationId "io.sentry.samples.flutter"
-        minSdkVersion 16
+        minSdkVersion 19
         targetSdkVersion 33
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName

flutter/example/integration_test/integration_test.dart

@@ -1,12 +1,14 @@
 import 'package:flutter/widgets.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:integration_test/integration_test.dart';
 import 'package:sentry_flutter/sentry_flutter.dart';
 import 'package:sentry_flutter_example/main.dart';
 
 void main() {
-  final binding = IntegrationTestWidgetsFlutterBinding.ensureInitialized();
-  binding.framePolicy = LiveTestWidgetsFlutterBindingFramePolicy.fullyLive;
+  TestWidgetsFlutterBinding.ensureInitialized();
+
+  setUp(() async {
+    await Sentry.close();
+  });
 
   // Using fake DSN for testing purposes.
   Future<void> setupSentryAndApp(WidgetTester tester) async {

flutter/example/pubspec.yaml

@@ -22,7 +22,7 @@ dependencies:
   dio: any # This gets constrained by `sentry_dio`
   sqflite: any # This gets constrained by `sentry_sqflite`
   logging: any # This gets constrained by `sentry_logging`
-  package_info_plus: ^3.0.0
+  package_info_plus: ^4.0.0
   path_provider: ^2.0.0
   #sqflite_common_ffi: ^2.0.0
   #sqflite_common_ffi_web: ^0.3.0

flutter/lib/src/event_processor/flutter_enricher_event_processor.dart

@@ -25,6 +25,7 @@ class FlutterEnricherEventProcessor implements EventProcessor {
   // Thus we call it on demand after all the initialization happened.
   WidgetsBinding? get _widgetsBinding => _options.bindingUtils.instance;
 
+  // ignore: deprecated_member_use
   SingletonFlutterWindow? get _window => _widgetsBinding?.window;
   Map<String, String> _packages = {};
 
@@ -120,6 +121,7 @@ class FlutterEnricherEventProcessor implements EventProcessor {
     final defaultRouteName = _window?.defaultRouteName;
     // A FlutterEngine has no renderViewElement if it was started or is
     // accessed from an isolate different to the main isolate.
+    // ignore: deprecated_member_use
     final hasRenderView = _widgetsBinding?.renderViewElement != null;
 
     return <String, String>{
@@ -180,6 +182,7 @@ class FlutterEnricherEventProcessor implements EventProcessor {
 
   SentryOperatingSystem _getOperatingSystem(SentryOperatingSystem? os) {
     return (os ?? SentryOperatingSystem()).copyWith(
+      // ignore: deprecated_member_use
       theme: os?.theme ?? describeEnum(window.platformBrightness),
     );
   }

flutter/lib/src/event_processor/screenshot_event_processor.dart

@@ -50,6 +50,7 @@ class ScreenshotEventProcessor implements EventProcessor {
       final renderObject =
           sentryScreenshotWidgetGlobalKey.currentContext?.findRenderObject();
       if (renderObject is RenderRepaintBoundary) {
+        // ignore: deprecated_member_use
         final pixelRatio = window.devicePixelRatio;
         var imageResult = _getImage(renderObject, pixelRatio);
         Image image;

flutter/lib/src/integrations/flutter_error_integration.dart

@@ -73,9 +73,9 @@ class FlutterErrorIntegration implements Integration<SentryFlutterOptions> {
 
         // marks the span status if none to `internal_error` in case there's an
         // unhandled error
-        hub.configureScope((scope) => {
-              scope.span?.status ??= const SpanStatus.internalError(),
-            });
+        hub.configureScope(
+          (scope) => scope.span?.status ??= const SpanStatus.internalError(),
+        );
 
         await hub.captureEvent(event,
             stackTrace: errorDetails.stack,

flutter/lib/src/integrations/on_error_integration.dart

@@ -70,9 +70,9 @@ class OnErrorIntegration implements Integration<SentryFlutterOptions> {
 
       // marks the span status if none to `internal_error` in case there's an
       // unhandled error
-      hub.configureScope((scope) => {
-            scope.span?.status ??= const SpanStatus.internalError(),
-          });
+      hub.configureScope(
+        (scope) => scope.span?.status ??= const SpanStatus.internalError(),
+      );
 
       // unawaited future
       hub.captureEvent(event, stackTrace: stackTrace);

flutter/lib/src/view_hierarchy/sentry_tree_walker.dart

@@ -293,6 +293,7 @@ class _TreeWalker {
 }
 
 SentryViewHierarchy? walkWidgetTree(WidgetsBinding instance) {
+  // ignore: deprecated_member_use
   final rootElement = instance.renderViewElement;
   if (rootElement == null) {
     return null;

flutter/lib/src/widgets_binding_observer.dart

@@ -38,6 +38,7 @@ class SentryWidgetsBindingObserver with WidgetsBindingObserver {
           .skip(1) // Skip initial event added below in constructor
           .listen(_onScreenSizeChanged);
 
+      // ignore: deprecated_member_use
       final window = _options.bindingUtils.instance?.window;
       _screenSizeStreamController.add(window);
     }
@@ -46,6 +47,7 @@ class SentryWidgetsBindingObserver with WidgetsBindingObserver {
   final Hub _hub;
   final SentryFlutterOptions _options;
 
+  // ignore: deprecated_member_use
   final StreamController<SingletonFlutterWindow?> _screenSizeStreamController;
 
   /// This method records lifecycle events.
@@ -86,6 +88,7 @@ class SentryWidgetsBindingObserver with WidgetsBindingObserver {
     if (!_options.enableWindowMetricBreadcrumbs) {
       return;
     }
+    // ignore: deprecated_member_use
     final window = _options.bindingUtils.instance?.window;
     _screenSizeStreamController.add(window);
   }
@@ -109,6 +112,7 @@ class SentryWidgetsBindingObserver with WidgetsBindingObserver {
       return;
     }
     final brightness =
+        // ignore: deprecated_member_use
         _options.bindingUtils.instance?.window.platformBrightness;
     final brightnessDescription =
         brightness == Brightness.dark ? 'dark' : 'light';
@@ -133,6 +137,7 @@ class SentryWidgetsBindingObserver with WidgetsBindingObserver {
       return;
     }
     final newTextScaleFactor =
+        // ignore: deprecated_member_use
         _options.bindingUtils.instance?.window.textScaleFactor;
 
     _hub.addBreadcrumb(Breadcrumb(

flutter/pubspec.yaml

@@ -16,11 +16,11 @@ dependencies:
   flutter_web_plugins:
     sdk: flutter
   sentry: 7.5.2
-  package_info_plus: '>=1.0.0 <4.0.0'
+  package_info_plus: '>=1.0.0 <5.0.0'
   meta: ^1.3.0
 
 dev_dependencies:
-  build_runner: ^2.1.8
+  build_runner: ^2.4.2
   flutter_test:
     sdk: flutter
   mockito: ^5.1.0

flutter/test/file_system_transport_test.dart

@@ -24,10 +24,12 @@ void main() {
   });
 
   tearDown(() {
+    // ignore: deprecated_member_use
     _channel.setMockMethodCallHandler(null);
   });
 
   test('FileSystemTransport wont throw', () async {
+    // ignore: deprecated_member_use
     _channel.setMockMethodCallHandler((MethodCall methodCall) async {});
 
     final transport = fixture.getSut(_channel);
@@ -46,6 +48,7 @@ void main() {
   });
 
   test('FileSystemTransport returns emptyId if channel throws', () async {
+    // ignore: deprecated_member_use
     _channel.setMockMethodCallHandler((MethodCall methodCall) async {
       throw Exception();
     });
@@ -67,6 +70,7 @@ void main() {
 
   test('FileSystemTransport asserts the event', () async {
     dynamic arguments;
+    // ignore: deprecated_member_use
     _channel.setMockMethodCallHandler((MethodCall methodCall) async {
       arguments = methodCall.arguments;
     });

flutter/test/integrations/init_native_sdk_integration_test.dart

@@ -178,6 +178,7 @@ MethodChannel createChannelWithCallback(
   Future<dynamic>? Function(MethodCall call)? handler,
 ) {
   final channel = MethodChannel('initNativeSdk');
+  // ignore: deprecated_member_use
   channel.setMockMethodCallHandler(handler);
   return channel;
 }

flutter/test/integrations/load_contexts_integration_test.dart

@@ -22,10 +22,12 @@ void main() {
     });
 
     tearDown(() {
+      // ignore: deprecated_member_use
       _channel.setMockMethodCallHandler(null);
     });
 
     test('loadContextsIntegration adds integration', () {
+      // ignore: deprecated_member_use
       _channel.setMockMethodCallHandler((MethodCall methodCall) async {});
 
       final integration = LoadContextsIntegration(_channel);
@@ -51,6 +53,7 @@ void main() {
       final future = Future.value(loadContexts);
       when(fixture.methodChannel.invokeMethod<dynamic>('loadContexts'))
           .thenAnswer((_) => future);
+      // ignore: deprecated_member_use
       _channel.setMockMethodCallHandler((MethodCall methodCall) async {});
 
       final integration = LoadContextsIntegration(fixture.methodChannel);
@@ -75,6 +78,7 @@ void main() {
       final future = Future.value(loadContexts);
       when(fixture.methodChannel.invokeMethod<dynamic>('loadContexts'))
           .thenAnswer((_) => future);
+      // ignore: deprecated_member_use
       _channel.setMockMethodCallHandler((MethodCall methodCall) async {});
 
       final integration = LoadContextsIntegration(fixture.methodChannel);

flutter/test/integrations/load_contexts_integrations_test.dart

@@ -230,6 +230,7 @@ void main() {
   );
 
   test('should not throw on loadContextsIntegration exception', () async {
+    // ignore: deprecated_member_use
     fixture.channel.setMockMethodCallHandler((MethodCall methodCall) async {
       throw Exception();
     });
@@ -453,6 +454,7 @@ class Fixture {
           }
         ]
       }}) {
+    // ignore: deprecated_member_use
     channel.setMockMethodCallHandler((MethodCall methodCall) async {
       called = true;
       return contexts;

flutter/test/integrations/load_image_list_test.dart

@@ -14,6 +14,7 @@ void main() {
     late Fixture fixture;
 
     tearDown(() {
+      // ignore: deprecated_member_use
       fixture.channel.setMockMethodCallHandler(null);
     });
 
@@ -38,6 +39,7 @@ void main() {
         setUp(() {
           fixture = Fixture(platform);
           fixture.channel
+              // ignore: deprecated_member_use
               .setMockMethodCallHandler((MethodCall methodCall) async {
             return imageList;
           });
@@ -62,6 +64,7 @@ void main() {
 
           final sut = fixture.getSut();
           fixture.channel
+              // ignore: deprecated_member_use
               .setMockMethodCallHandler((MethodCall methodCall) async {
             called = true;
             return imageList;
@@ -83,6 +86,7 @@ void main() {
 
           final sut = fixture.getSut();
           fixture.channel
+              // ignore: deprecated_member_use
               .setMockMethodCallHandler((MethodCall methodCall) async {
             called = true;
             return imageList;
@@ -101,6 +105,7 @@ void main() {
 
           final sut = fixture.getSut();
           fixture.channel
+              // ignore: deprecated_member_use
               .setMockMethodCallHandler((MethodCall methodCall) async {
             called = true;
             return imageList;
@@ -160,6 +165,7 @@ void main() {
 
           final sut = fixture.getSut();
           fixture.channel
+              // ignore: deprecated_member_use
               .setMockMethodCallHandler((MethodCall methodCall) async {
             called = true;
             return imageList;