Skip to content

Commit 91673d6

Browse files
authored
chore: Migrate to pub workspaces (#65)
Require Dart 3.6 throughout and migrate the monorepo to [pub workspaces](https://dart.dev/tools/pub/workspaces).
1 parent 1a64819 commit 91673d6

File tree

10 files changed

+728
-27
lines changed

10 files changed

+728
-27
lines changed

.github/workflows/cedar_ffi.yaml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,15 @@ jobs:
3636
submodules: true
3737
- name: Setup Dart
3838
uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 # main
39+
with:
40+
# Remove when released to stable: https://github.com/dart-lang/native/pull/1921
41+
sdk: beta
3942
- name: Setup Rust
4043
uses: actions-rust-lang/setup-rust-toolchain@11df97af8e8102fd60b60a77dfbf58d40cd843b8 # 1.10.1
41-
- name: Create override
42-
run: |
43-
cat <<EOF > pubspec_overrides.yaml
44-
dependency_overrides:
45-
cedar:
46-
path: ../cedar
47-
EOF
4844
- name: Get Packages
4945
run: dart pub get
5046
- name: Test
51-
run: dart --enable-experiment=native-assets test --fail-fast
47+
# TODO: Failing for some reason
48+
# run: dart --enable-experiment=native-assets test --fail-fast
49+
run: dart --enable-experiment=native-assets run bin/example.dart
50+
working-directory: packages/cedar_ffi/example

packages/cedar/CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## 0.2.4-wip
2+
3+
- Require Dart 3.6 (workspace support)
4+
- chore: Update dependencies
5+
16
## 0.2.3
27

38
- chore: Public interface cleanup

packages/cedar/pubspec.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
name: cedar
22
description: Implementation of the Cedar policy language in Dart.
3-
version: 0.2.3
3+
version: 0.2.4-wip
44
repository: https://github.com/celest-dev/cedar-dart/tree/main/packages/cedar
55

66
environment:
7-
sdk: ^3.3.0
7+
sdk: ^3.6.0
8+
resolution: workspace
89

910
dependencies:
1011
built_collection: ^5.1.0

packages/cedar_ffi/CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## 0.2.1-wip
2+
3+
- Require Dart 3.6 (workspace support)
4+
- chore: Update dependencies
5+
16
## 0.2.0
27

38
- chore: Update dependencies

packages/cedar_ffi/example/pubspec.yaml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,15 @@ version: 1.0.0
44
publish_to: none
55

66
environment:
7-
sdk: ^3.2.0
7+
sdk: ^3.6.0
8+
resolution: workspace
89

910
dependencies:
1011
cedar:
1112
path: ../../cedar
1213
cedar_ffi:
1314
path: ../
1415

15-
dependency_overrides:
16-
cedar:
17-
path: ../../cedar
18-
1916
dev_dependencies:
20-
lints: ^3.0.0
17+
lints: ^5.0.0
2118
test: ^1.21.0

packages/cedar_ffi/hook/build.dart

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,7 @@ void main(List<String> args) async {
1919
await build(args, (input, output) async {
2020
buildLogs.writeln(input.json);
2121

22-
output.addDependencies([
23-
input.packageRoot.resolve('build.dart'),
24-
input.packageRoot.resolve('src/'),
25-
]);
22+
output.addDependency(input.packageRoot.resolve('src/'));
2623

2724
// Build the Rust code in `src/` to `target/`.
2825
//

packages/cedar_ffi/pubspec.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
name: cedar_ffi
22
description: FFI bindings for the Cedar policy language, written in Rust.
3-
version: 0.2.0
3+
version: 0.2.1-wip
44
repository: https://github.com/celest-dev/cedar-dart/tree/main/packages/cedar_ffi
55

66
environment:
7-
sdk: ^3.4.0
7+
sdk: ^3.6.0
8+
resolution: workspace
89

910
dependencies:
1011
built_collection: ^5.1.1

packages/cedar_tests/pubspec.yaml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,14 @@ description: Shared testing code for Cedar Dart packages.
33
publish_to: none
44

55
environment:
6-
sdk: ^3.3.0
6+
sdk: ^3.6.0
7+
resolution: workspace
78

89
dependencies:
910
cedar: ^0.2.0
1011
json_annotation: ^4.9.0
1112
test: ^1.24.0
1213

13-
dependency_overrides:
14-
cedar:
15-
path: ../cedar
16-
1714
dev_dependencies:
1815
lints: ^5.0.0
1916
build_runner: ^2.4.12

0 commit comments

Comments
 (0)