Skip to content

Commit

Permalink
use pub workspaces (#2249)
Browse files Browse the repository at this point in the history
  • Loading branch information
jakemac53 authored Jul 8, 2024
1 parent c14ce93 commit 14f9b3e
Show file tree
Hide file tree
Showing 16 changed files with 123 additions and 142 deletions.
154 changes: 77 additions & 77 deletions .github/workflows/dart.yml

Large diffs are not rendered by default.

12 changes: 2 additions & 10 deletions integration_tests/regression/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,15 +1,7 @@
name: regression_tests
publish_to: none
environment:
sdk: ^3.4.0
sdk: ^3.5.0-259.0.dev
resolution: workspace
dependencies:
test: any
dev_dependencies:
dart_flutter_team_lints: ^3.0.0
dependency_overrides:
test:
path: ../../pkgs/test
test_api:
path: ../../pkgs/test_api
test_core:
path: ../../pkgs/test_core
11 changes: 2 additions & 9 deletions integration_tests/spawn_hybrid/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,20 +1,13 @@
name: spawn_hybrid
publish_to: none
environment:
sdk: ^3.4.0
sdk: ^3.5.0-259.0.dev
resolution: workspace
dependencies:
async: ^2.9.0
path: ^1.8.2
stream_channel: ^2.1.0
dev_dependencies:
dart_flutter_team_lints: ^3.0.0
other_package:
path: other_package/
test: any
dependency_overrides:
test:
path: ../../pkgs/test
test_api:
path: ../../pkgs/test_api
test_core:
path: ../../pkgs/test_core
11 changes: 2 additions & 9 deletions integration_tests/wasm/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,14 +1,7 @@
name: wasm_tests
publish_to: none
environment:
sdk: ^3.4.0
sdk: ^3.5.0-259.0.dev
resolution: workspace
dev_dependencies:
dart_flutter_team_lints: ^3.0.0
test: any
dependency_overrides:
test:
path: ../../pkgs/test
test_api:
path: ../../pkgs/test_api
test_core:
path: ../../pkgs/test_core
4 changes: 2 additions & 2 deletions pkgs/checks/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ description: >-
A framework for checking values against expectations and building custom
expectations.
repository: https://github.com/dart-lang/test/tree/master/pkgs/checks
resolution: workspace

environment:
sdk: ^3.4.0
sdk: ^3.5.0-259.0.dev

dependencies:
async: ^2.8.0
meta: ^1.9.0
test_api: ">=0.5.0 <0.8.0"

dev_dependencies:
dart_flutter_team_lints: ^3.0.0
test: ^1.21.3
7 changes: 0 additions & 7 deletions pkgs/checks/pubspec_overrides.yaml

This file was deleted.

4 changes: 4 additions & 0 deletions pkgs/test/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 1.25.9-wip

* Increase SDK constraint to ^3.5.0-259.0.dev.

## 1.25.8

* Increase SDK constraint to ^3.4.0.
Expand Down
10 changes: 5 additions & 5 deletions pkgs/test/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
name: test
version: 1.25.8
version: 1.25.9-wip
description: >-
A full featured library for writing and running Dart tests across platforms.
repository: https://github.com/dart-lang/test/tree/master/pkgs/test
resolution: workspace

environment:
sdk: ^3.4.0
sdk: ^3.5.0-259.0.dev

dependencies:
analyzer: '>=5.12.0 <7.0.0'
Expand Down Expand Up @@ -34,16 +35,15 @@ dependencies:
stream_channel: ^2.1.0

# Use an exact version until the test_api and test_core package are stable.
test_api: 0.7.3
test_core: 0.6.5
test_api: 0.7.4-wip
test_core: 0.6.6-wip

typed_data: ^1.3.0
web_socket_channel: '>=2.0.0 <4.0.0'
webkit_inspection_protocol: ^1.0.0
yaml: ^3.0.0

dev_dependencies:
dart_flutter_team_lints: ^3.0.0
fake_async: ^1.0.0
glob: ^2.0.0
test_descriptor: ^2.0.0
Expand Down
5 changes: 0 additions & 5 deletions pkgs/test/pubspec_overrides.yaml

This file was deleted.

4 changes: 4 additions & 0 deletions pkgs/test_api/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 0.7.4-wip

* Increase SDK constraint to ^3.5.0-259.0.dev.

## 0.7.3

* Increase SDK constraint to ^3.4.0.
Expand Down
6 changes: 3 additions & 3 deletions pkgs/test_api/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
name: test_api
version: 0.7.3
version: 0.7.4-wip
description: >-
The user facing API for structuring Dart tests and checking expectations.
repository: https://github.com/dart-lang/test/tree/master/pkgs/test_api
resolution: workspace

environment:
sdk: ^3.4.0
sdk: ^3.5.0-259.0.dev

dependencies:
async: ^2.5.0
Expand All @@ -20,7 +21,6 @@ dependencies:

dev_dependencies:
analyzer: '>=2.1.0 <7.0.0'
dart_flutter_team_lints: ^3.0.0
fake_async: ^1.2.0
glob: ^2.0.0
graphs: ^2.0.0
Expand Down
6 changes: 0 additions & 6 deletions pkgs/test_api/pubspec_overrides.yaml

This file was deleted.

4 changes: 4 additions & 0 deletions pkgs/test_core/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 0.6.6-wip

* Increase SDK constraint to ^3.5.0-259.0.dev.

## 0.6.5

* Increase SDK constraint to ^3.4.0.
Expand Down
8 changes: 4 additions & 4 deletions pkgs/test_core/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
name: test_core
version: 0.6.5
version: 0.6.6-wip
description: A basic library for writing tests and running them on the VM.
repository: https://github.com/dart-lang/test/tree/master/pkgs/test_core
resolution: workspace

environment:
sdk: ^3.4.0
sdk: ^3.5.0-259.0.dev

dependencies:
analyzer: '>=3.3.0 <7.0.0'
Expand All @@ -26,10 +27,9 @@ dependencies:
stack_trace: ^1.10.0
stream_channel: ^2.1.0
# Use an exact version until the test_api package is stable.
test_api: 0.7.3
test_api: 0.7.4-wip
vm_service: ">=6.0.0 <15.0.0"
yaml: ^3.0.0

dev_dependencies:
dart_flutter_team_lints: ^3.0.0
test: any
5 changes: 0 additions & 5 deletions pkgs/test_core/pubspec_overrides.yaml

This file was deleted.

14 changes: 14 additions & 0 deletions pubspec.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: test_workspace
publish_to: none
environment:
sdk: ^3.5.0-259.0.dev # Must be ^3.5.0 or later for workspace to be allowed
workspace:
- integration_tests/regression
- integration_tests/spawn_hybrid
- integration_tests/wasm
- pkgs/checks
- pkgs/test
- pkgs/test_api
- pkgs/test_core
dev_dependencies:
dart_flutter_team_lints: ^3.1.0

0 comments on commit 14f9b3e

Please sign in to comment.