Skip to content

Commit

Permalink
bump to dojo 1.0.1 and fix startups
Browse files Browse the repository at this point in the history
  • Loading branch information
thiscaspar committed Nov 18, 2024
1 parent fd4d6f4 commit 641862c
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
// Set *default* container specific settings.json values on container create.
"settings": {
"cairo1.enableLanguageServer": true,
"cairo1.languageServerPath": "${userHome}/.asdf/installs/dojo/1.0.0/bin/dojo-language-server",
"cairo1.languageServerPath": "${userHome}/.asdf/installs/dojo/1.0.1/bin/dojo-language-server",
"cairo1.enableScarb": true,
"cairo1.scarbPath": "${userHome}/.asdf/installs/scarb/2.7.0/bin/scarb",
"lldb.executable": "/usr/bin/lldb",
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci-contracts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@ jobs:
- uses: asdf-vm/actions/setup@v3
- run: |
asdf plugin add dojo https://github.com/dojoengine/asdf-dojo
asdf install dojo 1.0.0
asdf global dojo 1.0.0
asdf install dojo 1.0.1
asdf global dojo 1.0.1
sozo test
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
dojo 1.0.0
dojo 1.0.1
scarb 2.7.0
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"cairo1.enableLanguageServer": true,
"cairo1.languageServerPath": "${userHome}/.asdf/installs/dojo/1.0.0/bin/dojo-language-server",
"cairo1.languageServerPath": "${userHome}/.asdf/installs/dojo/1.0.1/bin/dojo-language-server",
"cairo1.enableScarb": true,
"cairo1.scarbPath": "${userHome}/.asdf/installs/scarb/2.7.0/bin/scarb",
"cairo1.preferScarbLanguageServer": false
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Follow the asdf installation instructions.

```
asdf plugin add dojo https://github.com/dojoengine/asdf-dojo
asdf install dojo 1.0.0
asdf install dojo 1.0.1
```

## Install scarb
Expand Down Expand Up @@ -94,7 +94,7 @@ pixelaw = { path = "../pixelaw/core/contracts" }

3. Modify version in `Scarb.toml` file in core repo
```Scarb.toml
dojo = { git = "https://github.com/dojoengine/dojo", tag = "v1.0.0-alpha.11" }
dojo = { git = "https://github.com/dojoengine/dojo", tag = "v1.0.1-alpha.11" }
```

4. Build and run core
Expand Down
10 changes: 5 additions & 5 deletions Scarb.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,24 @@ version = 1

[[package]]
name = "dojo"
version = "1.0.0"
source = "git+https://github.com/dojoengine/dojo?tag=v1.0.0#74280d48fa2828095331487dede59f9b2e378cd3"
version = "1.0.1"
source = "git+https://github.com/dojoengine/dojo?tag=v1.0.1#74280d48fa2828095331487dede59f9b2e378cd3"
dependencies = [
"dojo_plugin",
]

[[package]]
name = "dojo_cairo_test"
version = "1.0.0-rc.0"
source = "git+https://github.com/dojoengine/dojo?tag=v1.0.0#74280d48fa2828095331487dede59f9b2e378cd3"
version = "1.0.1-rc.0"
source = "git+https://github.com/dojoengine/dojo?tag=v1.0.1#74280d48fa2828095331487dede59f9b2e378cd3"
dependencies = [
"dojo",
]

[[package]]
name = "dojo_plugin"
version = "2.8.4"
source = "git+https://github.com/dojoengine/dojo?tag=v1.0.0#74280d48fa2828095331487dede59f9b2e378cd3"
source = "git+https://github.com/dojoengine/dojo?tag=v1.0.1#74280d48fa2828095331487dede59f9b2e378cd3"

[[package]]
name = "myapp"
Expand Down
4 changes: 2 additions & 2 deletions Scarb.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ sierra-replace-ids = true
[dependencies]
pixelaw = { git = "https://github.com/pixelaw/core", tag = "v0.5.6" }
#pixelaw = { path = "../core/contracts" }
dojo = { git = "https://github.com/dojoengine/dojo", tag = "v1.0.0" }
dojo = { git = "https://github.com/dojoengine/dojo", tag = "v1.0.1" }

[dev-dependencies]
dojo_cairo_test = { git = "https://github.com/dojoengine/dojo", tag = "v1.0.0" }
dojo_cairo_test = { git = "https://github.com/dojoengine/dojo", tag = "v1.0.1" }
pixelaw_test_helpers = { git = "https://github.com/pixelaw/core", tag = "v0.5.6" }
#pixelaw_test_helpers = { path = "../core/test_helpers" }

Expand Down

0 comments on commit 641862c

Please sign in to comment.