Merge pull request #31 from lefessan/z-2022-03-08-ez-file

support for ez_file.0.3.0 and bump to 0.5.1
OCamlPro · Mar 9, 2022 · 9c03ceb · 9c03ceb
2 parents f39153f + 9d41e33
commit 9c03ceb
Show file tree

Hide file tree

Showing 18 changed files with 37 additions and 31 deletions.
diff --git a/.drom b/.drom
@@ -5,7 +5,7 @@ version:0.6.0~dev
 
 # hash of toml configuration files
 # used for generation of all files
-e479a140fdce8511fff1e2e129232ad8:.
+f03c7d8533d7b3df2ba7ae0cf76f0bb5:.
 # end context for .
 
 # begin context for .github/workflows/workflow.yml
@@ -35,7 +35,7 @@ a8d1bcd6f62c6b813b77d3ff8959d8d2:.ocamlformat-ignore
 
 # begin context for CHANGES.md
 # file CHANGES.md
-6ab63a65c0d9239b98b762f4fee6cc08:CHANGES.md
+c227b0ca44c56caf249322bb477dddf4:CHANGES.md
 # end context for CHANGES.md
 
 # begin context for LICENSE.md
@@ -95,37 +95,37 @@ c8281f46ba9a11d0b61bc8ef67eaa357:docs/style.css
 
 # begin context for dune-project
 # file dune-project
-320f04597ae23554d98b8200744f94aa:dune-project
+b11975246b90e961eb7ce7b7ca8b5899:dune-project
 # end context for dune-project
 
 # begin context for opam/ez_hash.opam
 # file opam/ez_hash.opam
-e5a2fec1d9a1867101bdfa8de0f1fb08:opam/ez_hash.opam
+23004f1aacae7a2e788fe6652f9aa6e2:opam/ez_hash.opam
 # end context for opam/ez_hash.opam
 
 # begin context for opam/solidity-alcotest.opam
 # file opam/solidity-alcotest.opam
-8266a97dff5313618b12e14e88028969:opam/solidity-alcotest.opam
+f9229cd0441a336441d4c7e784bf711a:opam/solidity-alcotest.opam
 # end context for opam/solidity-alcotest.opam
 
 # begin context for opam/solidity-common.opam
 # file opam/solidity-common.opam
-4eb509339a9d0be68742a22872684c5d:opam/solidity-common.opam
+c4f6774f9d73624bffa110ed94c315fb:opam/solidity-common.opam
 # end context for opam/solidity-common.opam
 
 # begin context for opam/solidity-parser.opam
 # file opam/solidity-parser.opam
-73b2575cad636da67e416a01ccd23f66:opam/solidity-parser.opam
+ef391c6a68899da8830b18e6a35d39fb:opam/solidity-parser.opam
 # end context for opam/solidity-parser.opam
 
 # begin context for opam/solidity-test.opam
 # file opam/solidity-test.opam
-33b7f5916d27f6f255b260079b26deb7:opam/solidity-test.opam
+d5a77e9f746f25af9b376f1dbd28b4cb:opam/solidity-test.opam
 # end context for opam/solidity-test.opam
 
 # begin context for opam/solidity-typechecker.opam
 # file opam/solidity-typechecker.opam
-ad29ab7167cad75c25c5762fe4ad7d01:opam/solidity-typechecker.opam
+bbc02cb1f50781aca069cb08391b3bd4:opam/solidity-typechecker.opam
 # end context for opam/solidity-typechecker.opam
 
 # begin context for scripts/after.sh
@@ -195,7 +195,7 @@ e86f9a67236dac57aaae3ca819cb7dbb:src/ocaml-solidity/package.toml
 
 # begin context for src/solidity-alcotest/version.mlt
 # file src/solidity-alcotest/version.mlt
-e021f862f6ff646fd887b2ed9b22ce9e:src/solidity-alcotest/version.mlt
+1a6ab98687bd7d3978905e2e6a48dfab:src/solidity-alcotest/version.mlt
 # end context for src/solidity-alcotest/version.mlt
 
 # begin context for src/solidity-common/dune
@@ -215,7 +215,7 @@ e021f862f6ff646fd887b2ed9b22ce9e:src/solidity-alcotest/version.mlt
 
 # begin context for src/solidity-common/version.mlt
 # file src/solidity-common/version.mlt
-e021f862f6ff646fd887b2ed9b22ce9e:src/solidity-common/version.mlt
+1a6ab98687bd7d3978905e2e6a48dfab:src/solidity-common/version.mlt
 # end context for src/solidity-common/version.mlt
 
 # begin context for src/solidity-parser/dune
@@ -235,7 +235,7 @@ be413a351ddaf3cdf0d44e91ad35680e:src/solidity-parser/main.ml
 
 # begin context for src/solidity-parser/version.mlt
 # file src/solidity-parser/version.mlt
-e021f862f6ff646fd887b2ed9b22ce9e:src/solidity-parser/version.mlt
+1a6ab98687bd7d3978905e2e6a48dfab:src/solidity-parser/version.mlt
 # end context for src/solidity-parser/version.mlt
 
 # begin context for src/solidity-test/dune
@@ -245,7 +245,7 @@ e021f862f6ff646fd887b2ed9b22ce9e:src/solidity-parser/version.mlt
 
 # begin context for src/solidity-test/version.mlt
 # file src/solidity-test/version.mlt
-e021f862f6ff646fd887b2ed9b22ce9e:src/solidity-test/version.mlt
+1a6ab98687bd7d3978905e2e6a48dfab:src/solidity-test/version.mlt
 # end context for src/solidity-test/version.mlt
 
 # begin context for src/solidity-typechecker/dune
@@ -265,5 +265,5 @@ e021f862f6ff646fd887b2ed9b22ce9e:src/solidity-test/version.mlt
 
 # begin context for src/solidity-typechecker/version.mlt
 # file src/solidity-typechecker/version.mlt
-e021f862f6ff646fd887b2ed9b22ce9e:src/solidity-typechecker/version.mlt
+1a6ab98687bd7d3978905e2e6a48dfab:src/solidity-typechecker/version.mlt
 # end context for src/solidity-typechecker/version.mlt
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,4 +1,4 @@
 
-## v0.1.0 ( 2022-02-07 )
+## v0.1.0 ( 2022-03-08 )
 
 * Initial commit
diff --git a/drom.toml b/drom.toml
@@ -15,7 +15,7 @@ license = "LGPL2"
 min-edition = "4.08.0"
 name = "ocaml-solidity"
 synopsis = "The ocaml-solidity project"
-version = "0.5.0"
+version = "0.5.1"
 
 # keys that you could also define:
 # odoc-target = "...odoc-target..."

diff --git a/dune-project b/dune-project
@@ -1,10 +1,11 @@
 (lang dune 2.7)
 ; This file was generated by drom, using drom.toml
+
 (cram enable)
 (name ocaml-solidity)
 (allow_approximate_merlin)
 (generate_opam_files false)
-(version 0.5.0)
+(version 0.5.1)
 (formatting (enabled_for ocaml reason))
 (using menhir 2.0)
 
@@ -44,7 +45,7 @@
    zarith
    (hex ( >= 1 ))
    (fileutils ( >= 0.6 ))
-   (ez_file ( >= 0.1 ))
+   (ez_file ( >= 0.3 ))
    ppx_inline_test
    ppx_expect
    odoc
@@ -118,3 +119,4 @@
   )
  )
 
+
diff --git a/opam/ez_hash.opam b/opam/ez_hash.opam
@@ -2,7 +2,7 @@
 # Do not modify, or add to the `skip` field of `drom.toml`.
 opam-version: "2.0"
 name: "ez_hash"
-version: "0.5.0"
+version: "0.5.1"
 license: "LGPL-2.1-only with OCaml-LGPL-linking-exception"
 synopsis: "Hash functions: sha3, sha256, blake2b"
 description: """

diff --git a/opam/solidity-alcotest.opam b/opam/solidity-alcotest.opam
@@ -2,7 +2,7 @@
 # Do not modify, or add to the `skip` field of `drom.toml`.
 opam-version: "2.0"
 name: "solidity-alcotest"
-version: "0.5.0"
+version: "0.5.1"
 license: "LGPL-2.1-only with OCaml-LGPL-linking-exception"
 synopsis: "The ocaml-solidity project"
 description: """

diff --git a/opam/solidity-common.opam b/opam/solidity-common.opam
@@ -2,7 +2,7 @@
 # Do not modify, or add to the `skip` field of `drom.toml`.
 opam-version: "2.0"
 name: "solidity-common"
-version: "0.5.0"
+version: "0.5.1"
 license: "LGPL-2.1-only with OCaml-LGPL-linking-exception"
 synopsis: "The ocaml-solidity project"
 description: """
@@ -46,7 +46,7 @@ depends: [
   "zarith" {}
   "hex" {>= "1"}
   "fileutils" {>= "0.6"}
-  "ez_file" {>= "0.1"}
+  "ez_file" {>= "0.3"}
   "ppx_inline_test" {with-test}
   "ppx_expect" {with-test}
   "odoc" {with-doc}

diff --git a/opam/solidity-parser.opam b/opam/solidity-parser.opam
@@ -2,7 +2,7 @@
 # Do not modify, or add to the `skip` field of `drom.toml`.
 opam-version: "2.0"
 name: "solidity-parser"
-version: "0.5.0"
+version: "0.5.1"
 license: "LGPL-2.1-only with OCaml-LGPL-linking-exception"
 synopsis: "The ocaml-solidity project"
 description: """

diff --git a/opam/solidity-test.opam b/opam/solidity-test.opam
@@ -2,7 +2,7 @@
 # Do not modify, or add to the `skip` field of `drom.toml`.
 opam-version: "2.0"
 name: "solidity-test"
-version: "0.5.0"
+version: "0.5.1"
 license: "LGPL-2.1-only with OCaml-LGPL-linking-exception"
 synopsis: "The ocaml-solidity project"
 description: """

diff --git a/opam/solidity-typechecker.opam b/opam/solidity-typechecker.opam
@@ -2,7 +2,7 @@
 # Do not modify, or add to the `skip` field of `drom.toml`.
 opam-version: "2.0"
 name: "solidity-typechecker"
-version: "0.5.0"
+version: "0.5.1"
 license: "LGPL-2.1-only with OCaml-LGPL-linking-exception"
 synopsis: "The ocaml-solidity project"
 description: """

diff --git a/src/solidity-alcotest/version.mlt b/src/solidity-alcotest/version.mlt
@@ -13,7 +13,7 @@ let query cmd =
 
 let commit_hash = query "git show -s --pretty=format:%H"
 let commit_date = query "git show -s --pretty=format:%ci"
-let version = "0.5.0"
+let version = "0.5.1"
 
 let string_option = function
   | None -> "None"

diff --git a/src/solidity-common/package.toml b/src/solidity-common/package.toml
@@ -39,7 +39,7 @@ pack-modules = false
 hex = "1"
 zarith = ""
 fileutils = "0.6"
-ez_file = "0.1"
+ez_file = "0.3"
 
 # package tools dependencies
 [tools]

diff --git a/src/solidity-common/solidity_common.ml b/src/solidity-common/solidity_common.ml
@@ -10,6 +10,8 @@
 (*                                                                        *)
 (**************************************************************************)
 
+open Ez_file.V1
+
 type pos = string * (int * int) * (int * int)
 
 let dummy_pos = "", (-1, -1), (-1, -1)

diff --git a/src/solidity-common/version.mlt b/src/solidity-common/version.mlt
@@ -13,7 +13,7 @@ let query cmd =
 
 let commit_hash = query "git show -s --pretty=format:%H"
 let commit_date = query "git show -s --pretty=format:%ci"
-let version = "0.5.0"
+let version = "0.5.1"
 
 let string_option = function
   | None -> "None"

diff --git a/src/solidity-parser/solidity_parser.ml b/src/solidity-parser/solidity_parser.ml
@@ -10,6 +10,8 @@
 (*                                                                        *)
 (**************************************************************************)
 
+open Ez_file.V1
+
 open Solidity_common
 open Solidity_ast
 

diff --git a/src/solidity-parser/version.mlt b/src/solidity-parser/version.mlt
@@ -13,7 +13,7 @@ let query cmd =
 
 let commit_hash = query "git show -s --pretty=format:%H"
 let commit_date = query "git show -s --pretty=format:%ci"
-let version = "0.5.0"
+let version = "0.5.1"
 
 let string_option = function
   | None -> "None"

diff --git a/src/solidity-test/version.mlt b/src/solidity-test/version.mlt
@@ -13,7 +13,7 @@ let query cmd =
 
 let commit_hash = query "git show -s --pretty=format:%H"
 let commit_date = query "git show -s --pretty=format:%ci"
-let version = "0.5.0"
+let version = "0.5.1"
 
 let string_option = function
   | None -> "None"

diff --git a/src/solidity-typechecker/version.mlt b/src/solidity-typechecker/version.mlt
@@ -13,7 +13,7 @@ let query cmd =
 
 let commit_hash = query "git show -s --pretty=format:%H"
 let commit_date = query "git show -s --pretty=format:%ci"
-let version = "0.5.0"
+let version = "0.5.1"
 
 let string_option = function
   | None -> "None"