diff --git a/_tests/pubspec.yaml b/_tests/pubspec.yaml index 94ee88657..21afcfec5 100644 --- a/_tests/pubspec.yaml +++ b/_tests/pubspec.yaml @@ -3,30 +3,32 @@ description: Tests for AngularDart. publish_to: none environment: - sdk: ">=3.1.0 <4.0.0" + sdk: ">=3.6.0 <4.0.0" + +resolution: workspace dependencies: build: ^2.4.1 - build_resolvers: ^2.4.1 - build_test: ^2.2.1 - collection: ^1.18.0 + build_resolvers: ^2.4.2 + build_test: ^2.2.2 + collection: ^1.19.1 glob: ^2.1.2 - js: ^0.6.7 - logging: ^1.2.0 - ngcompiler: ^3.0.0-dev.2 - ngdart: ^8.0.0-dev.3 + js: ^0.7.1 + logging: ^1.3.0 + ngcompiler: ^3.0.0-dev.3 + ngdart: ^8.0.0-dev.4 ngtest: ^5.0.0-dev.2 - source_gen: ^1.4.0 - test: ">=1.24.0 <1.25.0" + source_gen: ^1.5.0 + test: ^1.25.9 dev_dependencies: - analyzer: ^6.0.0 - build_runner: ^2.4.6 - build_web_compilers: ^4.0.4 - csslib: ^1.0.0 - lints: ^2.1.0 - meta: ^1.11.0 - mockito: ^5.4.3 - package_config: ^2.1.0 - source_span: ^1.10.0 + analyzer: ^6.5.0 + build_runner: ^2.4.12 + build_web_compilers: ^4.0.11 + csslib: ^1.0.2 + lints: ^5.0.0 + meta: ^1.16.0 + mockito: ^5.4.4 + package_config: ^2.1.1 + source_span: ^1.10.1 term_glyph: ^1.2.1 diff --git a/_tests/pubspec_overrides.yaml b/_tests/pubspec_overrides.yaml deleted file mode 100644 index 11913f4d0..000000000 --- a/_tests/pubspec_overrides.yaml +++ /dev/null @@ -1,10 +0,0 @@ -# melos_managed_dependency_overrides: ngast,ngcompiler,ngdart,ngtest -dependency_overrides: - ngast: - path: ../ngast - ngcompiler: - path: ../ngcompiler - ngdart: - path: ../ngdart - ngtest: - path: ../ngtest diff --git a/examples/hello_world/pubspec.yaml b/examples/hello_world/pubspec.yaml index b9aeeba15..841fc2a43 100644 --- a/examples/hello_world/pubspec.yaml +++ b/examples/hello_world/pubspec.yaml @@ -1,13 +1,15 @@ name: examples_hello_world environment: - sdk: ">=3.0.0 <4.0.0" + sdk: ">=3.6.0 <4.0.0" + +resolution: workspace dependencies: # No strict dependencies, we always use dependency_overrides. ngdart: ^8.0.0-dev.4 dev_dependencies: - build_runner: ^2.4.6 - build_web_compilers: ^4.0.4 - lints: ^3.0.0 + build_runner: ^2.4.12 + build_web_compilers: ^4.0.11 + lints: ^5.0.0 diff --git a/examples/hello_world/pubspec_overrides.yaml b/examples/hello_world/pubspec_overrides.yaml deleted file mode 100644 index 44b7ff40a..000000000 --- a/examples/hello_world/pubspec_overrides.yaml +++ /dev/null @@ -1,8 +0,0 @@ -# melos_managed_dependency_overrides: ngast,ngcompiler,ngdart -dependency_overrides: - ngast: - path: ../../ngast - ngcompiler: - path: ../../ngcompiler - ngdart: - path: ../../ngdart diff --git a/goldens/pubspec.yaml b/goldens/pubspec.yaml index 6e299fdf3..70d161efd 100644 --- a/goldens/pubspec.yaml +++ b/goldens/pubspec.yaml @@ -3,17 +3,19 @@ description: Goldens for AngularDart. publish_to: none environment: - sdk: ">=3.1.0 <4.0.0" + sdk: ">=3.6.0 <4.0.0" + +resolution: workspace dependencies: - js: ^0.6.7 - meta: ^1.11.0 + js: ^0.7.1 + meta: ^1.16.0 ngdart: ^8.0.0-dev.4 dev_dependencies: - build_runner: ^2.4.6 - build_web_compilers: ^4.0.4 - dart_style: ^2.3.3 + build_runner: ^2.4.12 + build_web_compilers: ^4.0.11 + dart_style: ^2.3.7 glob: ^2.1.2 - lints: ^3.0.0 - path: ^1.8.3 + lints: ^5.0.0 + path: ^1.9.1 diff --git a/goldens/pubspec_overrides.yaml b/goldens/pubspec_overrides.yaml deleted file mode 100644 index d3a22b2c5..000000000 --- a/goldens/pubspec_overrides.yaml +++ /dev/null @@ -1,8 +0,0 @@ -# melos_managed_dependency_overrides: ngast,ngcompiler,ngdart -dependency_overrides: - ngast: - path: ../ngast - ngcompiler: - path: ../ngcompiler - ngdart: - path: ../ngdart diff --git a/ngast/pubspec.yaml b/ngast/pubspec.yaml index d8b52d21b..f32bed899 100644 --- a/ngast/pubspec.yaml +++ b/ngast/pubspec.yaml @@ -4,16 +4,18 @@ version: 3.0.0-dev.2 repository: https://github.com/angulardart-community/angular environment: - sdk: ">=3.1.0 <4.0.0" + sdk: ">=3.6.0 <4.0.0" + +resolution: workspace dependencies: - charcode: ^1.3.1 - collection: ^1.18.0 - meta: ^1.11.0 - source_span: ^1.10.0 - string_scanner: ^1.2.0 + charcode: ^1.4.0 + collection: ^1.19.1 + meta: ^1.16.0 + source_span: ^1.10.1 + string_scanner: ^1.4.0 dev_dependencies: - lints: ^2.1.0 - path: ^1.8.3 - test: ">=1.24.0 <1.25.0" + lints: ^5.0.0 + path: ^1.9.1 + test: ^1.25.9 diff --git a/ngcompiler/pubspec.yaml b/ngcompiler/pubspec.yaml index 46ae31bb4..78a2db499 100644 --- a/ngcompiler/pubspec.yaml +++ b/ngcompiler/pubspec.yaml @@ -7,26 +7,28 @@ version: 3.0.0-dev.3 repository: https://github.com/angulardart-community/angular environment: - sdk: ">=3.1.0 <4.0.0" + sdk: ">=3.6.0 <4.0.0" + +resolution: workspace dependencies: - analyzer: ^6.0.0 - args: ^2.4.2 + analyzer: ^6.5.0 + args: ^2.6.0 build: ^2.4.1 - code_builder: ^4.7.0 - collection: ^1.18.0 - csslib: ^1.0.0 - dart_style: ^2.3.2 - logging: ^1.2.0 - meta: ^1.11.0 + code_builder: ^4.10.1 + collection: ^1.19.1 + csslib: ^1.0.2 + dart_style: ^2.3.7 + logging: ^1.3.0 + meta: ^1.16.0 ngast: ^3.0.0-dev.2 ngdart: ^8.0.0-dev.4 - path: ^1.8.3 - source_gen: ^1.4.0 - source_span: ^1.10.0 + path: ^1.9.1 + source_gen: ^1.5.0 + source_span: ^1.10.1 dev_dependencies: - build_test: ^2.2.1 - lints: ^2.1.0 - package_config: ^2.1.0 - test: ">=1.24.0 <1.25.0" + build_test: ^2.2.2 + lints: ^5.0.0 + package_config: ^2.1.1 + test: ^1.25.9 diff --git a/ngcompiler/pubspec_overrides.yaml b/ngcompiler/pubspec_overrides.yaml deleted file mode 100644 index 6db1c59d6..000000000 --- a/ngcompiler/pubspec_overrides.yaml +++ /dev/null @@ -1,6 +0,0 @@ -# melos_managed_dependency_overrides: ngast,ngdart -dependency_overrides: - ngast: - path: ../ngast - ngdart: - path: ../ngdart diff --git a/ngdart/pubspec.yaml b/ngdart/pubspec.yaml index ad3285d39..64b697e89 100644 --- a/ngdart/pubspec.yaml +++ b/ngdart/pubspec.yaml @@ -6,23 +6,25 @@ version: 8.0.0-dev.4 repository: https://github.com/angulardart-community/angular environment: - sdk: ">=3.1.0 <4.0.0" + sdk: ">=3.6.0 <4.0.0" + +resolution: workspace dependencies: build: ^2.4.1 built_collection: ^5.1.1 - built_value: ^8.7.0 - collection: ^1.18.0 - intl: ^0.18.1 - js: ^0.6.7 - meta: ^1.11.0 + built_value: ^8.9.2 + collection: ^1.19.1 + intl: ^0.19.0 + js: ^0.7.1 + meta: ^1.16.0 ngcompiler: ^3.0.0-dev.3 stream_transform: ^2.1.0 dev_dependencies: - lints: ^2.1.0 + lints: ^5.0.0 # minimal versions to support null safety and class modifiers - build_runner: ^2.4.6 - build_web_compilers: ^4.0.4 + build_runner: ^2.4.12 + build_web_compilers: ^4.0.11 watcher: ^1.1.0 diff --git a/ngdart/pubspec_overrides.yaml b/ngdart/pubspec_overrides.yaml deleted file mode 100644 index 4bd94bc36..000000000 --- a/ngdart/pubspec_overrides.yaml +++ /dev/null @@ -1,6 +0,0 @@ -# melos_managed_dependency_overrides: ngast,ngcompiler -dependency_overrides: - ngast: - path: ../ngast - ngcompiler: - path: ../ngcompiler diff --git a/ngforms/pubspec.yaml b/ngforms/pubspec.yaml index 9edcc41a9..fd5776aa3 100644 --- a/ngforms/pubspec.yaml +++ b/ngforms/pubspec.yaml @@ -6,17 +6,19 @@ version: 5.0.0-dev.3 repository: https://github.com/angulardart-community/angular environment: - sdk: ">=3.1.0 <4.0.0" + sdk: ">=3.6.0 <4.0.0" + +resolution: workspace dependencies: - meta: ^1.11.0 + meta: ^1.16.0 ngdart: ^8.0.0-dev.4 dev_dependencies: - build_runner: ^2.4.6 - build_test: ^2.2.1 - build_web_compilers: ^4.0.4 - lints: ^2.1.0 - mockito: ^5.4.3 - ngtest: ^5.0.0-dev.3 - test: ">=1.24.0 <1.25.0" + build_runner: ^2.4.12 + build_test: ^2.2.2 + build_web_compilers: ^4.0.11 + lints: ^5.0.0 + mockito: ^5.4.4 + ngtest: ^5.0.0-dev.2 + test: ^1.25.9 diff --git a/ngforms/pubspec_overrides.yaml b/ngforms/pubspec_overrides.yaml deleted file mode 100644 index 11913f4d0..000000000 --- a/ngforms/pubspec_overrides.yaml +++ /dev/null @@ -1,10 +0,0 @@ -# melos_managed_dependency_overrides: ngast,ngcompiler,ngdart,ngtest -dependency_overrides: - ngast: - path: ../ngast - ngcompiler: - path: ../ngcompiler - ngdart: - path: ../ngdart - ngtest: - path: ../ngtest diff --git a/ngrouter/pubspec.yaml b/ngrouter/pubspec.yaml index 0a5ec0cb9..74fef0244 100644 --- a/ngrouter/pubspec.yaml +++ b/ngrouter/pubspec.yaml @@ -6,18 +6,20 @@ version: 4.0.0-dev.3 repository: https://github.com/angulardart-community/angular environment: - sdk: ">=3.1.0 <4.0.0" + sdk: ">=3.6.0 <4.0.0" + +resolution: workspace dependencies: - collection: ^1.18.0 + collection: ^1.19.1 ngdart: ^8.0.0-dev.4 dev_dependencies: - async: ^2.11.0 - build_runner: ^2.4.6 - build_test: ^2.2.1 - build_web_compilers: ^4.0.4 - lints: ^2.1.0 - mockito: ^5.4.3 - ngtest: ^5.0.0-dev.3 - test: ">=1.24.0 <1.25.0" + async: ^2.12.0 + build_runner: ^2.4.12 + build_test: ^2.2.2 + build_web_compilers: ^4.0.11 + lints: ^5.0.0 + mockito: ^5.4.4 + ngtest: ^5.0.0-dev.2 + test: ^1.25.9 diff --git a/ngrouter/pubspec_overrides.yaml b/ngrouter/pubspec_overrides.yaml deleted file mode 100644 index 11913f4d0..000000000 --- a/ngrouter/pubspec_overrides.yaml +++ /dev/null @@ -1,10 +0,0 @@ -# melos_managed_dependency_overrides: ngast,ngcompiler,ngdart,ngtest -dependency_overrides: - ngast: - path: ../ngast - ngcompiler: - path: ../ngcompiler - ngdart: - path: ../ngdart - ngtest: - path: ../ngtest diff --git a/ngtest/pubspec.yaml b/ngtest/pubspec.yaml index 60a4ceb72..ed7170430 100644 --- a/ngtest/pubspec.yaml +++ b/ngtest/pubspec.yaml @@ -6,16 +6,18 @@ version: 5.0.0-dev.3 repository: https://github.com/angulardart-community/angular environment: - sdk: ">=3.1.0 <4.0.0" + sdk: ">=3.6.0 <4.0.0" + +resolution: workspace dependencies: - collection: ^1.18.0 - meta: ^1.11.0 + collection: ^1.19.1 + meta: ^1.16.0 ngdart: ^8.0.0-dev.4 dev_dependencies: - build_runner: ^2.4.6 - build_test: ^2.2.1 - build_web_compilers: ^4.0.4 - lints: ^2.1.0 - test: ">=1.24.0 <1.25.0" + build_runner: ^2.4.12 + build_test: ^2.2.2 + build_web_compilers: ^4.0.11 + lints: ^5.0.0 + test: ^1.25.9 diff --git a/ngtest/pubspec_overrides.yaml b/ngtest/pubspec_overrides.yaml deleted file mode 100644 index d3a22b2c5..000000000 --- a/ngtest/pubspec_overrides.yaml +++ /dev/null @@ -1,8 +0,0 @@ -# melos_managed_dependency_overrides: ngast,ngcompiler,ngdart -dependency_overrides: - ngast: - path: ../ngast - ngcompiler: - path: ../ngcompiler - ngdart: - path: ../ngdart diff --git a/pubspec.yaml b/pubspec.yaml index a6f47c0c7..d1e22b52a 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,8 +1,22 @@ name: angular_workspace +publish_to: none environment: - sdk: '>=3.0.0 <4.0.0' + sdk: ">=3.5.0 <4.0.0" + +workspace: + - ngast + - ngcompiler + - ngdart + - ngforms + - ngrouter + - ngtest + + - examples/hello_world + + - _tests + - goldens dev_dependencies: - lints: ^2.1.0 - melos: ^3.2.0 + lints: ^5.0.0 + melos: ^6.2.0 diff --git a/tool/package_versions.yaml b/tool/package_versions.yaml index 384667a68..d6344b532 100644 --- a/tool/package_versions.yaml +++ b/tool/package_versions.yaml @@ -1,37 +1,37 @@ -sdk: ">=3.1.0 <4.0.0" +sdk: ">=3.6.0 <4.0.0" -analyzer: ^6.0.0 -args: ^2.4.2 -async: ^2.11.0 +analyzer: ^6.5.0 +args: ^2.6.0 +async: ^2.12.0 +build_resolvers: ^2.4.2 +build_runner: ^2.4.12 +build_test: ^2.2.2 +build_web_compilers: ^4.0.11 build: ^2.4.1 built_collection: ^5.1.1 -build_resolvers: ^2.4.1 -build_runner: ^2.4.6 -build_test: ^2.2.1 -built_value: ^8.7.0 -build_web_compilers: ^4.0.4 -charcode: ^1.3.1 -code_builder: ^4.7.0 -collection: ^1.18.0 -csslib: ^1.0.0 -dart_style: ^2.3.2 +built_value: ^8.9.2 +charcode: ^1.4.0 +code_builder: ^4.10.1 +collection: ^1.19.1 +csslib: ^1.0.2 +dart_style: ^2.3.7 glob: ^2.1.2 -intl: ^0.18.1 -js: ^0.6.7 -logging: ^1.2.0 -lints: ^2.1.0 -meta: ^1.11.0 -mockito: ^5.4.3 -ngast: ^3.0.0-dev.1 -ngcompiler: ^3.0.0-dev.2 -ngdart: ^8.0.0-dev.3 +intl: ^0.19.0 +js: ^0.7.1 +lints: ^5.0.0 +logging: ^1.3.0 +meta: ^1.16.0 +mockito: ^5.4.4 +ngast: ^3.0.0-dev.2 +ngcompiler: ^3.0.0-dev.3 +ngdart: ^8.0.0-dev.4 ngtest: ^5.0.0-dev.2 -package_config: ^2.1.0 -path: ^1.8.3 -source_gen: ^1.4.0 -source_span: ^1.10.0 -string_scanner: ^1.2.0 +package_config: ^2.1.1 +path: ^1.9.1 +source_gen: ^1.5.0 +source_span: ^1.10.1 stream_transform: ^2.1.0 +string_scanner: ^1.4.0 term_glyph: ^1.2.1 -test: ">=1.24.0 <1.25.0" +test: ^1.25.9 watcher: ^1.1.0 diff --git a/tool/update_versions.dart b/tool/update_versions.dart index 1fd8a2e52..c1c776592 100644 --- a/tool/update_versions.dart +++ b/tool/update_versions.dart @@ -1,7 +1,5 @@ import 'dart:io'; -final packageFolderRe = RegExp('(_|ng)'); - final packageEntryRe = RegExp('^ (\\w+): (.+)\$', multiLine: true); void main() { @@ -24,19 +22,18 @@ void main() { return ' ${match[1]}: ${versions[match[1]]}'; } - var offset = Directory.current.path.length + 1; - - Directory.current.listSync().whereType().forEach((directory) { - var directoryName = directory.path.substring(offset); - - if (directoryName.startsWith(packageFolderRe)) { - var pubspecFile = File.fromUri(directory.uri.resolve('pubspec.yaml')); + void update(Directory directory) { + var pubspecFile = File.fromUri(directory.uri.resolve('pubspec.yaml')); - if (pubspecFile.existsSync()) { - var oldPubspec = pubspecFile.readAsStringSync(); - var newContent = oldPubspec.replaceAllMapped(packageEntryRe, replace); - pubspecFile.writeAsStringSync(newContent); - } + if (pubspecFile.existsSync()) { + var oldPubspec = pubspecFile.readAsStringSync(); + var newContent = oldPubspec.replaceAllMapped(packageEntryRe, replace); + pubspecFile.writeAsStringSync(newContent); } - }); + } + + Directory.current + .listSync(recursive: true) + .whereType() + .forEach(update); }