Skip to content

Commit 3849fbd

Browse files
committed
Merge branch 'chore/bump-min-to-flutter-3.0.0-and-dart-2.17' into feat/support-custom-units-for-custom-measurements
2 parents 74bc981 + 4432728 commit 3849fbd

File tree

6 files changed

+6
-34
lines changed

6 files changed

+6
-34
lines changed

.github/workflows/min_version_test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030

3131
- uses: subosito/flutter-action@dbf1fa04f4d2e52c33185153d06cdb5443aa189d # pin@v2
3232
with:
33-
flutter-version: '2.0.0'
33+
flutter-version: '3.0.0'
3434
# Add flutter build web (missing index)
3535
- name: Build
3636
run: |

dart/lib/src/client_reports/client_report_recorder.dart

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import 'package:meta/meta.dart';
22

33
import '../sentry_options.dart';
4-
import '../utils/hash_code.dart';
54
import 'client_report.dart';
65
import 'discarded_event.dart';
76
import 'discard_reason.dart';
@@ -44,7 +43,7 @@ class _QuantityKey {
4443
final DataCategory category;
4544

4645
@override
47-
int get hashCode => hash2(reason.hashCode, category.hashCode);
46+
int get hashCode => Object.hash(reason.hashCode, category.hashCode);
4847

4948
@override
5049
bool operator ==(dynamic other) {

dart/lib/src/utils/hash_code.dart

Lines changed: 0 additions & 24 deletions
This file was deleted.

file/lib/src/sentry_file.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class SentryFile implements File {
5353
}
5454

5555
@override
56-
Future<File> create({bool recursive = false, bool exclusive = false}) {
56+
Future<File> create({bool recursive = false}) {
5757
return _wrap(
5858
() async => _file.create(recursive: recursive),
5959
'file.write',

flutter/lib/src/event_processor/flutter_enricher_event_processor.dart

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,10 +112,7 @@ class FlutterEnricherEventProcessor extends EventProcessor {
112112
}
113113

114114
SentryCulture _getCulture(SentryCulture? culture) {
115-
// The editor says it's fine without a `?` but the compiler complains
116-
// if it's missing
117-
// ignore: invalid_null_aware_operator
118-
final languageTag = _window?.locale?.toLanguageTag();
115+
final languageTag = _window?.locale.toLanguageTag();
119116

120117
// Future enhancement:
121118
// _window?.locales

min_version_test/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
1818
version: 1.0.0+1
1919

2020
environment:
21-
sdk: '>=2.17.0 <3.0.0'
22-
flutter: '>=3.0.0'
21+
sdk: '2.17.0'
22+
flutter: '3.0.0'
2323

2424
# Dependencies specify other packages that your package needs in order to work.
2525
# To automatically upgrade your package dependencies to the latest versions

0 commit comments

Comments
 (0)