Bump to Dart 2.19, to use some new features and get new lint rules (#168

)
srawlins · Apr 20, 2023 · dd7fef4 · dd7fef4
1 parent c1ebdc9
commit dd7fef4
Show file tree

Hide file tree

Showing 15 changed files with 19 additions and 26 deletions.
diff --git a/.github/workflows/test-package.yml b/.github/workflows/test-package.yml
@@ -47,7 +47,7 @@ jobs:
       matrix:
         # Add macos-latest and/or windows-latest if relevant for this package.
         os: [ubuntu-latest]
-        sdk: [2.17.0, dev]
+        sdk: [2.19.0, dev]
     steps:
       - uses: actions/checkout@v2
       - uses: dart-lang/[email protected]

diff --git a/analysis_options.yaml b/analysis_options.yaml
@@ -18,18 +18,17 @@ linter:
     - avoid_dynamic_calls
     - avoid_positional_boolean_parameters
     - avoid_unused_constructor_parameters
+    - dangling_library_doc_comments
     - directives_ordering
+    - collection_methods_unrelated_type
+    - implicit_call_tearoffs
+    - library_annotations
     - lines_longer_than_80_chars
     - package_api_docs
     - prefer_asserts_in_initializer_lists
     - prefer_if_elements_to_conditional_expressions
     - unawaited_futures
+    - unnecessary_library_directive
     - unnecessary_parenthesis
+    - unreachable_from_main
     - use_super_parameters
-
-    # Enable when using Dart >=2.19.0.
-    #- collection_methods_unrelated_type
-    #- enable_null_safety
-    #- implicit_call_tearoffs
-    #- library_annotations
-    #- unnecessary_library_directive
diff --git a/lib/src/date_time.dart b/lib/src/date_time.dart
@@ -2,8 +2,6 @@
 // file for details. All rights reserved. Use of this source code is governed
 // by a BSD-style license that can be found in the LICENSE file.
 
-library timezone.src.date_time;
-
 import 'package:timezone/src/env.dart';
 import 'package:timezone/src/location.dart';
 

diff --git a/lib/src/env.dart b/lib/src/env.dart
@@ -2,8 +2,6 @@
 // file for details. All rights reserved. Use of this source code is governed
 // by a BSD-style license that can be found in the LICENSE file.
 
-library timezone.src.env;
-
 import 'package:timezone/src/location.dart';
 import 'package:timezone/src/location_database.dart';
 import 'package:timezone/src/tzdb.dart';

diff --git a/lib/src/exceptions.dart b/lib/src/exceptions.dart
@@ -2,8 +2,6 @@
 // file for details. All rights reserved. Use of this source code is governed
 // by a BSD-style license that can be found in the LICENSE file.
 
-library timezone.src.exceptions;
-
 class TimeZoneInitException implements Exception {
   final String msg;
 

diff --git a/lib/src/tools.dart b/lib/src/tools.dart
@@ -2,8 +2,6 @@
 // file for details. All rights reserved. Use of this source code is governed
 // by a BSD-style license that can be found in the LICENSE file.
 
-library timezone.src.tools;
-
 import 'dart:collection';
 
 import 'package:timezone/timezone.dart';

diff --git a/lib/src/tzdata/zicfile.dart b/lib/src/tzdata/zicfile.dart
@@ -2,8 +2,6 @@
 // file for details. All rights reserved. Use of this source code is governed
 // by a BSD-style license that can be found in the LICENSE file.
 
-library timezone.src.tzdata.zicfile;
-
 import 'dart:collection';
 import 'dart:convert' show ascii;
 import 'dart:typed_data';

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -3,7 +3,7 @@ version: 0.9.2
 description: Time zone database and time zone aware DateTime.
 repository: https://github.com/srawlins/timezone
 environment:
-  sdk: '>=2.12.0 <3.0.0'
+  sdk: '>=2.19.0 <3.0.0'
 dependencies:
   path: ^1.8.0
 dev_dependencies:

diff --git a/test/datetime_browser_test.dart b/test/datetime_browser_test.dart
@@ -1,4 +1,6 @@
 @TestOn('browser')
+library;
+
 import 'package:test/test.dart';
 import 'package:timezone/browser.dart';
 

diff --git a/test/datetime_test.dart b/test/datetime_test.dart
@@ -1,4 +1,6 @@
 @TestOn('vm')
+library;
+
 import 'package:test/test.dart';
 import 'package:timezone/data/latest.dart';
 import 'package:timezone/timezone.dart';

diff --git a/test/datetime_test_no_database.dart b/test/datetime_test_no_database.dart
@@ -1,4 +1,6 @@
 @TestOn('vm')
+library;
+
 import 'package:test/test.dart';
 import 'package:timezone/timezone.dart';
 

diff --git a/test/two_way_test.dart b/test/two_way_test.dart
@@ -1,4 +1,6 @@
 @TestOn('vm')
+library;
+
 import 'package:test/test.dart';
 import 'package:timezone/standalone.dart';
 

diff --git a/test/zicfile_test.dart b/test/zicfile_test.dart
@@ -1,5 +1,5 @@
 @TestOn('vm')
-library timezone.test.zicfile_test;
+library;
 
 import 'dart:io';
 import 'dart:isolate';
@@ -8,12 +8,6 @@ import 'package:path/path.dart' as p;
 import 'package:test/test.dart';
 import 'package:timezone/tzdata.dart' as tzdata;
 
-tzdata.TimeZone z(int offset,
-    {required bool isDst, required int abbreviationIndex}) {
-  return tzdata.TimeZone(offset,
-      isDst: isDst, abbreviationIndex: abbreviationIndex);
-}
-
 void main() {
   test('Read US/Eastern 2014h tzfile', () async {
     var packageUri = Uri(scheme: 'package', path: 'timezone/timezone.dart');

diff --git a/tool/encode_tzf.dart b/tool/encode_tzf.dart
@@ -5,6 +5,7 @@
 /// ```sh
 /// pub run tool/encode_tzf --zoneinfo path/to/zoneinfo
 /// ```
+library;
 
 import 'dart:io';
 import 'package:args/args.dart';

diff --git a/tool/get.dart b/tool/get.dart
@@ -8,6 +8,7 @@
 /// dart pub run tool/encode_dart lib/data/latest_all.{tzf,dart}
 /// dart pub run tool/encode_dart lib/data/latest_10y.{tzf,dart}
 /// ```
+library;
 
 import 'dart:async';
 import 'dart:io';