Skip to content

Commit

Permalink
bump dojo to 1.1.2
Browse files Browse the repository at this point in the history
  • Loading branch information
thiscaspar committed Feb 5, 2025
1 parent 23b781e commit e16278c
Show file tree
Hide file tree
Showing 10 changed files with 30 additions and 29 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci-contracts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,6 @@ jobs:
- uses: asdf-vm/actions/setup@v3
- run: |
asdf plugin add dojo https://github.com/dojoengine/asdf-dojo
asdf install dojo 1.0.6
asdf global dojo 1.0.6
asdf install dojo 1.1.2
asdf global dojo 1.1.2
cd contracts && sozo test
2 changes: 1 addition & 1 deletion DOJO_VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.0.6
1.1.2
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ SHELL ["/bin/bash", "-c"]

ARG ASDF_VERSION="v0.14.1"
ARG SCARB_VERSION="2.7.0"
ARG DOJO_VERSION="1.0.6"
ARG DOJO_VERSION="1.1.2"
ARG STARKLI_VERSION="0.3.5"


Expand Down
4 changes: 2 additions & 2 deletions contracts/.tool-versions
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
dojo 1.0.6
scarb 2.8.4
dojo 1.1.2
scarb 2.9.2
4 changes: 2 additions & 2 deletions contracts/.vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"cairo1.enableLanguageServer": true,
"cairo1.languageServerPath": "${userHome}/.asdf/installs/dojo/1.0.6/bin/dojo-language-server",
"cairo1.languageServerPath": "${userHome}/.asdf/installs/dojo/1.1.2/bin/dojo-language-server",
"cairo1.enableScarb": true,
"cairo1.scarbPath": "${userHome}/.asdf/installs/scarb/2.8.4/bin/scarb",
"cairo1.scarbPath": "${userHome}/.asdf/installs/scarb/2.9.2/bin/scarb",
"cairo1.preferScarbLanguageServer": false
}
2 changes: 1 addition & 1 deletion contracts/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Follow the asdf installation instructions.

```
asdf plugin add dojo https://github.com/dojoengine/asdf-dojo
asdf install dojo 1.0.6
asdf install dojo 1.1.2
```

### Install scarb
Expand Down
17 changes: 9 additions & 8 deletions contracts/Scarb.lock
Original file line number Diff line number Diff line change
@@ -1,30 +1,31 @@
# Code generated by scarb DO NOT EDIT.

version = 1

[[package]]
name = "dojo"
version = "1.0.6"
source = "git+https://github.com/dojoengine/dojo?tag=v1.0.6#ba8ff0564e39b26ccbb81baaa843b3baf9644f24"
version = "1.1.2"
source = "git+https://github.com/dojoengine/dojo?tag=v1.1.2#4f3373ed4f98e1778022ed6f6502ce89f9d29b58"
dependencies = [
"dojo_plugin",
]

[[package]]
name = "dojo_cairo_test"
version = "1.0.0-rc.0"
source = "git+https://github.com/dojoengine/dojo?tag=v1.0.6#ba8ff0564e39b26ccbb81baaa843b3baf9644f24"
version = "1.0.12"
source = "git+https://github.com/dojoengine/dojo?tag=v1.1.2#4f3373ed4f98e1778022ed6f6502ce89f9d29b58"
dependencies = [
"dojo",
]

[[package]]
name = "dojo_plugin"
version = "2.8.4"
source = "git+https://github.com/dojoengine/dojo?tag=v1.0.6#ba8ff0564e39b26ccbb81baaa843b3baf9644f24"
version = "2.9.2"
source = "git+https://github.com/dojoengine/dojo?tag=v1.1.2#4f3373ed4f98e1778022ed6f6502ce89f9d29b58"

[[package]]
name = "pixelaw"
version = "0.5.16"
version = "0.5.21"
dependencies = [
"dojo",
"dojo_cairo_test",
Expand All @@ -33,7 +34,7 @@ dependencies = [

[[package]]
name = "pixelaw_test_helpers"
version = "0.5.16"
version = "0.5.21"
dependencies = [
"dojo",
"dojo_cairo_test",
Expand Down
8 changes: 4 additions & 4 deletions contracts/Scarb.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[package]
cairo-version = "=2.8.4"
cairo-version = "=2.9.2"
name = "pixelaw"
version = "0.5.21"
homepage = "https://github.com/pixelaw/core"
Expand All @@ -9,12 +9,12 @@ edition = "2024_07"
sierra-replace-ids = true

[dependencies]
dojo = { git = "https://github.com/dojoengine/dojo", tag = "v1.0.6" }
starknet = "2.8.4"
dojo = { git = "https://github.com/dojoengine/dojo", tag = "v1.1.2" }
starknet = "2.9.2"

[dev-dependencies]
pixelaw_test_helpers = { path = "../test_helpers" }
dojo_cairo_test = { git = "https://github.com/dojoengine/dojo", tag = "v1.0.6" }
dojo_cairo_test = { git = "https://github.com/dojoengine/dojo", tag = "v1.1.2" }

[tool.fmt]
sort-module-level-items = true
Expand Down
8 changes: 4 additions & 4 deletions contracts/Scarb_deploy.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[package]
cairo-version = "=2.8.4"
cairo-version = "=2.9.2"
name = "pixelaw"
version = "0.5.21"
homepage = "https://github.com/pixelaw/core"
Expand All @@ -9,12 +9,12 @@ edition = "2024_07"
sierra-replace-ids = true

[dependencies]
dojo = { git = "https://github.com/dojoengine/dojo", tag = "v1.0.6" }
starknet = "2.8.4"
dojo = { git = "https://github.com/dojoengine/dojo", tag = "v1.1.2" }
starknet = "2.9.2"

[dev-dependencies]
pixelaw_test_helpers = { path = "../test_helpers" }
dojo_cairo_test = { git = "https://github.com/dojoengine/dojo", tag = "v1.0.6" }
dojo_cairo_test = { git = "https://github.com/dojoengine/dojo", tag = "v1.1.2" }

[tool.fmt]
sort-module-level-items = true
Expand Down
8 changes: 4 additions & 4 deletions test_helpers/Scarb.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[package]
cairo-version = "=2.8.4"
cairo-version = "=2.9.2"
name = "pixelaw_test_helpers"
version = "0.5.21"
homepage = "https://github.com/pixelaw/core"
Expand All @@ -9,9 +9,9 @@ edition = "2024_07"
sierra-replace-ids = true

[dependencies]
dojo = { git = "https://github.com/dojoengine/dojo", tag = "v1.0.6" }
dojo_cairo_test = { git = "https://github.com/dojoengine/dojo", tag = "v1.0.6" }
starknet = "2.8.4"
dojo = { git = "https://github.com/dojoengine/dojo", tag = "v1.1.2" }
dojo_cairo_test = { git = "https://github.com/dojoengine/dojo", tag = "v1.1.2" }
starknet = "2.9.2"

[tool.fmt]
sort-module-level-items = true
Expand Down

0 comments on commit e16278c

Please sign in to comment.