Skip to content

Commit

Permalink
bump to core 0.5.11 and dojo 1.0.2
Browse files Browse the repository at this point in the history
  • Loading branch information
thiscaspar committed Nov 27, 2024
1 parent cdf46a3 commit 776306d
Show file tree
Hide file tree
Showing 8 changed files with 20 additions and 20 deletions.
4 changes: 2 additions & 2 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "My Project",
"image": "ghcr.io/pixelaw/core:0.5.10",
"image": "ghcr.io/pixelaw/core:0.5.11",
"forwardPorts": [
5050,
8080,
Expand Down 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.1/bin/dojo-language-server",
"cairo1.languageServerPath": "${userHome}/.asdf/installs/dojo/1.0.2/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.1
asdf global dojo 1.0.1
asdf install dojo 1.0.2
asdf global dojo 1.0.2
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.1
dojo 1.0.2
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.1/bin/dojo-language-server",
"cairo1.languageServerPath": "${userHome}/.asdf/installs/dojo/1.0.2/bin/dojo-language-server",
"cairo1.enableScarb": true,
"cairo1.scarbPath": "${userHome}/.asdf/installs/scarb/2.7.0/bin/scarb",
"cairo1.preferScarbLanguageServer": false
Expand Down
2 changes: 1 addition & 1 deletion README.local.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Follow the asdf installation instructions.

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

### Install scarb
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ The idea is that you'll copy this template and create your own PixeLAW app with
To upgrade Dojo, you have to upgrade Pixelaw Core (see below)

### 4.2 Upgrade Core
The easiest is to do a full-text search/replace on the Core version number (for example `0.5.10`) and replace it with the new version. Then it's easiest to
The easiest is to do a full-text search/replace on the Core version number (for example `0.5.11`) and replace it with the new version. Then it's easiest to
1. Delete the `/target/` folder
1. Delete the `Scarb.lock` file
1. Full Rebuild using `sozo build`
Expand Down
16 changes: 8 additions & 8 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.1"
source = "git+https://github.com/dojoengine/dojo?tag=v1.0.1#d7335e6f5c76a1dda887ec00c594c2c019b4a05f"
version = "1.0.2"
source = "git+https://github.com/dojoengine/dojo?tag=v1.0.2#8eb8c480676ea8b0fc5d6e59585cdbab1ff8200d"
dependencies = [
"dojo_plugin",
]

[[package]]
name = "dojo_cairo_test"
version = "1.0.0-rc.0"
source = "git+https://github.com/dojoengine/dojo?tag=v1.0.1#d7335e6f5c76a1dda887ec00c594c2c019b4a05f"
source = "git+https://github.com/dojoengine/dojo?tag=v1.0.2#8eb8c480676ea8b0fc5d6e59585cdbab1ff8200d"
dependencies = [
"dojo",
]

[[package]]
name = "dojo_plugin"
version = "2.8.4"
source = "git+https://github.com/dojoengine/dojo?tag=v1.0.1#d7335e6f5c76a1dda887ec00c594c2c019b4a05f"
source = "git+https://github.com/dojoengine/dojo?tag=v1.0.2#8eb8c480676ea8b0fc5d6e59585cdbab1ff8200d"

[[package]]
name = "myapp"
Expand All @@ -34,16 +34,16 @@ dependencies = [

[[package]]
name = "pixelaw"
version = "0.5.10"
source = "git+https://github.com/pixelaw/core?tag=v0.5.10#96260a5d1142e24eb30d63eb69ed47c036081376"
version = "0.5.11"
source = "git+https://github.com/pixelaw/core?tag=v0.5.11#c8a77eb1edf678cbdba28bba1a00bc643dc4a4b5"
dependencies = [
"dojo",
]

[[package]]
name = "pixelaw_test_helpers"
version = "0.5.10"
source = "git+https://github.com/pixelaw/core?tag=v0.5.10#96260a5d1142e24eb30d63eb69ed47c036081376"
version = "0.5.11"
source = "git+https://github.com/pixelaw/core?tag=v0.5.11#c8a77eb1edf678cbdba28bba1a00bc643dc4a4b5"
dependencies = [
"dojo",
"dojo_cairo_test",
Expand Down
8 changes: 4 additions & 4 deletions Scarb.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ version = "0.0.0"
sierra-replace-ids = true

[dependencies]
pixelaw = { git = "https://github.com/pixelaw/core", tag = "v0.5.10" }
pixelaw = { git = "https://github.com/pixelaw/core", tag = "v0.5.11" }
#pixelaw = { path = "../core/contracts" }
dojo = { git = "https://github.com/dojoengine/dojo", tag = "v1.0.1" }
dojo = { git = "https://github.com/dojoengine/dojo", tag = "v1.0.2" }

[dev-dependencies]
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.10" }
dojo_cairo_test = { git = "https://github.com/dojoengine/dojo", tag = "v1.0.2" }
pixelaw_test_helpers = { git = "https://github.com/pixelaw/core", tag = "v0.5.11" }
#pixelaw_test_helpers = { path = "../core/test_helpers" }

[[target.starknet-contract]]
Expand Down

0 comments on commit 776306d

Please sign in to comment.