clean up

dart/lib/src/scope.dart

@@ -87,13 +87,6 @@ class Scope {
     if (_options == null) {
       throw ArgumentError('SentryOptions is required');
     }
-    _addDefaultTags();
-  }
-
-  /// Adds default tags to the Scope
-  void _addDefaultTags() {
-    // TODO: maybe this should be a field on options with default values?
-    // _tags['flutter_web'] = isWeb.toString();
   }
 
   /// Adds a breadcrumb to the breadcrumbs queue

flutter/android/gradle.properties

@@ -1,3 +1 @@
 org.gradle.jvmargs=-Xmx1536M
-#android.useAndroidX=true
-#android.enableJetifier=true

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

@@ -14,7 +14,8 @@ import io.sentry.SentryLevel
 import io.sentry.SentryOptions
 import io.sentry.protocol.SdkVersion
 import java.io.File
-import java.util.*
+import java.util.UUID
+import java.util.Locale
 
 // TODO: maybe this should be done in Java, to avoid stdlib
 // libflutter.so is already 11mb each archie

flutter/example/android/app/src/main/AndroidManifest.xml

@@ -44,22 +44,7 @@
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <!-- In order to capture crashes caused by the native layer early during Init.
-             This is relevant for errors that happen before Flutter runs far enough to run init -->
-<!--        <meta-data-->
-<!--            android:name="io.sentry.dsn"-->
-<!--            android:value="https://[email protected]/2078115" />-->
-<!--        <meta-data -->
-<!--            android:name="io.sentry.debug"-->
-<!--            android:value="true" />-->
-        <!-- Will be enabled by default from version 3.0 -->
-<!--        <meta-data-->
-<!--            android:name="io.sentry.session-tracking.enable"-->
-<!--            android:value="true" />-->
-        <!-- To quickly demonstrate the ANR capture. Default is 5 seconds. -->
-<!--        <meta-data-->
-<!--            android:name="io.sentry.anr.timeout-interval-mills"-->
-<!--            android:value="2000" />-->
+
         <!-- Don't delete the meta-data below.
              This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
         <meta-data

flutter/example/android/build.gradle

@@ -8,7 +8,7 @@ buildscript {
 
     dependencies {
         classpath 'io.sentry:sentry-android-gradle-plugin:1.7.36'
-        classpath 'com.android.tools.build:gradle:3.6.4'
+        classpath 'com.android.tools.build:gradle:4.0.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.ydq.android.gradle.build.tool:nativeBundle:1.0.6'
     }

flutter/example/pubspec.lock

@@ -93,6 +93,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "3.1.4"
+  js:
+    dependency: transitive
+    description:
+      name: js
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.6.3-nullsafety.1"
   matcher:
     dependency: transitive
     description:
@@ -106,7 +113,14 @@ packages:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0-nullsafety.3"
+    version: "1.3.0-nullsafety.4"
+  package_info:
+    dependency: transitive
+    description:
+      name: package_info
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.4.3+2"
   path:
     dependency: transitive
     description:
@@ -153,7 +167,7 @@ packages:
       name: stack_trace
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.10.0-nullsafety.1"
+    version: "1.10.0-nullsafety.2"
   stream_channel:
     dependency: transitive
     description:
@@ -211,5 +225,5 @@ packages:
     source: hosted
     version: "2.1.0-nullsafety.3"
 sdks:
-  dart: ">=2.10.0-110 <2.11.0"
+  dart: ">=2.10.0-110 <=2.11.0-213.1.beta"
   flutter: ">=1.17.0 <2.0.0"

flutter/lib/FileSystemTransport.dart

@@ -1,15 +1,16 @@
+import 'dart:convert';
+
 import 'package:flutter/services.dart';
 import 'package:sentry/sentry.dart';
-import 'dart:convert';
 
 class FileSystemTransport implements Transport {
+  FileSystemTransport(this._channel, this._options);
+
   final MethodChannel _channel;
   final SentryOptions _options;
 
   final _jsonEncoder = const JsonEncoder();
 
-  FileSystemTransport(this._channel, this._options);
-
   @override
   Future<SentryId> send(SentryEvent event) async {
     final headerMap = {
@@ -23,19 +24,23 @@ class FileSystemTransport implements Transport {
     final itemHeaderMap = {
       'content_type': 'application/json',
       'type': event.type,
-      // TODO: real length in String
       'length': eventString.length,
     };
 
     final headerString = _jsonEncoder.convert(headerMap);
     final itemHeaderString = _jsonEncoder.convert(itemHeaderMap);
     final envelopeString = '$headerString\n$itemHeaderString\n$eventString';
 
-    // await _channel.invokeMethod('captureEnvelope', <String, dynamic>{
-    //   'event': envelopeString,
-    // });
     final args = [envelopeString];
-    await _channel.invokeMethod('captureEnvelope', args);
+    try {
+      await _channel.invokeMethod('captureEnvelope', args);
+    } catch (error) {
+      _options.logger(
+        SentryLevel.error,
+        'Failed to save envelope: $error',
+      );
+      return SentryId.empty();
+    }
 
     return event.eventId;
   }

flutter/lib/default_integrations.dart

@@ -114,7 +114,7 @@ Integration nativeSdkIntegration(SentryOptions options, MethodChannel channel) {
     } catch (error) {
       options.logger(
         SentryLevel.error,
-        'nativeSdkIntegration failed to be installed: ${error.toString()}',
+        'nativeSdkIntegration failed to be installed: $error',
       );
     }
   }

flutter/lib/sentry_flutter.dart

@@ -30,9 +30,6 @@ mixin SentryFlutter {
     // our plugin can call into the native code.
     WidgetsFlutterBinding.ensureInitialized();
 
-    // TODO: we could read the window and add some stuff on contexts
-    // final window = WidgetsBinding.instance.window;
-
     options.debug = kDebugMode;
 
     // web still uses a http transport

flutter/pubspec.lock

@@ -93,6 +93,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "3.1.4"
+  js:
+    dependency: transitive
+    description:
+      name: js
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.6.3-nullsafety.1"
   matcher:
     dependency: transitive
     description:
@@ -106,7 +113,14 @@ packages:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0-nullsafety.3"
+    version: "1.3.0-nullsafety.4"
+  package_info:
+    dependency: "direct main"
+    description:
+      name: package_info
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.4.3+2"
   path:
     dependency: transitive
     description:
@@ -127,7 +141,7 @@ packages:
       path: "../dart"
       relative: true
     source: path
-    version: "4.0.0"
+    version: "4.0.0-alpha.2"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -146,7 +160,7 @@ packages:
       name: stack_trace
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.10.0-nullsafety.1"
+    version: "1.10.0-nullsafety.2"
   stream_channel:
     dependency: transitive
     description:
@@ -197,5 +211,5 @@ packages:
     source: hosted
     version: "2.1.0-nullsafety.3"
 sdks:
-  dart: ">=2.10.0-110 <2.11.0"
+  dart: ">=2.10.0-110 <=2.11.0-213.1.beta"
   flutter: ">=1.17.0 <2.0.0"

flutter/pubspec.yaml

@@ -15,7 +15,6 @@ dependencies:
     sdk: flutter
   sentry: #^4.0.0 uncomment before publishing
     path: ../dart
-  #device_info: ^1.0.0
   package_info: ^0.4.0
 
 dev_dependencies: