Bumped deps to actual versions

analysis_options.yaml

@@ -19,7 +19,6 @@ linter:
     - always_declare_return_types
     - always_put_control_body_on_new_line
     - always_put_required_named_parameters_first
-    - always_require_non_null_named_parameters
     - annotate_overrides
     - avoid_annotating_with_dynamic
     - avoid_bool_literals_in_conditional_expressions
@@ -40,8 +39,6 @@ linter:
     - avoid_relative_lib_imports
     - avoid_renaming_method_parameters
     - avoid_return_types_on_setters
-    - avoid_returning_null
-    - avoid_returning_null_for_future
     - avoid_returning_null_for_void
     - avoid_returning_this
     - avoid_setters_without_getters
@@ -72,11 +69,9 @@ linter:
     - file_names
     - hash_and_equals
     - implementation_imports
-    - iterable_contains_unrelated_type
     - join_return_with_assignment
     - library_names
     - library_prefixes
-    - list_remove_unrelated_type
     - literal_only_boolean_expressions
     - no_adjacent_strings_in_list
     - no_duplicate_case_values
@@ -85,7 +80,6 @@ linter:
     # - one_member_abstracts
     - only_throw_errors
     - overridden_fields
-    - package_api_docs
     - package_names
     - package_prefixed_library_names
     - parameter_assignments
@@ -100,7 +94,6 @@ linter:
     - prefer_const_literals_to_create_immutables
     - prefer_constructors_over_static_methods
     - prefer_contains
-    - prefer_equal_for_default_values
     - prefer_final_fields
     - prefer_final_in_for_each
     - prefer_final_locals
@@ -150,7 +143,6 @@ linter:
     - unnecessary_statements
     - unnecessary_this
     - unrelated_type_equality_checks
-    - unsafe_html
     - use_full_hex_values_for_flutter_colors
     - use_function_type_syntax_for_parameters
     - use_rethrow_when_possible

bin/generator.dart

@@ -8,12 +8,13 @@ import 'package:icon_font_generator/src/common/api.dart';
 import 'package:icon_font_generator/src/otf/io.dart';
 import 'package:icon_font_generator/src/utils/logger.dart';
 import 'package:path/path.dart' as p;
+import 'package:pub_semver/pub_semver.dart';
 import 'package:yaml/yaml.dart';
 
 final _argParser = ArgParser(allowTrailingOptions: true);
 final formatter = DartFormatter(
   pageWidth: 80,
-  fixes: StyleFix.all,
+  languageVersion: Version(2, 19, 0),
 );
 
 void main(List<String> args) {
@@ -47,22 +48,22 @@ void _run(CliArguments parsedArgs) {
   final isVerbose = parsedArgs.verbose ?? kDefaultVerbose;
 
   if (isVerbose) {
-    logger.setFilterLevel(Level.verbose);
+    logger.setFilterLevel(Level.trace);
   }
 
   final hasClassFile = parsedArgs.classFile != null;
   if (hasClassFile && !parsedArgs.classFile!.existsSync()) {
     parsedArgs.classFile!.createSync(recursive: true);
   } else if (hasClassFile) {
-    logger.v(
+    logger.t(
         'Output file for a Flutter class already exists (${parsedArgs.classFile!.path}) - '
         'overwriting it');
   }
 
   if (!parsedArgs.fontFile.existsSync()) {
     parsedArgs.fontFile.createSync(recursive: true);
   } else {
-    logger.v(
+    logger.t(
         'Output file for a font file already exists (${parsedArgs.fontFile.path}) - '
         'overwriting it');
   }
@@ -92,7 +93,7 @@ void _run(CliArguments parsedArgs) {
   writeToFile(parsedArgs.fontFile.path, otfResult.font);
 
   if (parsedArgs.classFile == null) {
-    logger.v('No output path for Flutter class was specified - '
+    logger.t('No output path for Flutter class was specified - '
         'skipping class generation.');
   } else {
     final fontFileName = p.basename(parsedArgs.fontFile.path);
@@ -107,7 +108,7 @@ void _run(CliArguments parsedArgs) {
 
     if (parsedArgs.format ?? kDefaultFormat) {
       try {
-        logger.v('Formatting Flutter class generation.');
+        logger.t('Formatting Flutter class generation.');
         classString = formatter.format(classString);
       } on Object catch (e) {
         logger.e(e.toString());

lib/icon_font_generator.dart

@@ -1,4 +1,4 @@
-library icon_font_generator;
+library;
 
 export 'src/common.dart';
 export 'src/otf.dart';

lib/src/cli/arguments.dart

@@ -2,7 +2,6 @@ import 'dart:io';
 import 'dart:math' as math;
 
 import 'package:args/args.dart';
-import 'package:collection/collection.dart';
 import 'package:yaml/yaml.dart';
 
 import '../utils/enum_class.dart';
@@ -222,7 +221,7 @@ Map<CliArgument, Object?>? parseConfig(String config) {
   }
 
   final entries =
-      iconFontGeneratoryamlmap.entries.map(_mapConfigKeyEntry).whereNotNull();
+      iconFontGeneratoryamlmap.entries.map(_mapConfigKeyEntry).nonNulls;
 
   return Map<CliArgument, Object?>.fromEntries(entries);
 }

lib/src/common.dart

@@ -1,4 +1,4 @@
-library icon_font_generator.common;
+library;
 
 export 'common/api.dart';
 export 'common/generic_glyph.dart';

lib/src/otf.dart

@@ -1,4 +1,4 @@
-library icon_font_generator.otf;
+library;
 
 export 'otf/otf.dart';
 export 'otf/reader.dart';

lib/src/otf/cff/char_string.dart

@@ -11,7 +11,7 @@ import 'operand.dart';
 import 'operator.dart';
 
 class CharStringOperand extends CFFOperand {
-  CharStringOperand(num? value, [int? size]) : super(value, size);
+  CharStringOperand(super.value, [super.size]);
 
   factory CharStringOperand.fromByteData(
       ByteData byteData, int offset, int b0) {

lib/src/otf/cff/charset.dart

@@ -1,4 +1,4 @@
-part of icon_font_generator.otf.cff;
+part of '../table/cff.dart';
 
 const _kFormat0 = 0;
 const _kFormat1 = 1;
@@ -29,7 +29,7 @@ abstract class CharsetEntry implements BinaryCodable {
 }
 
 class CharsetEntryFormat1 extends CharsetEntry {
-  CharsetEntryFormat1(int format, this.rangeList) : super(format);
+  CharsetEntryFormat1(super.format, this.rangeList);
 
   factory CharsetEntryFormat1.fromByteData(ByteData byteData, int glyphCount) {
     final rangeList = <Range1>[];

lib/src/otf/cff/standard_string.dart

@@ -1,4 +1,4 @@
-part of icon_font_generator.otf.cff;
+part of '../table/cff.dart';
 
 final _cffStandardStringCount = _kCffStandardStringList.length;
 

lib/src/otf/io.dart

@@ -15,8 +15,7 @@ OpenTypeFont readFromFile(String path) =>
 
 /// Writes OpenType font to a file.
 void writeToFile(String path, OpenTypeFont font) {
-  final file = File(path);
-  file.createSync(recursive: true);
+  final file = File(path)..createSync(recursive: true);
   final byteData = OTFWriter().write(font);
   final extension = p.extension(file.path).toLowerCase();
 

lib/src/otf/reader.dart

@@ -117,7 +117,7 @@ class OTFReader {
   /// Throws [ChecksumException] if calculated checksum is different than expected
   void _validateChecksums() {
     final byteDataCopy = ByteData.sublistView(
-        Uint8List.fromList([..._byteData.buffer.asUint8List().toList()]))
+        Uint8List.fromList([..._byteData.buffer.asUint8List()]))
       ..setUint32(_font.head.entry!.offset + 8,
           0); // Setting head table's checkSumAdjustment to 0
 

lib/src/otf/table/cff.dart

@@ -1,4 +1,4 @@
-library icon_font_generator.otf.cff;
+library;
 
 import 'dart:typed_data';
 
@@ -31,8 +31,8 @@ const _kMajorVersion1 = 0x0001;
 const _kMajorVersion2 = 0x0002;
 
 abstract class CFFTable extends FontTable {
-  CFFTable.fromTableRecordEntry(TableRecordEntry? entry)
-      : super.fromTableRecordEntry(entry);
+  CFFTable.fromTableRecordEntry(super.entry)
+      : super.fromTableRecordEntry();
 
   static CFFTable? fromByteData(ByteData byteData, TableRecordEntry entry) {
     final major = byteData.getUint8(entry.offset);

lib/src/otf/table/cff1.dart

@@ -1,4 +1,4 @@
-part of icon_font_generator.otf.cff;
+part of 'cff.dart';
 
 const _kCFF1HeaderSize = 4;
 
@@ -44,7 +44,7 @@ class CFF1TableHeader implements BinaryCodable {
 
 class CFF1Table extends CFFTable implements CalculatableOffsets {
   CFF1Table(
-    TableRecordEntry? entry,
+    super.entry,
     this.header,
     this.nameIndex,
     this.topDicts,
@@ -55,7 +55,7 @@ class CFF1Table extends CFFTable implements CalculatableOffsets {
     this.fontDictList,
     this.privateDictList,
     this.localSubrsDataList,
-  ) : super.fromTableRecordEntry(entry);
+  ) : super.fromTableRecordEntry();
 
   factory CFF1Table.fromByteData(
     ByteData byteData,

lib/src/otf/table/cff2.dart

@@ -1,4 +1,4 @@
-part of icon_font_generator.otf.cff;
+part of 'cff.dart';
 
 const _kCFF2HeaderSize = 5;
 
@@ -38,7 +38,7 @@ class CFF2TableHeader implements BinaryCodable {
 
 class CFF2Table extends CFFTable implements CalculatableOffsets {
   CFF2Table(
-    TableRecordEntry? entry,
+    super.entry,
     this.header,
     this.topDict,
     this.globalSubrsData,
@@ -47,7 +47,7 @@ class CFF2Table extends CFFTable implements CalculatableOffsets {
     this.fontDictList,
     this.privateDictList,
     this.localSubrsDataList,
-  ) : super.fromTableRecordEntry(entry);
+  ) : super.fromTableRecordEntry();
 
   factory CFF2Table.fromByteData(
     ByteData byteData,

lib/src/otf/table/cmap.dart

@@ -189,8 +189,7 @@ abstract class CmapData implements BinaryCodable {
 
 class CmapByteEncodingTable extends CmapData {
   CmapByteEncodingTable(
-      int format, this.length, this.language, this.glyphIdArray)
-      : super(format);
+      super.format, this.length, this.language, this.glyphIdArray);
 
   factory CmapByteEncodingTable.fromByteData(ByteData byteData, int offset) {
     return CmapByteEncodingTable(
@@ -228,7 +227,7 @@ class CmapByteEncodingTable extends CmapData {
 
 class CmapSegmentMappingToDeltaValuesTable extends CmapData {
   CmapSegmentMappingToDeltaValuesTable(
-      int format,
+      super.format,
       this.length,
       this.language,
       this.segCount,
@@ -240,8 +239,7 @@ class CmapSegmentMappingToDeltaValuesTable extends CmapData {
       this.startCode,
       this.idDelta,
       this.idRangeOffset,
-      this.glyphIdArray)
-      : super(format);
+      this.glyphIdArray);
 
   factory CmapSegmentMappingToDeltaValuesTable.fromByteData(
       ByteData byteData, int startOffset) {
@@ -387,13 +385,13 @@ class CmapSegmentMappingToDeltaValuesTable extends CmapData {
 
 class CmapSegmentedCoverageTable extends CmapData {
   CmapSegmentedCoverageTable(
-    int format,
+    super.format,
     this.reserved,
     this.length,
     this.language,
     this.numGroups,
     this.groups,
-  ) : super(format);
+  );
 
   factory CmapSegmentedCoverageTable.fromByteData(
       ByteData byteData, int offset) {
@@ -462,10 +460,10 @@ class CmapSegmentedCoverageTable extends CmapData {
 
 class CharacterToGlyphTable extends FontTable {
   CharacterToGlyphTable(
-    TableRecordEntry? entry,
+    super.entry,
     this.header,
     this.data,
-  ) : super.fromTableRecordEntry(entry);
+  ) : super.fromTableRecordEntry();
 
   factory CharacterToGlyphTable.fromByteData(
     ByteData byteData,

lib/src/otf/table/glyf.dart

@@ -12,9 +12,9 @@ import 'table_record_entry.dart';
 
 class GlyphDataTable extends FontTable {
   GlyphDataTable(
-    TableRecordEntry? entry,
+    super.entry,
     this.glyphList,
-  ) : super.fromTableRecordEntry(entry);
+  ) : super.fromTableRecordEntry();
 
   factory GlyphDataTable.fromByteData(ByteData byteData, TableRecordEntry entry,
       IndexToLocationTable locationTable, int numGlyphs) {

lib/src/otf/table/gsub.dart

@@ -74,9 +74,9 @@ class GlyphSubstitutionTableHeader implements BinaryCodable {
 }
 
 class GlyphSubstitutionTable extends FontTable {
-  GlyphSubstitutionTable(TableRecordEntry? entry, this.header,
+  GlyphSubstitutionTable(super.entry, this.header,
       this.scriptListTable, this.featureListTable, this.lookupListTable)
-      : super.fromTableRecordEntry(entry);
+      : super.fromTableRecordEntry();
 
   factory GlyphSubstitutionTable.fromByteData(
     ByteData byteData,

lib/src/otf/table/head.dart

@@ -20,7 +20,7 @@ const _kHeaderTableSize = 54;
 
 class HeaderTable extends FontTable {
   HeaderTable(
-      TableRecordEntry? entry,
+      super.entry,
       this.fontRevision,
       this.checkSumAdjustment,
       this.flags,
@@ -39,10 +39,10 @@ class HeaderTable extends FontTable {
         fontDirectionHint = 2,
         glyphDataFormat = 0,
         magicNumber = _kMagicNumber,
-        super.fromTableRecordEntry(entry);
+        super.fromTableRecordEntry();
 
   HeaderTable._(
-      TableRecordEntry entry,
+      TableRecordEntry super.entry,
       this.majorVersion,
       this.minorVersion,
       this.fontRevision,
@@ -61,7 +61,7 @@ class HeaderTable extends FontTable {
       this.fontDirectionHint,
       this.indexToLocFormat,
       this.glyphDataFormat)
-      : super.fromTableRecordEntry(entry);
+      : super.fromTableRecordEntry();
 
   factory HeaderTable.fromByteData(ByteData data, TableRecordEntry entry) =>
       HeaderTable._(

lib/src/otf/table/hhea.dart

@@ -10,7 +10,7 @@ const _kHheaTableSize = 36;
 
 class HorizontalHeaderTable extends FontTable {
   HorizontalHeaderTable(
-    TableRecordEntry? entry,
+    super.entry,
     this.majorVersion,
     this.minorVersion,
     this.ascender,
@@ -25,7 +25,7 @@ class HorizontalHeaderTable extends FontTable {
     this.caretOffset,
     this.metricDataFormat,
     this.numberOfHMetrics,
-  ) : super.fromTableRecordEntry(entry);
+  ) : super.fromTableRecordEntry();
 
   factory HorizontalHeaderTable.fromByteData(
       ByteData byteData, TableRecordEntry entry) {