Skip to content

Commit 19b17cd

Browse files
committed
chore: Update dependencies
- Removes unneeded dependencies and updates constraints for remaining dependencies. - Re-enables FFI tests in CI with updated `test` package
1 parent a049b04 commit 19b17cd

File tree

9 files changed

+64
-142
lines changed

9 files changed

+64
-142
lines changed

.github/dependabot.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ updates:
1919

2020
## RUST ##
2121
- package-ecosystem: "cargo"
22-
directory: "/"
22+
directory: "packages/cedar_ffi/src"
2323
schedule:
2424
interval: "weekly"
2525
groups:

.github/workflows/cedar_ffi.yaml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
matrix:
2525
os:
2626
- ubuntu-latest
27-
- macos-14
27+
- macos-latest
2828
- windows-latest
2929
runs-on: ${{ matrix.os }}
3030
# TODO(dnys1): Speed up Rust builds
@@ -35,16 +35,14 @@ jobs:
3535
with:
3636
submodules: true
3737
- name: Setup Dart
38-
uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c # main
38+
uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c # 1.7.1
3939
with:
40-
# Remove when released to stable: https://github.com/dart-lang/native/pull/1921
41-
sdk: main
40+
# Native assets is only enabled on dev/main channels for now.
41+
sdk: dev
4242
- name: Setup Rust
4343
uses: actions-rust-lang/setup-rust-toolchain@9399c7bb15d4c7d47b27263d024f0a4978346ba4 # 1.11.0
4444
- name: Get Packages
4545
run: dart pub get
4646
- name: Test
47-
# TODO: https://github.com/dart-lang/sdk/issues/60489
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
47+
run: dart --enable-experiment=native-assets test --fail-fast
48+
working-directory: packages/cedar_ffi

packages/cedar/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
## 0.2.6
2+
3+
- chore: Bump Dart SDK constraint to `^3.7.0`
4+
- chore: Remove unused dependencies
5+
- chore: Update `protobuf` dependency to `^4.0.0`
6+
17
## 0.2.5
28

39
- fix: JSON decoding of `is` expressions

packages/cedar/pubspec.yaml

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

66
environment:
7-
sdk: ^3.5.0
7+
sdk: ^3.7.0
88
resolution: workspace
99

1010
dependencies:
1111
built_collection: ^5.1.0
1212
built_value: ^8.9.0
13-
characters: ^1.3.0
1413
collection: ^1.18.0
1514
decimal: ^3.0.0
1615
fixnum: ^1.1.0
1716
json_annotation: ^4.9.0
1817
meta: ^1.11.0
19-
protobuf: ^3.1.0
18+
protobuf: ^4.0.0
2019
source_span: ^1.10.0
2120
string_scanner: ^1.2.0
2221

@@ -26,4 +25,4 @@ dev_dependencies:
2625
cedar_tests:
2726
path: ../cedar_tests
2827
lints: ^5.0.0
29-
test: ^1.25.8
28+
test: ^1.26.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+
## NEXT
2+
3+
- chore: Update native assets dependencies
4+
- chore: Remove unused dependencies
5+
16
## 0.2.1
27

38
- Require Dart 3.5 (workspace support)

packages/cedar_ffi/example/pubspec.yaml

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

66
environment:
7-
sdk: ^3.5.0
8-
resolution: workspace
7+
sdk: ^3.7.0
98

109
dependencies:
1110
cedar:
1211
path: ../../cedar
1312
cedar_ffi:
1413
path: ../
1514

15+
dependency_overrides:
16+
cedar:
17+
path: ../../cedar
18+
1619
dev_dependencies:
1720
lints: ^5.0.0
1821
test: ^1.21.0

packages/cedar_ffi/pubspec.yaml

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,19 @@ version: 0.2.1
44
repository: https://github.com/celest-dev/cedar-dart/tree/main/packages/cedar_ffi
55

66
environment:
7-
sdk: ^3.5.0
8-
resolution: workspace
7+
sdk: ^3.8.0-278.2.beta
98

109
dependencies:
11-
built_collection: ^5.1.1
12-
built_value: ^8.8.0
1310
cedar: ^0.2.0
14-
cli_config: ^0.2.0
15-
collection: ^1.18.0
1611
ffi: ^2.1.0
17-
json_annotation: ^4.9.0
18-
logging: ^1.2.0
1912
meta: ^1.10.0
20-
native_assets_cli: ^0.11.0
21-
native_toolchain_c: ^0.8.0
13+
native_assets_cli: ^0.16.0
14+
native_toolchain_c: ^0.13.0
2215

2316
dev_dependencies:
24-
build_runner: ^2.4.10
25-
built_value_generator: ^8.9.2
2617
cedar_tests:
2718
path: ../cedar_tests
2819
ffigen: ^18.0.0
29-
json_serializable: ^6.8.0
3020
lints: ^5.0.0
3121
path: ^1.9.0
32-
test: ^1.25.5
22+
test: ^1.26.0

0 commit comments

Comments
 (0)