From bff0c332567c31c8c53573d4b104338e81e1edc4 Mon Sep 17 00:00:00 2001 From: DmitryM Date: Sun, 31 Aug 2025 15:57:09 +0500 Subject: [PATCH] update deps and fix analyzer issues --- analysis_options.yaml | 8 --- bin/generator.dart | 13 +++-- lib/icon_font_generator.dart | 2 +- lib/src/cli/arguments.dart | 3 +- lib/src/common.dart | 2 +- lib/src/otf.dart | 2 +- lib/src/otf/cff/char_string.dart | 2 +- lib/src/otf/cff/charset.dart | 4 +- lib/src/otf/cff/standard_string.dart | 2 +- lib/src/otf/io.dart | 3 +- lib/src/otf/reader.dart | 2 +- lib/src/otf/table/cff.dart | 6 +- lib/src/otf/table/cff1.dart | 6 +- lib/src/otf/table/cff2.dart | 6 +- lib/src/otf/table/cmap.dart | 16 +++--- lib/src/otf/table/glyf.dart | 4 +- lib/src/otf/table/gsub.dart | 4 +- lib/src/otf/table/head.dart | 8 +-- lib/src/otf/table/hhea.dart | 4 +- lib/src/otf/table/hmtx.dart | 4 +- lib/src/otf/table/loca.dart | 4 +- lib/src/otf/table/maxp.dart | 8 +-- lib/src/otf/table/name.dart | 8 +-- lib/src/otf/table/os2.dart | 4 +- lib/src/otf/table/post.dart | 4 +- lib/src/svg.dart | 2 +- lib/src/svg/outline_converter.dart | 2 +- lib/src/svg/unknown_element.dart | 5 +- lib/src/utils.dart | 2 +- pubspec.lock | 84 ++++++++++++++-------------- pubspec.yaml | 27 ++++----- 31 files changed, 119 insertions(+), 132 deletions(-) diff --git a/analysis_options.yaml b/analysis_options.yaml index 58426e1..d509388 100644 --- a/analysis_options.yaml +++ b/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 diff --git a/bin/generator.dart b/bin/generator.dart index 7ab4ad0..745fce5 100644 --- a/bin/generator.dart +++ b/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 args) { @@ -47,14 +48,14 @@ 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'); } @@ -62,7 +63,7 @@ void _run(CliArguments parsedArgs) { 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()); diff --git a/lib/icon_font_generator.dart b/lib/icon_font_generator.dart index 4fc356e..be6690f 100644 --- a/lib/icon_font_generator.dart +++ b/lib/icon_font_generator.dart @@ -1,4 +1,4 @@ -library icon_font_generator; +library; export 'src/common.dart'; export 'src/otf.dart'; diff --git a/lib/src/cli/arguments.dart b/lib/src/cli/arguments.dart index 80ccab5..9f6dc11 100644 --- a/lib/src/cli/arguments.dart +++ b/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? parseConfig(String config) { } final entries = - iconFontGeneratoryamlmap.entries.map(_mapConfigKeyEntry).whereNotNull(); + iconFontGeneratoryamlmap.entries.map(_mapConfigKeyEntry).nonNulls; return Map.fromEntries(entries); } diff --git a/lib/src/common.dart b/lib/src/common.dart index 0e595f8..d98420d 100644 --- a/lib/src/common.dart +++ b/lib/src/common.dart @@ -1,4 +1,4 @@ -library icon_font_generator.common; +library; export 'common/api.dart'; export 'common/generic_glyph.dart'; diff --git a/lib/src/otf.dart b/lib/src/otf.dart index 507177a..1e8ab76 100644 --- a/lib/src/otf.dart +++ b/lib/src/otf.dart @@ -1,4 +1,4 @@ -library icon_font_generator.otf; +library; export 'otf/otf.dart'; export 'otf/reader.dart'; diff --git a/lib/src/otf/cff/char_string.dart b/lib/src/otf/cff/char_string.dart index 25599f6..4bef23d 100644 --- a/lib/src/otf/cff/char_string.dart +++ b/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) { diff --git a/lib/src/otf/cff/charset.dart b/lib/src/otf/cff/charset.dart index ca5f4db..07db99e 100644 --- a/lib/src/otf/cff/charset.dart +++ b/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 = []; diff --git a/lib/src/otf/cff/standard_string.dart b/lib/src/otf/cff/standard_string.dart index aefdf42..3cad9be 100644 --- a/lib/src/otf/cff/standard_string.dart +++ b/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; diff --git a/lib/src/otf/io.dart b/lib/src/otf/io.dart index de27f77..8bd690c 100644 --- a/lib/src/otf/io.dart +++ b/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(); diff --git a/lib/src/otf/reader.dart b/lib/src/otf/reader.dart index 0d867b4..388593c 100644 --- a/lib/src/otf/reader.dart +++ b/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 diff --git a/lib/src/otf/table/cff.dart b/lib/src/otf/table/cff.dart index f815e15..4001824 100644 --- a/lib/src/otf/table/cff.dart +++ b/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); diff --git a/lib/src/otf/table/cff1.dart b/lib/src/otf/table/cff1.dart index 0916f86..d7ed816 100644 --- a/lib/src/otf/table/cff1.dart +++ b/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, diff --git a/lib/src/otf/table/cff2.dart b/lib/src/otf/table/cff2.dart index 9c0c032..f920f03 100644 --- a/lib/src/otf/table/cff2.dart +++ b/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, diff --git a/lib/src/otf/table/cmap.dart b/lib/src/otf/table/cmap.dart index 5da601c..334c4cd 100644 --- a/lib/src/otf/table/cmap.dart +++ b/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, diff --git a/lib/src/otf/table/glyf.dart b/lib/src/otf/table/glyf.dart index 70d6906..a1a869e 100644 --- a/lib/src/otf/table/glyf.dart +++ b/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) { diff --git a/lib/src/otf/table/gsub.dart b/lib/src/otf/table/gsub.dart index e4fdcf8..1c0f864 100644 --- a/lib/src/otf/table/gsub.dart +++ b/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, diff --git a/lib/src/otf/table/head.dart b/lib/src/otf/table/head.dart index 5b4c647..3e96446 100644 --- a/lib/src/otf/table/head.dart +++ b/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._( diff --git a/lib/src/otf/table/hhea.dart b/lib/src/otf/table/hhea.dart index c8b5ff9..bf88c94 100644 --- a/lib/src/otf/table/hhea.dart +++ b/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) { diff --git a/lib/src/otf/table/hmtx.dart b/lib/src/otf/table/hmtx.dart index 0878398..d1516bf 100644 --- a/lib/src/otf/table/hmtx.dart +++ b/lib/src/otf/table/hmtx.dart @@ -49,10 +49,10 @@ class LongHorMetric implements BinaryCodable { class HorizontalMetricsTable extends FontTable { HorizontalMetricsTable( - TableRecordEntry? entry, + super.entry, this.hMetrics, this.leftSideBearings, - ) : super.fromTableRecordEntry(entry); + ) : super.fromTableRecordEntry(); factory HorizontalMetricsTable.fromByteData(ByteData byteData, TableRecordEntry entry, HorizontalHeaderTable hhea, int numGlyphs) { diff --git a/lib/src/otf/table/loca.dart b/lib/src/otf/table/loca.dart index cc91016..13f2a5f 100644 --- a/lib/src/otf/table/loca.dart +++ b/lib/src/otf/table/loca.dart @@ -7,10 +7,10 @@ import 'table_record_entry.dart'; class IndexToLocationTable extends FontTable { IndexToLocationTable( - TableRecordEntry? entry, + super.entry, this.glyphOffsets, this._isShort, - ) : super.fromTableRecordEntry(entry); + ) : super.fromTableRecordEntry(); factory IndexToLocationTable.fromByteData(ByteData byteData, TableRecordEntry entry, int indexToLocFormat, int numGlyphs) { diff --git a/lib/src/otf/table/maxp.dart b/lib/src/otf/table/maxp.dart index 2c88178..7b09275 100644 --- a/lib/src/otf/table/maxp.dart +++ b/lib/src/otf/table/maxp.dart @@ -16,7 +16,7 @@ const _kTableSizeForVersion = { }; class MaximumProfileTable extends FontTable { - MaximumProfileTable.v0(TableRecordEntry? entry, this.numGlyphs) + MaximumProfileTable.v0(super.entry, this.numGlyphs) : version = _kVersion0, maxPoints = null, maxContours = null, @@ -31,10 +31,10 @@ class MaximumProfileTable extends FontTable { maxSizeOfInstructions = null, maxComponentElements = null, maxComponentDepth = null, - super.fromTableRecordEntry(entry); + super.fromTableRecordEntry(); MaximumProfileTable.v1( - TableRecordEntry? entry, + super.entry, this.numGlyphs, this.maxPoints, this.maxContours, @@ -50,7 +50,7 @@ class MaximumProfileTable extends FontTable { this.maxComponentElements, this.maxComponentDepth) : version = _kVersion1, - super.fromTableRecordEntry(entry); + super.fromTableRecordEntry(); factory MaximumProfileTable.create(int numGlyphs, GlyphDataTable? glyf) { final isOpenType = glyf == null; diff --git a/lib/src/otf/table/name.dart b/lib/src/otf/table/name.dart index 0e09bf5..25ec4a4 100644 --- a/lib/src/otf/table/name.dart +++ b/lib/src/otf/table/name.dart @@ -223,8 +223,8 @@ class NamingTableFormat0Header implements BinaryCodable { } abstract class NamingTable extends FontTable { - NamingTable.fromTableRecordEntry(TableRecordEntry? entry) - : super.fromTableRecordEntry(entry); + NamingTable.fromTableRecordEntry(super.entry) + : super.fromTableRecordEntry(); static NamingTable? fromByteData(ByteData byteData, TableRecordEntry entry) { final format = byteData.getUint16(entry.offset); @@ -257,10 +257,10 @@ abstract class NamingTable extends FontTable { class NamingTableFormat0 extends NamingTable { NamingTableFormat0( - TableRecordEntry? entry, + super.entry, this.header, this.stringList, - ) : super.fromTableRecordEntry(entry); + ) : super.fromTableRecordEntry(); factory NamingTableFormat0.create( String fontName, String? description, Revision revision) { diff --git a/lib/src/otf/table/os2.dart b/lib/src/otf/table/os2.dart index a91bedc..637094e 100644 --- a/lib/src/otf/table/os2.dart +++ b/lib/src/otf/table/os2.dart @@ -44,7 +44,7 @@ const _kDefaultPANOSE = [2, 0, 5, 3, 0, 0, 0, 0, 0, 0]; class OS2Table extends FontTable { OS2Table._( - TableRecordEntry? entry, + super.entry, this.version, this.xAvgCharWidth, this.usWeightClass, @@ -84,7 +84,7 @@ class OS2Table extends FontTable { this.usMaxContext, this.usLowerOpticalPointSize, this.usUpperOpticalPointSize, - ) : super.fromTableRecordEntry(entry); + ) : super.fromTableRecordEntry(); factory OS2Table.fromByteData(ByteData byteData, TableRecordEntry entry) { final version = byteData.getInt16(entry.offset); diff --git a/lib/src/otf/table/post.dart b/lib/src/otf/table/post.dart index d782c58..7a801d4 100644 --- a/lib/src/otf/table/post.dart +++ b/lib/src/otf/table/post.dart @@ -217,8 +217,8 @@ class PostScriptVersion20 extends PostScriptData { } class PostScriptTable extends FontTable { - PostScriptTable(TableRecordEntry? entry, this.header, this.data) - : super.fromTableRecordEntry(entry); + PostScriptTable(super.entry, this.header, this.data) + : super.fromTableRecordEntry(); factory PostScriptTable.fromByteData( ByteData byteData, TableRecordEntry entry) { diff --git a/lib/src/svg.dart b/lib/src/svg.dart index 4c23206..537df55 100644 --- a/lib/src/svg.dart +++ b/lib/src/svg.dart @@ -1,3 +1,3 @@ -library icon_font_generator.svg; +library; export 'svg/svg.dart'; diff --git a/lib/src/svg/outline_converter.dart b/lib/src/svg/outline_converter.dart index 7b5604b..38094c4 100644 --- a/lib/src/svg/outline_converter.dart +++ b/lib/src/svg/outline_converter.dart @@ -71,7 +71,7 @@ class PathToOutlineConverter extends PathProxy { _isOnCurve.addAll([false, false, true]); } - /// Converts SVG to a list of outlines. + /// Converts SVG <path> to a list of outlines. List convert() { writeSvgPathDataToPath(path.data, this); diff --git a/lib/src/svg/unknown_element.dart b/lib/src/svg/unknown_element.dart index 6b7ce33..8f34ccf 100644 --- a/lib/src/svg/unknown_element.dart +++ b/lib/src/svg/unknown_element.dart @@ -1,8 +1,5 @@ -import 'package:xml/xml.dart'; - import 'element.dart'; class UnknownElement extends SvgElement { - UnknownElement(SvgElement? parent, XmlElement? element) - : super(parent, element); + UnknownElement(super.parent, super.element); } diff --git a/lib/src/utils.dart b/lib/src/utils.dart index 22bd3c0..87f6414 100644 --- a/lib/src/utils.dart +++ b/lib/src/utils.dart @@ -1,4 +1,4 @@ -library icon_font_generator.utils; +library; export 'utils/exception.dart'; export 'utils/flutter_class_gen.dart'; diff --git a/pubspec.lock b/pubspec.lock index 87e1d13..a0b5c59 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,26 +5,26 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - sha256: a36ec4843dc30ea6bf652bf25e3448db6c5e8bcf4aa55f063a5d1dad216d8214 + sha256: f0bb5d1648339c8308cc0b9838d8456b3cfe5c91f9dc1a735b4d003269e5da9a url: "https://pub.dev" source: hosted - version: "58.0.0" + version: "88.0.0" analyzer: dependency: transitive description: name: analyzer - sha256: cc4242565347e98424ce9945c819c192ec0838cb9d1f6aa4a97cc96becbc5b27 + sha256: "0b7b9c329d2879f8f05d6c05b32ee9ec025f39b077864bdb5ac9a7b63418a98f" url: "https://pub.dev" source: hosted - version: "5.10.0" + version: "8.1.1" args: dependency: "direct main" description: name: args - sha256: "4cab82a83ffef80b262ddedf47a0a8e56ee6fbf7fe21e6e768b02792034dd440" + sha256: d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04 url: "https://pub.dev" source: hosted - version: "2.4.0" + version: "2.7.0" async: dependency: transitive description: @@ -45,10 +45,10 @@ packages: dependency: "direct main" description: name: collection - sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c" + sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76" url: "https://pub.dev" source: hosted - version: "1.17.1" + version: "1.19.1" convert: dependency: transitive description: @@ -77,10 +77,10 @@ packages: dependency: "direct main" description: name: dart_style - sha256: "6d691edde054969f0e0f26abb1b30834b5138b963793e56f69d3a9a4435e6352" + sha256: c87dfe3d56f183ffe9106a18aebc6db431fc7c98c31a54b952a77f3d54a85697 url: "https://pub.dev" source: hosted - version: "2.3.0" + version: "3.1.2" file: dependency: transitive description: @@ -141,18 +141,18 @@ packages: dependency: "direct dev" description: name: lints - sha256: "5e4a9cd06d447758280a8ac2405101e0e2094d2a1dbdd3756aec3fe7775ba593" + sha256: a5e2b223cb7c9c8efdc663ef484fdd95bb243bff242ef5b13e26883547fce9a0 url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "6.0.0" logger: dependency: "direct main" description: name: logger - sha256: db2ff852ed77090ba9f62d3611e4208a3d11dfa35991a81ae724c113fcb3e3f7 + sha256: "55d6c23a6c15db14920e037fe7e0dc32e7cdaf3b64b4b25df2d541b5b6b81c0c" url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "2.6.1" logging: dependency: transitive description: @@ -165,18 +165,18 @@ packages: dependency: transitive description: name: matcher - sha256: c94db23593b89766cda57aab9ac311e3616cf87c6fa4e9749df032f66f30dcb8 + sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2 url: "https://pub.dev" source: hosted - version: "0.12.14" + version: "0.12.17" meta: dependency: "direct main" description: name: meta - sha256: "12307e7f0605ce3da64cf0db90e5fcab0869f3ca03f76be6bb2991ce0a55e82b" + sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394" url: "https://pub.dev" source: hosted - version: "1.9.0" + version: "1.17.0" mime: dependency: transitive description: @@ -205,26 +205,26 @@ packages: dependency: "direct main" description: name: path - sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" + sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5" url: "https://pub.dev" source: hosted - version: "1.8.3" + version: "1.9.1" path_parsing: dependency: "direct main" description: name: path_parsing - sha256: e3e67b1629e6f7e8100b367d3db6ba6af4b1f0bb80f64db18ef1fbabd2fa9ccf + sha256: "883402936929eac138ee0a45da5b0f2c80f89913e6dc3bf77eb65b84b409c6ca" url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "1.1.0" petitparser: dependency: transitive description: name: petitparser - sha256: "49392a45ced973e8d94a85fdb21293fbb40ba805fc49f2965101ae748a3683b4" + sha256: "1a97266a94f7350d30ae522c0af07890c70b8e62c71e8e3920d1db4d23c057d1" url: "https://pub.dev" source: hosted - version: "5.1.0" + version: "7.0.1" pool: dependency: transitive description: @@ -234,13 +234,13 @@ packages: source: hosted version: "1.5.1" pub_semver: - dependency: transitive + dependency: "direct main" description: name: pub_semver - sha256: "307de764d305289ff24ad257ad5c5793ce56d04947599ad68b3baa124105fc17" + sha256: "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585" url: "https://pub.dev" source: hosted - version: "2.1.3" + version: "2.2.0" recase: dependency: "direct main" description: @@ -341,26 +341,26 @@ packages: dependency: "direct dev" description: name: test - sha256: "5301f54eb6fe945daa99bc8df6ece3f88b5ceaa6f996f250efdaaf63e22886be" + sha256: "75906bf273541b676716d1ca7627a17e4c4070a3a16272b7a3dc7da3b9f3f6b7" url: "https://pub.dev" source: hosted - version: "1.23.1" + version: "1.26.3" test_api: dependency: transitive description: name: test_api - sha256: "6182294da5abf431177fccc1ee02401f6df30f766bc6130a0852c6b6d7ee6b2d" + sha256: ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55 url: "https://pub.dev" source: hosted - version: "0.4.18" + version: "0.7.7" test_core: dependency: transitive description: name: test_core - sha256: d2e9240594b409565524802b84b7b39341da36dd6fd8e1660b53ad928ec3e9af + sha256: "0cc24b5ff94b38d2ae73e1eb43cc302b77964fbf67abad1e296025b78deb53d0" url: "https://pub.dev" source: hosted - version: "0.4.24" + version: "0.6.12" typed_data: dependency: transitive description: @@ -373,10 +373,10 @@ packages: dependency: "direct main" description: name: vector_math - sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" + sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b url: "https://pub.dev" source: hosted - version: "2.1.4" + version: "2.2.0" vm_service: dependency: transitive description: @@ -389,10 +389,10 @@ packages: dependency: transitive description: name: watcher - sha256: "6a7f46926b01ce81bfc339da6a7f20afbe7733eff9846f6d6a5466aa4c6667c0" + sha256: "5bf046f41320ac97a469d506261797f35254fa61c641741ef32dacda98b7d39c" url: "https://pub.dev" source: hosted - version: "1.0.2" + version: "1.1.3" web_socket_channel: dependency: transitive description: @@ -413,17 +413,17 @@ packages: dependency: "direct main" description: name: xml - sha256: "979ee37d622dec6365e2efa4d906c37470995871fe9ae080d967e192d88286b5" + sha256: "971043b3a0d3da28727e40ed3e0b5d18b742fa5a68665cca88e74b7876d5e025" url: "https://pub.dev" source: hosted - version: "6.2.2" + version: "6.6.1" yaml: dependency: "direct main" description: name: yaml - sha256: "23812a9b125b48d4007117254bca50abb6c712352927eece9e155207b1db2370" + sha256: b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce url: "https://pub.dev" source: hosted - version: "3.1.1" + version: "3.1.3" sdks: - dart: ">=2.19.2 <4.0.0" + dart: ">=3.8.0 <4.0.0" diff --git a/pubspec.yaml b/pubspec.yaml index e52160b..97e4afa 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,5 +1,5 @@ name: icon_font_generator -version: 4.0.0 +version: 4.0.1 description: >- Converts SVG icons to OTF font and generates Flutter-compatible class. Provides an API and a CLI tool. @@ -9,21 +9,22 @@ environment: sdk: '>=2.19.2 <4.0.0' dependencies: - args: ^2.4.0 - collection: ^1.17.0 - dart_style: ^2.3.0 - logger: ^1.3.0 - meta: ^1.8.0 - path: ^1.8.2 - path_parsing: ^1.0.1 + args: ^2.7.0 + collection: ^1.19.1 + dart_style: ^3.0.1 + logger: ^2.6.1 + meta: ^1.16.0 + path: ^1.9.1 + path_parsing: ^1.1.0 + pub_semver: ^2.2.0 recase: ^4.1.0 - vector_math: ^2.1.4 - xml: ^6.2.2 - yaml: ^3.1.1 + vector_math: ^2.2.0 + xml: ^6.6.1 + yaml: ^3.1.3 dev_dependencies: - lints: ^2.0.1 - test: ^1.23.1 + lints: ^6.0.0 + test: ^1.26.3 executables: generator: generator \ No newline at end of file