diff --git a/examples/custom_binary_name/pubspec.lock b/examples/custom_binary_name/pubspec.lock index 37cba4dc..d613f05b 100644 --- a/examples/custom_binary_name/pubspec.lock +++ b/examples/custom_binary_name/pubspec.lock @@ -103,10 +103,10 @@ packages: dependency: transitive description: name: meta - sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e + sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.9.1" path: dependency: transitive description: @@ -180,9 +180,9 @@ packages: dependency: transitive description: name: web - sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 + sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 url: "https://pub.dev" source: hosted - version: "0.3.0" + version: "0.1.4-beta" sdks: - dart: ">=3.2.0-194.0.dev <4.0.0" + dart: ">=3.1.0-185.0.dev <4.0.0" diff --git a/examples/multiple_flavors/pubspec.lock b/examples/multiple_flavors/pubspec.lock index 3c611fde..23c3ff6a 100644 --- a/examples/multiple_flavors/pubspec.lock +++ b/examples/multiple_flavors/pubspec.lock @@ -212,10 +212,10 @@ packages: dependency: transitive description: name: meta - sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e + sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.9.1" package_info_plus: dependency: "direct main" description: @@ -345,10 +345,10 @@ packages: dependency: transitive description: name: web - sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 + sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 url: "https://pub.dev" source: hosted - version: "0.3.0" + version: "0.1.4-beta" win32: dependency: transitive description: @@ -374,5 +374,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.2.0-194.0.dev <4.0.0" + dart: ">=3.1.0-185.0.dev <4.0.0" flutter: ">=3.3.0" diff --git a/melos.yaml b/melos.yaml index 05a828c9..9288b622 100644 --- a/melos.yaml +++ b/melos.yaml @@ -34,6 +34,15 @@ scripts: dependsOn: - dependency_validator + test: + run: | + melos exec -c 6 --fail-fast -- \ + "flutter test" + description: Run `flutter test` for a specific package. + packageFilters: + dirExists: + - test + activate: run: melos exec --scope="flutter_distributor" -- dart pub global activate -s path . diff --git a/packages/flutter_app_builder/lib/src/commands/flutter.dart b/packages/flutter_app_builder/lib/src/commands/flutter.dart index e083d269..6b1999b0 100644 --- a/packages/flutter_app_builder/lib/src/commands/flutter.dart +++ b/packages/flutter_app_builder/lib/src/commands/flutter.dart @@ -43,8 +43,10 @@ class FlutterVersion { final String? flutterVersion; bool isGreaterOrEqual(String versionString) { - final Version version = Version.parse(flutterVersion!); - return version.compareTo(Version.parse(versionString)) >= 0; + // just keep the first part of the version string + final String currentVersionString = flutterVersion!.split('-').first; + final Version currentVersion = Version.parse(currentVersionString); + return currentVersion.compareTo(Version.parse(versionString)) >= 0; } } diff --git a/packages/flutter_app_builder/test/src/commands/flutter_test.dart b/packages/flutter_app_builder/test/src/commands/flutter_test.dart index 28259947..b6310bd0 100644 --- a/packages/flutter_app_builder/test/src/commands/flutter_test.dart +++ b/packages/flutter_app_builder/test/src/commands/flutter_test.dart @@ -3,7 +3,7 @@ import 'package:test/test.dart'; void main() { group('FlutterVersion', () { - test('isGreaterOrEqual', () { + test('isGreaterOrEqual#1', () { final v3100 = FlutterVersion( flutterVersion: '3.10.0', ); @@ -11,5 +11,13 @@ void main() { expect(v3100.isGreaterOrEqual('3.10.0'), true); expect(v3100.isGreaterOrEqual('3.10.1'), false); }); + test('isGreaterOrEqual#2', () { + final v3150 = FlutterVersion( + flutterVersion: '3.15.0-15.2.pre', + ); + expect(v3150.isGreaterOrEqual('3.3.10'), true); + expect(v3150.isGreaterOrEqual('3.15.0'), true); + expect(v3150.isGreaterOrEqual('3.16.1'), false); + }); }); } diff --git a/packages/flutter_app_packager/pubspec.lock b/packages/flutter_app_packager/pubspec.lock index 8dc23171..5b957d44 100644 --- a/packages/flutter_app_packager/pubspec.lock +++ b/packages/flutter_app_packager/pubspec.lock @@ -180,10 +180,10 @@ packages: dependency: "direct main" description: name: msix - sha256: ecb192bc47aa9de177e954761b2e90e4b6f1370abe1d298975e56d894ca75bc6 + sha256: "957d04eee260e4bd15bec1fdb988dfc73718285e201cf89d97ef01ef38e66d4c" url: "https://pub.dev" source: hosted - version: "3.13.3" + version: "3.16.6" mustache_template: dependency: transitive description: diff --git a/packages/flutter_app_packager/pubspec.yaml b/packages/flutter_app_packager/pubspec.yaml index b9b43d3a..bcf54a07 100644 --- a/packages/flutter_app_packager/pubspec.yaml +++ b/packages/flutter_app_packager/pubspec.yaml @@ -11,7 +11,7 @@ dependencies: archive: ^3.1.5 io: ^1.0.3 liquid_engine: ^0.2.2 - msix: ^3.13.2 + msix: ^3.16.6 path: ^1.8.1 shell_executor: ^0.1.4 diff --git a/packages/flutter_distributor/pubspec.lock b/packages/flutter_distributor/pubspec.lock index b8eb6140..0ea0a3f3 100644 --- a/packages/flutter_distributor/pubspec.lock +++ b/packages/flutter_distributor/pubspec.lock @@ -271,10 +271,10 @@ packages: dependency: transitive description: name: msix - sha256: ecb192bc47aa9de177e954761b2e90e4b6f1370abe1d298975e56d894ca75bc6 + sha256: "957d04eee260e4bd15bec1fdb988dfc73718285e201cf89d97ef01ef38e66d4c" url: "https://pub.dev" source: hosted - version: "3.13.3" + version: "3.16.6" mustache_template: dependency: transitive description: