Refactor/dimoshka fix dependencies (#221)

* chore(release): publish packages - [email protected] - [email protected] - [email protected] - [email protected] - [email protected] - [email protected] - [email protected] - [email protected] - [email protected] - [email protected] - [email protected] - [email protected] * Fix * FIxes * version: 5.0.2 bump * Upgrade dependenciea and fix pubspec * Restore * Revert version upgrade, #219 * Refactoring * Fix --------- Co-authored-by: Dmytro Prylutskyi <[email protected]>
conduit-dart · Mar 10, 2024 · 5423ae9 · 5423ae9
1 parent e954249
commit 5423ae9
Show file tree

Hide file tree

Showing 21 changed files with 179 additions and 115 deletions.
diff --git a/melos.yaml b/melos.yaml
@@ -11,38 +11,42 @@ ignore:
 command:
   version:
     linkToCommits: true
-  bootstrap:
-    usePubspecOverrides: true
 scripts:
   test-unit:
     run: melos exec -c1 --fail-fast --ignore "*common*" --ignore "*application*" --ignore "*dependency*" -- "dart test"
-    select-pacakge:
-      no-private: true
+    packageFilters:
+      noPrivate: true
   test-with-coverage:
-    run: melos exec --ignore "*common*" --ignore "*application*" --ignore "*dependency*" -- "dart $MELOS_ROOT_PATH/utils/unused_port.dart | dart pub global run coverage:test_with_coverage --port -"
-    select-pacakge:
-      no-private: true
+    run: melos exec --ignore "*common*" --ignore "*application*" --ignore "*dependency*" -- "dart MELOS_ROOT_PATH/utils/unused_port.dart | dart pub global run coverage:test_with_coverage --port -"
+    packageFilters:
+      noPrivate: true
   analyze: melos exec -- dart analyze .
   upgrade: melos exec -- dart pub upgrade
+  outdated:
+    run: melos exec -- "dart pub outdated"
   activate-all:
-    run: melos exec -- "dart pub global activate '\$MELOS_PACKAGE_NAME'"
-    select-pacakge:
-      no-private: true
+    run: melos exec -- "dart pub global activate -spath MELOS_PACKAGE_PATH"
+    packageFilters:
+      noPrivate: true
+  deactivate-all:
+    run: melos exec -- "dart pub global deactivate MELOS_PACKAGE_NAME"
+    packageFilters:
+      noPrivate: true
   cache-source:
-    run: melos exec -- "mkdir -p '$PUB_CACHE/hosted/pub.dev/\$MELOS_PACKAGE_NAME-\$MELOS_PACKAGE_VERSION' && cp -rf '\$MELOS_PACKAGE_PATH'/* '$PUB_CACHE/hosted/pub.dev/\$MELOS_PACKAGE_NAME-\$MELOS_PACKAGE_VERSION'"
-    select-pacakge:
-      no-private: true
-  # cache-source-win:
-  #   run: melos exec -- mkdir %PUB_CACHE%/hosted\pub.dev\%MELOS_PACKAGE_NAME%-%MELOS_PACKAGE_VERSION% && melos exec -- xcopy %MELOS_PACKAGE_PATH% %PUB_CACHE%/hosted\pub.dev\%MELOS_PACKAGE_NAME%-%MELOS_PACKAGE_VERSION% /Y /s /e
-  #   select-pacakge:
-  #     no-private: true
+    run: melos exec -- "mkdir -p '$PUB_CACHE/hosted/pub.dev/MELOS_PACKAGE_NAME-MELOS_PACKAGE_VERSION' && cp -rf 'MELOS_PACKAGE_PATH'/* '$PUB_CACHE/hosted/pub.dev/MELOS_PACKAGE_NAME-MELOS_PACKAGE_VERSION'"
+    packageFilters:
+      noPrivate: true
+  cache-source-win:
+    run: melos exec -- mkdir %PUB_CACHE%\hosted\pub.dev\MELOS_PACKAGE_NAME-MELOS_PACKAGE_VERSION && melos exec -- xcopy MELOS_PACKAGE_PATH %PUB_CACHE%\hosted\pub.dev\MELOS_PACKAGE_NAME-MELOS_PACKAGE_VERSION /Y /s /e
+    packageFilters:
+      noPrivate: true
   hard-clean:
-    run: melos exec -- "rm -rf '\$MELOS_PACKAGE_PATH/.dart_tool' '\$MELOS_PACKAGE_PATH/pubspec.lock'"
+    run: melos exec -- "rm -rf 'MELOS_PACKAGE_PATH/.dart_tool' 'MELOS_PACKAGE_PATH/pubspec.lock'"
   gen-docs:
     run: |
       melos exec --ignore "*common*" --ignore "fs_test_agent" -- "dart doc"
-    select-pacakge:
-      no-private: true
+    packageFilters:
+      noPrivate: true
   fix:
     run: melos exec --fail-fast --ignore "*common*" --ignore "*application*" --ignore "*dependency*" -- "dart fix --apply ."
   sync-version:
@@ -60,6 +64,3 @@ scripts:
                           -V conduit_runtime:$v \
                           -V conduit_test:$v \
                           -V fs_test_agent:$v
-environment:
-  sdk: ">=3.3.0 <4.0.0"
-
diff --git a/packages/cli/pubspec.yaml b/packages/cli/pubspec.yaml
@@ -1,13 +1,17 @@
 name: conduit
-version: 5.0.1
-homepage: https://github.com/conduit-dart/conduit
 description: A modern HTTP server application framework, ORM and OAuth2 provider with OpenAPI 3.0 integration. Foundation for REST, RPC or GraphQL services.
+version: 5.0.1
+home: https://www.theconduit.dev
+repository: https://github.com/conduit-dart/conduit
+issue_tracker: https://github.com/conduit-dart/conduit/issues
+
 environment:
   sdk: ">=3.3.0 <4.0.0"
+
 dependencies:
-  analyzer: ^6.3.0
-  args: ^2.1.1
-  collection: ^1.15.0
+  analyzer: ^6.4.1
+  args: ^2.4.2
+  collection: ^1.18.0
   conduit_common: ^5.0.1
   conduit_config: ^5.0.1
   conduit_core: ^5.0.1
@@ -16,24 +20,26 @@ dependencies:
   conduit_password_hash: ^5.0.1
   conduit_postgresql: ^5.0.1
   conduit_runtime: ^5.0.1
-  crypto: ^3.0.2
-  io: ^1.0.3
-  logging: ^1.0.0
-  meta: ^1.1.5
-  path: ^1.8.0
-  postgres: ^3.0.0
-  pub_semver: ^2.0.0
-  yaml: ^3.1.0
+  crypto: ^3.0.3
+  io: ^1.0.4
+  logging: ^1.2.0
+  meta: ^1.12.0
+  path: ^1.9.0
+  postgres: ^3.1.1
+  pub_semver: ^2.1.4
+  yaml: ^3.1.2
+
 dev_dependencies:
   conduit_test:
     path: ../test_harness
   fs_test_agent:
     path: ../fs_test_agent
-  http: ^1.0.0
+  http: ^1.2.1
   lints: ^3.0.0
-  matcher: ^0.12.12
-  mockito: ^5.3.2
-  test: ^1.21.6
-  web_socket_channel: ^2.2.0
+  matcher: ^0.12.16+1
+  mockito: ^5.4.4
+  test: ^1.25.2
+  web_socket_channel: ^2.4.4
+
 executables:
   conduit: conduit
diff --git a/packages/cli/templates/db/pubspec.yaml b/packages/cli/templates/db/pubspec.yaml
@@ -1,6 +1,7 @@
 name: wildfire
 description: An conduit application with a database connection and data model.
 version: 0.0.1
+homepage: https://github.com/conduit-dart/conduit-codable
 publish_to: none
 
 environment:
@@ -12,5 +13,5 @@ dependencies:
   conduit_postgresql: ^5.0.1
 
 dev_dependencies:
-  test: ^1.21.6
+  test: ^1.25.2
   conduit_test: ^5.0.1
diff --git a/packages/cli/templates/db_and_auth/pubspec.yaml b/packages/cli/templates/db_and_auth/pubspec.yaml
@@ -12,5 +12,5 @@ dependencies:
   conduit_postgresql: ^5.0.1
 
 dev_dependencies:
-  test: ^1.21.6
+  test: ^1.25.2
   conduit_test: ^5.0.1
diff --git a/packages/cli/templates/default/pubspec.yaml b/packages/cli/templates/default/pubspec.yaml
@@ -11,5 +11,5 @@ dependencies:
   conduit_core: ^5.0.1
 
 dev_dependencies:
-  test: ^1.21.6
+  test: ^1.25.2
   conduit_test: ^5.0.1
diff --git a/packages/codable/pubspec.yaml b/packages/codable/pubspec.yaml
@@ -1,11 +1,16 @@
 name: conduit_codable
-version: 5.0.1
-homepage: https://github.com/conduit-dart/conduit-codable
 description: A serialization library for converting dynamic, structured data (JSON, YAML) into Dart types.
+version: 5.0.1
+home: https://www.theconduit.dev
+repository: https://github.com/conduit-dart/conduit
+issue_tracker: https://github.com/conduit-dart/conduit/issues
+
 environment:
-  sdk: '>=3.3.0 <4.0.0'
+  sdk: ">=3.3.0 <4.0.0"
+
 dependencies:
   meta: ^1.3.0
+
 dev_dependencies:
   lints: ^3.0.0
-  test: ^1.21.6
+  test: ^1.25.2
diff --git a/packages/common/pubspec.yaml b/packages/common/pubspec.yaml
@@ -1,10 +1,15 @@
 name: conduit_common
-version: 5.0.1
 description: Common classes shared by conduit projects.
-repository: https://github.com/bsutton/conduit-orm
+version: 5.0.1
+home: https://www.theconduit.dev
+repository: https://github.com/conduit-dart/conduit
+issue_tracker: https://github.com/conduit-dart/conduit/issues
+
 environment:
-  sdk: '>=3.3.0 <4.0.0'
+  sdk: ">=3.3.0 <4.0.0"
+
 dependencies:
   conduit_open_api: ^5.0.1
+
 dev_dependencies:
   lints: ^3.0.0
diff --git a/packages/config/pubspec.yaml b/packages/config/pubspec.yaml
@@ -1,13 +1,18 @@
 name: conduit_config
-version: 5.0.1
 description: A safe and convenient way to read YAML configuration files.
-repository: https://github.com/conduit-dart/conduit-config.git
+version: 5.0.1
+home: https://www.theconduit.dev
+repository: https://github.com/conduit-dart/conduit
+issue_tracker: https://github.com/conduit-dart/conduit/issues
+
 environment:
-  sdk: '>=3.3.0 <4.0.0'
+  sdk: ">=3.3.0 <4.0.0"
+
 dependencies:
   conduit_runtime: ^5.0.1
   meta: ^1.3.0
-  yaml: ^3.1.0
+  yaml: ^3.1.2
+
 dev_dependencies:
   lints: ^3.0.0
-  test: ^1.21.6
+  test: ^1.25.2
diff --git a/packages/core/pubspec.yaml b/packages/core/pubspec.yaml
@@ -1,38 +1,43 @@
 name: conduit_core
 version: 5.0.1
-homepage: https://github.com/conduit-dart/conduit
 description: This is the core of the framework.
+home: https://www.theconduit.dev
+repository: https://github.com/conduit-dart/conduit
+issue_tracker: https://github.com/conduit-dart/conduit/issues
+
 environment:
   sdk: ">=3.3.0 <4.0.0"
+
 dependencies:
-  analyzer: ^6.3.0
-  args: ^2.1.1
-  collection: ^1.15.0
+  analyzer: ^6.4.1
+  args: ^2.4.2
+  collection: ^1.18.0
   conduit_common: ^5.0.1
   conduit_config: ^5.0.1
   conduit_isolate_exec: ^5.0.1
   conduit_open_api: ^5.0.1
   conduit_password_hash: ^5.0.1
   conduit_runtime: ^5.0.1
-  crypto: ^3.0.2
-  io: ^1.0.3
-  logging: ^1.0.0
-  meta: ^1.1.5
-  path: ^1.8.0
-  postgres: ^3.0.0
-  pub_semver: ^2.0.0
+  crypto: ^3.0.3
+  io: ^1.0.4
+  logging: ^1.2.0
+  meta: ^1.12.0
+  path: ^1.9.0
+  postgres: ^3.1.1
+  pub_semver: ^2.1.4
   recase: ^4.1.0
-  yaml: ^3.1.0
+  yaml: ^3.1.2
+
 dev_dependencies:
   conduit_postgresql:
     path: ../postgresql
   conduit_test:
     path: ../test_harness
   fs_test_agent:
     path: ../fs_test_agent
-  http: ^1.0.0
+  http: ^1.2.1
   lints: ^3.0.0
-  matcher: ^0.12.12
-  mockito: ^5.3.2
-  test: ^1.21.6
-  web_socket_channel: ^2.2.0
+  matcher: ^0.12.16+1
+  mockito: ^5.4.4
+  test: ^1.25.2
+  web_socket_channel: ^2.4.4
diff --git a/packages/fs_test_agent/pubspec.yaml b/packages/fs_test_agent/pubspec.yaml
@@ -1,12 +1,17 @@
 name: fs_test_agent
 version: 5.0.1
-homepage: https://stablekernel.com
 description: Utilities for writing tests to validate file system and Dart project directory operations.
+home: https://www.theconduit.dev
+repository: https://github.com/conduit-dart/conduit
+issue_tracker: https://github.com/conduit-dart/conduit/issues
+
 environment:
-  sdk: '>=3.3.0 <4.0.0'
+  sdk: ">=3.3.0 <4.0.0"
+
 dependencies:
-  path: ^1.0.0
-  pubspec: ^2.0.1
+  path: ^1.9.0
+  pubspec: ^2.3.0
+
 dev_dependencies:
   lints: ^3.0.0
-  test: ^1.21.6
+  test: ^1.25.2
diff --git a/packages/isolate_exec/pubspec.yaml b/packages/isolate_exec/pubspec.yaml
@@ -1,15 +1,20 @@
 name: conduit_isolate_exec
 version: 5.0.1
-homepage: https://github.com/conduit-dart/isolate-exec
 description: This library contains types that allow for executing code in a spawned isolate, perhaps with additional imports.
+home: https://www.theconduit.dev
+repository: https://github.com/conduit-dart/conduit
+issue_tracker: https://github.com/conduit-dart/conduit/issues
+
 environment:
   sdk: ">=3.3.0 <4.0.0"
+
 dependencies:
-  analyzer: ^6.3.0
-  glob: ^2.0.0
-  path: ^1.8.0
+  analyzer: ^6.4.1
+  glob: ^2.1.2
+  path: ^1.9.0
+
 dev_dependencies:
   lints: ^3.0.0
-  test: ^1.21.6
+  test: ^1.25.2
   test_package:
     path: ../isolate_exec_test_packages/test_package
diff --git a/packages/isolate_exec_test_packages/test_package/pubspec.yaml b/packages/isolate_exec_test_packages/test_package/pubspec.yaml
@@ -4,6 +4,4 @@ description: test dependency
 publish_to: none
 
 environment:
-  sdk: '>=3.3.0 <4.0.0'
-
-dependencies:
+  sdk: ">=3.3.0 <4.0.0"
diff --git a/packages/open_api/pubspec.yaml b/packages/open_api/pubspec.yaml
@@ -1,12 +1,17 @@
 name: conduit_open_api
 version: 5.0.1
-homepage: https://github.com/conduit-dart/open-api-dart
 description: Data structures for OpenAPI (Swagger) specification. Reads and writes JSON specifications.
+home: https://www.theconduit.dev
+repository: https://github.com/conduit-dart/conduit
+issue_tracker: https://github.com/conduit-dart/conduit/issues
+
 environment:
-  sdk: '>=3.3.0 <4.0.0'
+  sdk: ">=3.3.0 <4.0.0"
+
 dependencies:
   conduit_codable: ^5.0.1
-  meta: ^1.1.5
+  meta: ^1.12.0
+
 dev_dependencies:
   lints: ^3.0.0
-  test: ^1.3.0
+  test: ^1.25.2
diff --git a/packages/password_hash/pubspec.yaml b/packages/password_hash/pubspec.yaml
@@ -1,11 +1,16 @@
 name: conduit_password_hash
 version: 5.0.1
-homepage: https://github.com/conduit/dart-password-hash
 description: PBKDF2 password hashing utility
+home: https://www.theconduit.dev
+repository: https://github.com/conduit-dart/conduit
+issue_tracker: https://github.com/conduit-dart/conduit/issues
+
 environment:
-  sdk: '>=3.3.0 <4.0.0'
+  sdk: ">=3.3.0 <4.0.0"
+
 dependencies:
-  crypto: ^3.0.2
+  crypto: ^3.0.3
+
 dev_dependencies:
   lints: ^3.0.0
-  test: ^1.21.6
+  test: ^1.25.2