diff --git a/.img/version.png b/.img/version.png index 44133ce..61d3e75 100644 Binary files a/.img/version.png and b/.img/version.png differ diff --git a/README.md b/README.md index 395d3fa..73ac9ed 100644 --- a/README.md +++ b/README.md @@ -65,15 +65,14 @@ sealed class Pubspec { build: [], ); - static final DateTime timestamp = DateTime( - 2023, - 6, - 30, - 13, - 12, - 15, - 487, - 936, + static const PubspecVersion version = ( + representation: r'4.0.0-pre.1', + canonical: r'4.0.0-pre.1', + major: 4, + minor: 0, + patch: 0, + preRelease: [r'pre', r'1'], + build: [], ); static const String name = r'pubspec_generator'; diff --git a/example/example.dart b/example/example.dart index efef97b..cdc761c 100644 --- a/example/example.dart +++ b/example/example.dart @@ -46,9 +46,9 @@ library pubspec; typedef PubspecVersion = ({ String representation, String canonical, - String major, - String minor, - String patch, + int major, + int minor, + int patch, List preRelease, List build }); @@ -95,14 +95,15 @@ sealed class Pubspec { // Canonicalized string representation of the version. canonical: r'4.0.0-pre.1', // MAJOR version when you make incompatible API changes. - // The major version number: "1" in "1.2.3". - major: r'4', + // The major version number: 1 in "1.2.3". + major: 4, // MINOR version when you add functionality // in a backward compatible manner. - // The minor version number: "2" in "1.2.3". - minor: r'0', - // The patch version number: "3" in "1.2.3". - patch: r'0', + // The minor version number: 2 in "1.2.3". + minor: 0, + // PATCH version when you make backward compatible bug fixes. + // The patch version number: 3 in "1.2.3". + patch: 0, // The pre-release identifier: "foo" in "1.2.3-foo". preRelease: [r'pre', r'1'], // The build identifier: "foo" in "1.2.3+foo". @@ -115,10 +116,10 @@ sealed class Pubspec { 6, 30, 13, - 24, - 42, - 973, - 864, + 41, + 23, + 584, + 25, ); /// Name diff --git a/lib/src/generator/typedef_generator_mixin.dart b/lib/src/generator/typedef_generator_mixin.dart index 0526360..bd070c8 100644 --- a/lib/src/generator/typedef_generator_mixin.dart +++ b/lib/src/generator/typedef_generator_mixin.dart @@ -12,9 +12,9 @@ mixin TypedefGeneratorMixin on PubspecGenerator { ..writeln('typedef PubspecVersion = ({') ..writeln(' String representation,') ..writeln(' String canonical,') - ..writeln(' String major,') - ..writeln(' String minor,') - ..writeln(' String patch,') + ..writeln(' int major,') + ..writeln(' int minor,') + ..writeln(' int patch,') ..writeln(' List preRelease,') ..writeln(' List build') ..writeln('});'); diff --git a/lib/src/generator/version_generator_mixin.dart b/lib/src/generator/version_generator_mixin.dart index ea80811..8de6ca0 100644 --- a/lib/src/generator/version_generator_mixin.dart +++ b/lib/src/generator/version_generator_mixin.dart @@ -27,14 +27,15 @@ mixin VersionGeneratorMixin on PubspecGenerator { ' // Canonicalized string representation of the version.\n' ' canonical: r\'${version.canonicalizedVersion}\',\n' ' // MAJOR version when you make incompatible API changes.\n' - ' // The major version number: "1" in "1.2.3".\n' - ' major: r\'${version.major}\',\n' + ' // The major version number: 1 in "1.2.3".\n' + ' major: ${version.major},\n' ' // MINOR version when you add functionality\n' ' // in a backward compatible manner.\n' - ' // The minor version number: "2" in "1.2.3".\n' - ' minor: r\'${version.minor}\',\n' - ' // The patch version number: "3" in "1.2.3".\n' - ' patch: r\'${version.patch}\',\n' + ' // The minor version number: 2 in "1.2.3".\n' + ' minor: ${version.minor},\n' + ' // PATCH version when you make backward compatible bug fixes.\n' + ' // The patch version number: 3 in "1.2.3".\n' + ' patch: ${version.patch},\n' ' // The pre-release identifier: "foo" in "1.2.3-foo".\n' ' preRelease: [${_preRelease(version.preRelease)}],\n' ' // The build identifier: "foo" in "1.2.3+foo".\n'