Skip to content

Commit

Permalink
Merge branch 'main' into severin/update-license
Browse files Browse the repository at this point in the history
  • Loading branch information
sesi200 authored Oct 28, 2024
2 parents 7b6fb98 + 882fa28 commit 898fc70
Show file tree
Hide file tree
Showing 37 changed files with 834 additions and 379 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/release-candid-extractor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
~/.cargo/bin/
Expand Down
100 changes: 67 additions & 33 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ opt-level = 'z'

[workspace.dependencies]
ic0 = { path = "src/ic0", version = "0.23.0" }
ic-cdk = { path = "src/ic-cdk", version = "0.14.0"}
ic-cdk-timers = { path = "src/ic-cdk-timers", version = "0.8.0" }
ic-cdk = { path = "src/ic-cdk", version = "0.16.0" }
ic-cdk-timers = { path = "src/ic-cdk-timers", version = "0.10.0" }

candid = "0.10.4"
candid_parser = "0.1.4"
Expand Down
7 changes: 3 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ This repo provides libraries and tools to facilitate developing canisters in Rus
- [`ic0`](src/ic0):
Internet Computer System API binding.
- [`ic-cdk`](src/ic-cdk):
Internet Computer Canister Development Kit
Internet Computer Canister Development Kit.
- [`ic-cdk-bindgen`](src/ic-cdk-bindgen):
Generate Rust bindings from Candid to make inter-canister calls.
- [`ic-cdk-macros`](src/ic-cdk-macros):
Expand All @@ -52,9 +52,8 @@ In Cargo.toml:
crate-type = ["cdylib"]

[dependencies]
ic-cdk = "0.12"
# Only necessary if you want to define Candid data types
candid = "0.10"
ic-cdk = "0.15"
candid = "0.10" # required if you want to define Candid data types
```

Then in Rust source code:
Expand Down
2 changes: 1 addition & 1 deletion e2e-tests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,4 @@ path = "canisters/chunk.rs"

[dev-dependencies]
hex.workspace = true
pocket-ic = "3"
pocket-ic = "4"
1 change: 1 addition & 0 deletions e2e-tests/canisters/canister_info.rs
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ async fn canister_lifecycle() -> Principal {
memory_allocation: None,
freezing_threshold: None,
reserved_cycles_limit: None,
log_visibility: None,
wasm_memory_limit: None,
},
canister_id: canister_id.canister_id,
Expand Down
Loading

0 comments on commit 898fc70

Please sign in to comment.