From 4f0c36a1cc1cac07350a89b18ccbeee541d7d0cc Mon Sep 17 00:00:00 2001 From: Bart Ribbers Date: Fri, 18 Apr 2025 16:38:41 +0200 Subject: [PATCH] fix: use a minimum of Dart 3.4.3 and don't use 'any' for any dep version constraints We're very inconsistent with marking what Flutter and Dart versions we support. The .fvmrc indicates Flutter 3.27.4 which comes with Dart 3.6.2, but the packages said 3.0 and 3.1. This commit brings all versions in line and sets the minimum to Dart 3.4.3. This version is chosen so it can be used as is with one of our projects that currently uses that Dart version. --- .fvmrc | 2 +- packages/flutter_timeline/pubspec.yaml | 6 +++--- .../lib/src/config/firebase_timeline_options.dart | 3 --- .../lib/src/models/firebase_user_document.dart | 3 --- packages/flutter_timeline_firebase/pubspec.yaml | 4 ++-- packages/flutter_timeline_interface/pubspec.yaml | 3 +-- packages/flutter_timeline_view/pubspec.yaml | 8 ++++---- pubspec.yaml | 2 +- 8 files changed, 12 insertions(+), 19 deletions(-) diff --git a/.fvmrc b/.fvmrc index c2783c6..8f59eb5 100644 --- a/.fvmrc +++ b/.fvmrc @@ -1,3 +1,3 @@ { - "flutter": "3.27.4" + "flutter": "3.22.2" } \ No newline at end of file diff --git a/packages/flutter_timeline/pubspec.yaml b/packages/flutter_timeline/pubspec.yaml index a152f39..11ca4fb 100644 --- a/packages/flutter_timeline/pubspec.yaml +++ b/packages/flutter_timeline/pubspec.yaml @@ -7,7 +7,8 @@ version: 5.1.0 publish_to: https://forgejo.internal.iconica.nl/api/packages/internal/pub environment: - sdk: ">=3.1.3 <4.0.0" + sdk: ">=3.4.3 <4.0.0" + flutter: ^3.22.2 dependencies: flutter: @@ -19,10 +20,9 @@ dependencies: flutter_timeline_interface: hosted: https://forgejo.internal.iconica.nl/api/packages/internal/pub version: ^5.1.0 - collection: any + collection: ^1.18.0 dev_dependencies: - flutter_lints: ^2.0.0 flutter_iconica_analysis: git: url: https://github.com/Iconica-Development/flutter_iconica_analysis diff --git a/packages/flutter_timeline_firebase/lib/src/config/firebase_timeline_options.dart b/packages/flutter_timeline_firebase/lib/src/config/firebase_timeline_options.dart index 03f32e3..6243417 100644 --- a/packages/flutter_timeline_firebase/lib/src/config/firebase_timeline_options.dart +++ b/packages/flutter_timeline_firebase/lib/src/config/firebase_timeline_options.dart @@ -2,9 +2,6 @@ // // SPDX-License-Identifier: BSD-3-Clause -import 'package:flutter/material.dart'; - -@immutable class FirebaseTimelineOptions { const FirebaseTimelineOptions({ this.usersCollectionName = 'users', diff --git a/packages/flutter_timeline_firebase/lib/src/models/firebase_user_document.dart b/packages/flutter_timeline_firebase/lib/src/models/firebase_user_document.dart index 19fe9c9..df55790 100644 --- a/packages/flutter_timeline_firebase/lib/src/models/firebase_user_document.dart +++ b/packages/flutter_timeline_firebase/lib/src/models/firebase_user_document.dart @@ -2,9 +2,6 @@ // // SPDX-License-Identifier: BSD-3-Clause -import 'package:flutter/material.dart'; - -@immutable class FirebaseUserDocument { const FirebaseUserDocument({ this.firstName, diff --git a/packages/flutter_timeline_firebase/pubspec.yaml b/packages/flutter_timeline_firebase/pubspec.yaml index d094194..94d958a 100644 --- a/packages/flutter_timeline_firebase/pubspec.yaml +++ b/packages/flutter_timeline_firebase/pubspec.yaml @@ -8,7 +8,8 @@ version: 5.1.0 publish_to: https://forgejo.internal.iconica.nl/api/packages/internal/pub environment: - sdk: ">=3.1.3 <4.0.0" + sdk: ">=3.4.3 <4.0.0" + flutter: ^3.22.2 dependencies: flutter: @@ -23,7 +24,6 @@ dependencies: version: ^5.1.0 dev_dependencies: - flutter_lints: ^2.0.0 flutter_iconica_analysis: git: url: https://github.com/Iconica-Development/flutter_iconica_analysis diff --git a/packages/flutter_timeline_interface/pubspec.yaml b/packages/flutter_timeline_interface/pubspec.yaml index d1e82e5..7e59498 100644 --- a/packages/flutter_timeline_interface/pubspec.yaml +++ b/packages/flutter_timeline_interface/pubspec.yaml @@ -8,14 +8,13 @@ version: 5.1.0 publish_to: https://forgejo.internal.iconica.nl/api/packages/internal/pub environment: - sdk: '>=3.1.3 <4.0.0' + sdk: '>=3.4.3 <4.0.0' dependencies: flutter: sdk: flutter dev_dependencies: - flutter_lints: ^2.0.0 flutter_iconica_analysis: git: url: https://github.com/Iconica-Development/flutter_iconica_analysis diff --git a/packages/flutter_timeline_view/pubspec.yaml b/packages/flutter_timeline_view/pubspec.yaml index a0b4580..858dc11 100644 --- a/packages/flutter_timeline_view/pubspec.yaml +++ b/packages/flutter_timeline_view/pubspec.yaml @@ -8,15 +8,16 @@ version: 5.1.0 publish_to: https://forgejo.internal.iconica.nl/api/packages/internal/pub environment: - sdk: ">=3.1.3 <4.0.0" + sdk: ">=3.4.3 <4.0.0" + flutter: ^3.22.2 dependencies: flutter: sdk: flutter - intl: any + intl: ^0.19.0 cached_network_image: ^3.2.2 dotted_border: ^2.1.0 - collection: any + collection: ^1.18.0 flutter_svg: ^2.0.10+1 flutter_timeline_interface: hosted: https://forgejo.internal.iconica.nl/api/packages/internal/pub @@ -26,7 +27,6 @@ dependencies: version: ^4.0.0 dev_dependencies: - flutter_lints: ^2.0.0 flutter_iconica_analysis: git: url: https://github.com/Iconica-Development/flutter_iconica_analysis diff --git a/pubspec.yaml b/pubspec.yaml index e09c50f..28217c5 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -5,6 +5,6 @@ name: flutter_timeline_workspace environment: - sdk: '>=3.0.0 <4.0.0' + sdk: '>=3.4.3 <4.0.0' dev_dependencies: melos: ^3.0.1