Skip to content

Commit

Permalink
Merge branch 'dojoengine:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
bal7hazar authored Nov 30, 2023
2 parents 8534bbc + 5fced69 commit 715ee4f
Show file tree
Hide file tree
Showing 27 changed files with 430 additions and 1,689 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Origami CI
on: [push, pull_request]

env:
DOJO_VERSION: v0.3.13
DOJO_VERSION: v0.3.14
SCARB_VERSION: v2.3.1

jobs:
Expand Down
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,11 @@
- [random](./crates/src/random)
- [security](./crates/src/security)

### Examples using the Origami
- [Simplex noise hex map](./examples/hex_map)
- [Market](./examples/market)
- [Projectile](./examples/projectile)

### Easy integration into your project

Incorporate `origami` seamlessly into your projects using Scarb.toml.
Expand Down
13 changes: 10 additions & 3 deletions Scarb.lock
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ source = "git+https://github.com/influenceth/cubit?rev=b459053#b4590530d5aeae9aa

[[package]]
name = "dojo"
version = "0.3.13"
source = "git+https://github.com/dojoengine/dojo?tag=v0.3.13#a253b0c8119f5cc8b20f2f2893a20ae3ef79951a"
version = "0.3.14"
source = "git+https://github.com/dojoengine/dojo?tag=v0.3.14#d7e9788459f3b2e797b6565f1057c96a6f5f8cc2"
dependencies = [
"dojo_plugin",
]
Expand Down Expand Up @@ -38,7 +38,7 @@ dependencies = [

[[package]]
name = "origami"
version = "0.1.0"
version = "0.0.0"
dependencies = [
"cubit",
"dojo",
Expand All @@ -52,3 +52,10 @@ dependencies = [
"dojo",
"origami",
]

[[package]]
name = "token"
version = "0.0.0"
dependencies = [
"dojo",
]
6 changes: 3 additions & 3 deletions Scarb.toml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
[workspace]
members = ["crates", "examples/*"]
members = ["crates", "examples/*", "token"]

[workspace.package]
version = "0.1.0"
version = "0.0.0"
description = "Community-maintained libraries for Cairo"
homepage = "https://github.com/dojoengine/origami"
authors = ["[email protected]"]

[workspace.dependencies]
cubit = { git = "https://github.com/influenceth/cubit", rev = "b459053" }
dojo = { git = "https://github.com/dojoengine/dojo", tag = "v0.3.13" }
dojo = { git = "https://github.com/dojoengine/dojo", tag = "v0.3.14" }
origami = { path = "crates" }
9 changes: 0 additions & 9 deletions presets/Scarb.toml

This file was deleted.

5 changes: 0 additions & 5 deletions presets/src/erc1155/erc1155.cairo

This file was deleted.

13 changes: 0 additions & 13 deletions presets/src/lib.cairo

This file was deleted.

Loading

0 comments on commit 715ee4f

Please sign in to comment.