Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/null-safety' into null-safety
Browse files Browse the repository at this point in the history
  • Loading branch information
akornich committed Dec 20, 2021
2 parents 5d1e1f3 + c5e715a commit dd7d90c
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions rollbar_dart/lib/src/api/payload/data.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ import 'level.dart';

/// Contains the data for the occurrence to be sent to Rollbar.
class Data {
Map<String, String>? notifier;
late Map<String, String> notifier;
String? environment;
late Client client;
String? platform;
String? language;
late String language;
String? framework;
String? codeVersion;
Level? level;
Expand Down
2 changes: 1 addition & 1 deletion rollbar_dart/lib/src/core_notifier.dart
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class CoreNotifier {
final Sender? _sender;
final Transformer? _transformer;

// NOTIFIER_VERSION to be updated with each new release:
// notifierVersion to be updated with each new release:
static const notifierVersion = '0.2.0-beta';

static const notifierName = 'rollbar-dart';
Expand Down
2 changes: 1 addition & 1 deletion rollbar_dart/lib/src/uncaught_error.dart
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class UncaughtErrorHandler {
var handler = UncaughtErrorHandler._(config);

if (config.handleUncaughtErrors!) {
var errorPort = await (handler._errorPort);
var errorPort = await handler._errorPort;
if (errorPort != null) {
Isolate.current.addErrorListener(errorPort);
}
Expand Down
2 changes: 1 addition & 1 deletion rollbar_dart/test/ReadMe.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ https://pub.dev/documentation/mockito/latest/

# Notes

## Usefull Imports
## Useful Imports
import 'package:mockito/mockito.dart';
import 'package:mockito/annotations.dart';

Expand Down
2 changes: 1 addition & 1 deletion rollbar_dart/test/client_server_utils.dart
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class RawTextSocket {
_isolate = await Isolate.spawn(
_server, [tcpInfoPort.sendPort, _receivePort.sendPort]);

var port = await (tcpInfoPort.first);
var port = await tcpInfoPort.first;
tcpInfoPort.close();

return port;
Expand Down
2 changes: 1 addition & 1 deletion rollbar_dart/test/rollbar_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ void main() {
failingFunction();
} catch (error, stackTrace) {
await rollbar.error(error, stackTrace);
var payload = verify(sender.send(captureAny)).captured.single;
var payload = verify(await sender.send(captureAny)).captured.single;

expect(payload['data']['code_version'], equals('0.23.2'));
expect(payload['data']['level'], equals('error'));
Expand Down
4 changes: 2 additions & 2 deletions rollbar_dart/test/uncaught_error_handler_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ void main() {
}

var payloadJson =
await (_server.messages.first.timeout(Duration(milliseconds: 500)));
await _server.messages.first.timeout(Duration(milliseconds: 500));
expect(payloadJson != null, equals(true));
var payload = json.decode(payloadJson!);

Expand All @@ -54,7 +54,7 @@ void main() {
var isolate = await Isolate.spawn(secondIsolateMethod, errorPort);
try {
var payloadJson =
await (_server.messages.first.timeout(Duration(milliseconds: 500)));
await _server.messages.first.timeout(Duration(milliseconds: 500));
expect(payloadJson != null, equals(true));
var payload = json.decode(payloadJson!);

Expand Down
2 changes: 1 addition & 1 deletion rollbar_flutter/lib/src/platform_transformer.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import 'dart:convert';

import 'package:flutter/services.dart' show PlatformException;
import 'package:rollbar_dart/rollbar.dart'
show Body, TraceInfo, Data, RollbarPlatformInfo, TraceChain, Transformer;
show Body, Data, RollbarPlatformInfo, TraceChain, TraceInfo, Transformer;

/// This trasformer inspects some platform specific exception types, which
/// carry additional occurrence details in their exception messages.
Expand Down

0 comments on commit dd7d90c

Please sign in to comment.