Move project into pub workspaces

netglade · Jan 13, 2025 · b42e041 · b42e041
1 parent ab92823
commit b42e041
Show file tree

Hide file tree

Showing 12 changed files with 65 additions and 66 deletions.
diff --git a/.fvm/fvm_config.json b/.fvm/fvm_config.json
@@ -1,3 +1,3 @@
 {
-  "flutterSdkVersion": "3.24.0"
+  "flutterSdkVersion": "3.27.1"
 }
diff --git a/.fvmrc b/.fvmrc
@@ -1,3 +1,3 @@
 {
-  "flutter": "3.24.0"
+  "flutter": "3.27.1"
 }
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,5 +1,5 @@
 {
-  "dart.flutterSdkPath": ".fvm/versions/3.24.0",
+  "dart.flutterSdkPath": ".fvm/versions/3.27.1",
   "search.exclude": {
     "**/.fvm": true,
     "**/*.g.dart": true

diff --git a/melos.yaml b/melos.yaml
diff --git a/packages/netglade_analysis/pubspec.yaml b/packages/netglade_analysis/pubspec.yaml
@@ -10,4 +10,5 @@ screenshots:
     path: doc/icon.png
 
 environment:
-  sdk: ^3.5.0
+  sdk: ^3.6.0
+resolution: workspace
diff --git a/packages/netglade_flutter_utils/CHANGELOG.md b/packages/netglade_flutter_utils/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.1.0
+- Upgrade repo into pub workspaces
+- Add toHexString() in Colors extension.
+
 ## 1.0.1
 - Adhere to `netglade_analysis 12.0.0`.
 

diff --git a/packages/netglade_flutter_utils/pubspec.yaml b/packages/netglade_flutter_utils/pubspec.yaml
@@ -1,14 +1,15 @@
 name: netglade_flutter_utils
-version: 1.0.1
+version: 1.1.0
 description: Flutter utils used internally at netglade.
 repository: https://github.com/netglade/flutter_core/tree/main/packages/netglade_flutter_utils
 issue_tracker: https://github.com/netglade/flutter_core/issues
 homepage: https://github.com/netglade/flutter_core
 documentation: https://github.com/netglade/flutter_core/tree/main/packages/netglade_flutter_utils
 
 environment:
-  sdk: ^3.5.0
+  sdk: ^3.6.0
   flutter: ">=3.24.0"
+resolution: workspace
 
 dependencies:
   flutter:
@@ -19,7 +20,7 @@ dev_dependencies:
   flutter_test:
     sdk: flutter
   mocktail: ^1.0.0
-  netglade_analysis: ^12.0.0
+  netglade_analysis: ^14.0.0
   test: ^1.24.6
 
 flutter:

diff --git a/packages/netglade_flutter_utils/test/src/hooks/route_aware_test.dart b/packages/netglade_flutter_utils/test/src/hooks/route_aware_test.dart
@@ -77,7 +77,6 @@ class _UnderTestWidget extends HookWidget {
   }
 
   void _handlePushNextBtnPressed(BuildContext context) {
-    // ignore: avoid-undisposed-instances, ok for test
     unawaited(Navigator.of(context).push(MaterialPageRoute<void>(builder: (_) => const _MockPage())));
   }
 }
@@ -135,11 +134,9 @@ void main() {
     );
 
     await tester.tap(find.byKey(pushBtn));
-    // ignore: avoid-ignoring-return-values, ignores number of pump performed
     await tester.pumpAndSettle();
 
     await tester.tap(find.byKey(_UnderTestWidget._popBtnKey));
-    // ignore: avoid-ignoring-return-values, ignores number of pump performed
     await tester.pumpAndSettle();
     expect(action, equals('didPop'));
   });
@@ -161,14 +158,12 @@ void main() {
     );
 
     await tester.tap(find.byKey(_UnderTestWidget._pushNextBtnKey));
-    // ignore: avoid-ignoring-return-values, ignores number of pump performed
     await tester.pumpAndSettle();
 
     expect(action, equals('didPushNext'));
     expect(find.byKey(_MockPage._btnKey), findsOneWidget);
 
     await tester.tap(find.byKey(_MockPage._btnKey));
-    // ignore: avoid-ignoring-return-values, ignores number of pump performed
     await tester.pumpAndSettle();
 
     expect(action, equals('didPopNext'));

diff --git a/packages/netglade_utils/lib/src/result/option.dart b/packages/netglade_utils/lib/src/result/option.dart
@@ -19,17 +19,17 @@ sealed class Option<T> {
   const factory Option.none() = None;
   const factory Option.some(T value) = Some<T>;
 
-  TResult map<TResult extends Object?>({
+  TResult map<TResult>({
     required NoneCallback<TResult> none,
     required SomeCallback<TResult, T> some,
   });
 
-  TResult? mapOrNull<TResult extends Object?>({
+  TResult? mapOrNull<TResult>({
     NullableNoneCallback<TResult>? none,
     NullableSomeCallback<TResult, T>? some,
   });
 
-  TResult when<TResult extends Object?>({
+  TResult when<TResult>({
     required ValueNoneCallback<TResult> none,
     required ValueSomeCallback<TResult, T> some,
   });
@@ -39,21 +39,21 @@ final class None<T> extends Option<T> {
   const None();
 
   @override
-  TResult map<TResult extends Object?>({
+  TResult map<TResult>({
     required NoneCallback<TResult> none,
     required SomeCallback<TResult, T> some,
   }) =>
       none();
 
   @override
-  TResult? mapOrNull<TResult extends Object?>({
+  TResult? mapOrNull<TResult>({
     NullableNoneCallback<TResult>? none,
     NullableSomeCallback<TResult, T>? some,
   }) =>
       none?.call();
 
   @override
-  TResult when<TResult extends Object?>({
+  TResult when<TResult>({
     required ValueNoneCallback<TResult> none,
     required ValueSomeCallback<TResult, T> some,
   }) =>
@@ -66,21 +66,21 @@ final class Some<T> extends Option<T> {
   const Some(this.value);
 
   @override
-  TResult map<TResult extends Object?>({
+  TResult map<TResult>({
     required NoneCallback<TResult> none,
     required SomeCallback<TResult, T> some,
   }) =>
       some(this);
 
   @override
-  TResult? mapOrNull<TResult extends Object?>({
+  TResult? mapOrNull<TResult>({
     NullableNoneCallback<TResult>? none,
     NullableSomeCallback<TResult, T>? some,
   }) =>
       some?.call(this);
 
   @override
-  TResult when<TResult extends Object?>({
+  TResult when<TResult>({
     required ValueNoneCallback<TResult> none,
     required ValueSomeCallback<TResult, T> some,
   }) =>

diff --git a/packages/netglade_utils/lib/src/result/result_impl.dart b/packages/netglade_utils/lib/src/result/result_impl.dart
@@ -16,17 +16,17 @@ sealed class Result<S, E> {
   const factory Result.success(S success) = Success<S, E>;
   const factory Result.error(E error) = Error<S, E>;
 
-  TResult map<TResult extends Object?>({
+  TResult map<TResult>({
     required SuccessCallback<TResult, S, E> success,
     required ErrorCallback<TResult, S, E> error,
   });
 
-  TResult? mapOrNull<TResult extends Object?>({
+  TResult? mapOrNull<TResult>({
     NullableSuccessCallback<TResult, S, E> success,
     NullableErrorCallback<TResult, S, E> error,
   });
 
-  TResult when<TResult extends Object?>({
+  TResult when<TResult>({
     required SuccessValueCallback<TResult, S> success,
     required ErrorValueCallback<TResult, E> error,
   });
@@ -38,21 +38,21 @@ final class Success<S, E> extends Result<S, E> {
   const Success(this.success);
 
   @override
-  TResult map<TResult extends Object?>({
+  TResult map<TResult>({
     required SuccessCallback<TResult, S, E> success,
     required ErrorCallback<TResult, S, E> error,
   }) =>
       success(this);
 
   @override
-  TResult? mapOrNull<TResult extends Object?>({
+  TResult? mapOrNull<TResult>({
     NullableSuccessCallback<TResult, S, E>? success,
     NullableErrorCallback<TResult, S, E>? error,
   }) =>
       success?.call(this);
 
   @override
-  TResult when<TResult extends Object?>({
+  TResult when<TResult>({
     required SuccessValueCallback<TResult, S> success,
     required ErrorValueCallback<TResult, E> error,
   }) =>
@@ -65,21 +65,21 @@ final class Error<S, E> extends Result<S, E> {
   const Error(this.error);
 
   @override
-  TResult map<TResult extends Object?>({
+  TResult map<TResult>({
     required SuccessCallback<TResult, S, E> success,
     required ErrorCallback<TResult, S, E> error,
   }) =>
       error(this);
 
   @override
-  TResult? mapOrNull<TResult extends Object?>({
+  TResult? mapOrNull<TResult>({
     NullableSuccessCallback<TResult, S, E>? success,
     NullableErrorCallback<TResult, S, E>? error,
   }) =>
       error?.call(this);
 
   @override
-  TResult when<TResult extends Object?>({
+  TResult when<TResult>({
     required SuccessValueCallback<TResult, S> success,
     required ErrorValueCallback<TResult, E> error,
   }) =>

diff --git a/packages/netglade_utils/pubspec.yaml b/packages/netglade_utils/pubspec.yaml
@@ -7,7 +7,8 @@ homepage: https://github.com/netglade/flutter_core
 documentation: https://github.com/netglade/flutter_core/tree/main/packages/netglade_utils
 
 environment:
-  sdk: ^3.5.0
+  sdk: ^3.6.0
+resolution: workspace
 
 dependencies:
   characters: ^1.2.0
@@ -17,5 +18,5 @@ dependencies:
   mocktail: ^1.0.0
 
 dev_dependencies:
-  netglade_analysis: ^12.0.0
+  netglade_analysis: ^14.0.0
   test: ^1.24.6
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -2,7 +2,36 @@ name: workspace
 publish_to: "none"
 
 environment:
-  sdk: ^3.0.0
+  sdk: ^3.6.0
+workspace:
+  - packages/netglade_analysis
+  - packages/netglade_flutter_utils
+  - packages/netglade_utils
+
 
 dev_dependencies:
-  melos: ^3.0.0
+  melos: ^7.0.0-dev.3
+
+melos:
+  scripts:
+    # ANALYZING
+    lint:
+      run: melos run -- lint:dart && melos run lint:dcm
+      description: Run all static analysis checks.
+
+    lint:dart:
+      run: melos exec -c 10 -- dart analyze --fatal-infos
+      description: Run Dart static analysis checks.
+
+    lint:dcm:
+      run: melos exec -c 10 -- dcm analyze . --fatal-style --fatal-performance --fatal-warnings
+      description: Run DCM static analysis checks.
+    # TESTING
+    test:
+      run: melos exec -- flutter test
+      packageFilters:
+        dirExists:
+          - test
+    # CLEAN
+    clean:
+      run: melos exec -- flutter clean