From 1011433971e1665a76fc4a411120a22aa3fd079e Mon Sep 17 00:00:00 2001 From: shirne Date: Thu, 18 Aug 2022 13:03:59 +0800 Subject: [PATCH] lints --- CHANGELOG.md | 4 + analysis_options.yaml | 7 +- example/bin/example.dart | 1 - example/pubspec.lock | 319 +-------------------------------------- example/pubspec.yaml | 5 +- pubspec.lock | 13 +- pubspec.yaml | 4 +- test/charset_test.dart | 15 +- 8 files changed, 22 insertions(+), 346 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fa4bbcb..6e3ebeb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.1.1 + +* example & readme + ## 1.1.0 * fix eucKr to support invalid code diff --git a/analysis_options.yaml b/analysis_options.yaml index a5744c1..98f9bc3 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -1,4 +1,9 @@ -include: package:flutter_lints/flutter.yaml +include: package:lints/recommended.yaml # Additional information about this file can be found at # https://dart.dev/guides/language/analysis-options +linter: + rules: + prefer_final_fields: true + prefer_const_declarations: true + diff --git a/example/bin/example.dart b/example/bin/example.dart index 5f50523..585b911 100644 --- a/example/bin/example.dart +++ b/example/bin/example.dart @@ -1,7 +1,6 @@ import 'dart:convert'; import 'package:charset/charset.dart'; -import 'package:example/example.dart' as example; void main(List arguments) { // default diff --git a/example/pubspec.lock b/example/pubspec.lock index 331a41e..c705e27 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -1,125 +1,13 @@ # Generated by pub # See https://dart.dev/tools/pub/glossary#lockfile packages: - _fe_analyzer_shared: - dependency: transitive - description: - name: _fe_analyzer_shared - url: "https://pub.flutter-io.cn" - source: hosted - version: "46.0.0" - analyzer: - dependency: transitive - description: - name: analyzer - url: "https://pub.flutter-io.cn" - source: hosted - version: "4.6.0" - args: - dependency: transitive - description: - name: args - url: "https://pub.flutter-io.cn" - source: hosted - version: "2.3.1" - async: - dependency: transitive - description: - name: async - url: "https://pub.flutter-io.cn" - source: hosted - version: "2.9.0" - boolean_selector: - dependency: transitive - description: - name: boolean_selector - url: "https://pub.flutter-io.cn" - source: hosted - version: "2.1.0" charset: dependency: "direct main" description: path: ".." relative: true source: path - version: "1.1.0" - collection: - dependency: transitive - description: - name: collection - url: "https://pub.flutter-io.cn" - source: hosted - version: "1.16.0" - convert: - dependency: transitive - description: - name: convert - url: "https://pub.flutter-io.cn" - source: hosted - version: "3.0.2" - coverage: - dependency: transitive - description: - name: coverage - url: "https://pub.flutter-io.cn" - source: hosted - version: "1.5.0" - crypto: - dependency: transitive - description: - name: crypto - url: "https://pub.flutter-io.cn" - source: hosted - version: "3.0.2" - file: - dependency: transitive - description: - name: file - url: "https://pub.flutter-io.cn" - source: hosted - version: "6.1.3" - frontend_server_client: - dependency: transitive - description: - name: frontend_server_client - url: "https://pub.flutter-io.cn" - source: hosted - version: "2.1.3" - glob: - dependency: transitive - description: - name: glob - url: "https://pub.flutter-io.cn" - source: hosted - version: "2.1.0" - http_multi_server: - dependency: transitive - description: - name: http_multi_server - url: "https://pub.flutter-io.cn" - source: hosted - version: "3.2.1" - http_parser: - dependency: transitive - description: - name: http_parser - url: "https://pub.flutter-io.cn" - source: hosted - version: "4.0.1" - io: - dependency: transitive - description: - name: io - url: "https://pub.flutter-io.cn" - source: hosted - version: "1.0.3" - js: - dependency: transitive - description: - name: js - url: "https://pub.flutter-io.cn" - source: hosted - version: "0.6.4" + version: "1.1.1" lints: dependency: "direct dev" description: @@ -127,208 +15,5 @@ packages: url: "https://pub.flutter-io.cn" source: hosted version: "2.0.0" - logging: - dependency: transitive - description: - name: logging - url: "https://pub.flutter-io.cn" - source: hosted - version: "1.0.2" - matcher: - dependency: transitive - description: - name: matcher - url: "https://pub.flutter-io.cn" - source: hosted - version: "0.12.12" - meta: - dependency: transitive - description: - name: meta - url: "https://pub.flutter-io.cn" - source: hosted - version: "1.8.0" - mime: - dependency: transitive - description: - name: mime - url: "https://pub.flutter-io.cn" - source: hosted - version: "1.0.2" - node_preamble: - dependency: transitive - description: - name: node_preamble - url: "https://pub.flutter-io.cn" - source: hosted - version: "2.0.1" - package_config: - dependency: transitive - description: - name: package_config - url: "https://pub.flutter-io.cn" - source: hosted - version: "2.1.0" - path: - dependency: transitive - description: - name: path - url: "https://pub.flutter-io.cn" - source: hosted - version: "1.8.2" - pool: - dependency: transitive - description: - name: pool - url: "https://pub.flutter-io.cn" - source: hosted - version: "1.5.1" - pub_semver: - dependency: transitive - description: - name: pub_semver - url: "https://pub.flutter-io.cn" - source: hosted - version: "2.1.1" - shelf: - dependency: transitive - description: - name: shelf - url: "https://pub.flutter-io.cn" - source: hosted - version: "1.3.2" - shelf_packages_handler: - dependency: transitive - description: - name: shelf_packages_handler - url: "https://pub.flutter-io.cn" - source: hosted - version: "3.0.1" - shelf_static: - dependency: transitive - description: - name: shelf_static - url: "https://pub.flutter-io.cn" - source: hosted - version: "1.1.1" - shelf_web_socket: - dependency: transitive - description: - name: shelf_web_socket - url: "https://pub.flutter-io.cn" - source: hosted - version: "1.0.2" - source_map_stack_trace: - dependency: transitive - description: - name: source_map_stack_trace - url: "https://pub.flutter-io.cn" - source: hosted - version: "2.1.0" - source_maps: - dependency: transitive - description: - name: source_maps - url: "https://pub.flutter-io.cn" - source: hosted - version: "0.10.10" - source_span: - dependency: transitive - description: - name: source_span - url: "https://pub.flutter-io.cn" - source: hosted - version: "1.9.1" - stack_trace: - dependency: transitive - description: - name: stack_trace - url: "https://pub.flutter-io.cn" - source: hosted - version: "1.10.0" - stream_channel: - dependency: transitive - description: - name: stream_channel - url: "https://pub.flutter-io.cn" - source: hosted - version: "2.1.0" - string_scanner: - dependency: transitive - description: - name: string_scanner - url: "https://pub.flutter-io.cn" - source: hosted - version: "1.1.1" - term_glyph: - dependency: transitive - description: - name: term_glyph - url: "https://pub.flutter-io.cn" - source: hosted - version: "1.2.1" - test: - dependency: "direct dev" - description: - name: test - url: "https://pub.flutter-io.cn" - source: hosted - version: "1.21.4" - test_api: - dependency: transitive - description: - name: test_api - url: "https://pub.flutter-io.cn" - source: hosted - version: "0.4.12" - test_core: - dependency: transitive - description: - name: test_core - url: "https://pub.flutter-io.cn" - source: hosted - version: "0.4.16" - typed_data: - dependency: transitive - description: - name: typed_data - url: "https://pub.flutter-io.cn" - source: hosted - version: "1.3.1" - vm_service: - dependency: transitive - description: - name: vm_service - url: "https://pub.flutter-io.cn" - source: hosted - version: "9.3.0" - watcher: - dependency: transitive - description: - name: watcher - url: "https://pub.flutter-io.cn" - source: hosted - version: "1.0.1" - web_socket_channel: - dependency: transitive - description: - name: web_socket_channel - url: "https://pub.flutter-io.cn" - source: hosted - version: "2.2.0" - webkit_inspection_protocol: - dependency: transitive - description: - name: webkit_inspection_protocol - url: "https://pub.flutter-io.cn" - source: hosted - version: "1.1.0" - yaml: - dependency: transitive - description: - name: yaml - url: "https://pub.flutter-io.cn" - source: hosted - version: "3.1.1" sdks: - dart: ">=2.17.6 <3.0.0" + dart: ">=2.17.0-206.0.dev <3.0.0" diff --git a/example/pubspec.yaml b/example/pubspec.yaml index d640c3e..494d0cf 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -1,10 +1,10 @@ name: example description: A sample command-line application. version: 1.0.0 -# homepage: https://www.example.com +publish_to: none environment: - sdk: '>=2.17.6 <3.0.0' + sdk: '>=2.12.0 <3.0.0' dependencies: charset: @@ -12,4 +12,3 @@ dependencies: dev_dependencies: lints: ^2.0.0 - test: ^1.16.0 diff --git a/pubspec.lock b/pubspec.lock index 4dcfde9..39116a4 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -85,13 +85,6 @@ packages: url: "https://pub.flutter-io.cn" source: hosted version: "6.1.2" - flutter_lints: - dependency: "direct dev" - description: - name: flutter_lints - url: "https://pub.flutter-io.cn" - source: hosted - version: "1.0.4" frontend_server_client: dependency: transitive description: @@ -135,12 +128,12 @@ packages: source: hosted version: "0.6.3" lints: - dependency: transitive + dependency: "direct dev" description: name: lints url: "https://pub.flutter-io.cn" source: hosted - version: "1.0.1" + version: "2.0.0" logging: dependency: transitive description: @@ -352,4 +345,4 @@ packages: source: hosted version: "3.1.0" sdks: - dart: ">=2.12.0 <3.0.0" + dart: ">=2.17.0-206.0.dev <3.0.0" diff --git a/pubspec.yaml b/pubspec.yaml index 3f59b8e..423a64a 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: charset description: Charset encoding and decoding Library, include iso-(2-15), windows series, gbk, euc-jp, euc-kr, shift-jis. And supportted charset detect, canEncode, canDecode. -version: 1.1.0 +version: 1.1.1 homepage: repository: https://github.com/shirne/charset-dart @@ -11,7 +11,7 @@ dependencies: dev_dependencies: test: - flutter_lints: ^1.0.0 + lints: ^2.0.0 # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec diff --git a/test/charset_test.dart b/test/charset_test.dart index 6e76c1b..d3c6e08 100644 --- a/test/charset_test.dart +++ b/test/charset_test.dart @@ -90,11 +90,7 @@ void main() { bool canEncode = false; for (Encoding encoder in neededEncoders) { if (Charset.canEncode(encoder, char)) { - print(encoder.name + - " " + - code.toString() + - " " + - encoder.encode(char).join(",")); + print("${encoder.name} $code ${encoder.encode(char).join(",")}"); canEncode = true; break; } @@ -102,19 +98,14 @@ void main() { if (!canEncode) { for (Encoding encoder in encoders) { if (Charset.canEncode(encoder, char)) { - print("+" + - encoder.name + - " " + - code.toString() + - " " + - encoder.encode(char).join(",")); + print("+${encoder.name} $code ${encoder.encode(char).join(",")}"); canEncode = true; break; } } } if (!canEncode) { - print("+ utf " + code.toString()); + print("+ utf $code"); } } });