Skip to content

Commit 547edfe

Browse files
cknittcknitt
authored
Merge pull request #27 from cknitt/feature/upgrade-dependencies
Upgrade dependencies.
2 parents dbd848a + 130ade5 commit 547edfe

File tree

2 files changed

+53
-32
lines changed

2 files changed

+53
-32
lines changed

‎esy.lock.json

Lines changed: 44 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"hash": "379a649bb61e3f360d2abfc735d00ba1",
2+
"hash": "d5c8cfa5a431b5a8ae6e127afe4ad8cd",
33
"root": "root@path:./package.json",
44
"node": {
55
"root@path:./package.json": {
@@ -12,22 +12,22 @@
1212
},
1313
"dependencies": [
1414
"@esy-ocaml/merlin@3.0.5005", "@esy-ocaml/reason@3.3.7",
15-
"@opam/alcotest@opam:0.8.4", "@opam/dune@opam:1.5.1",
15+
"@opam/alcotest@opam:0.8.4", "@opam/dune@opam:1.6.2",
1616
"@opam/ppx_fast_pipe@opam:0.0.1", "@opam/yojson@opam:1.4.1",
17-
"ocaml@4.6.9", "refmterr@3.1.9"
17+
"ocaml@4.6.9", "refmterr@3.1.10"
1818
]
1919
},
20-
"refmterr@3.1.9": {
20+
"refmterr@3.1.10": {
2121
"record": {
2222
"name": "refmterr",
23-
"version": "3.1.9",
23+
"version": "3.1.10",
2424
"source":
25-
"archive:https://registry.npmjs.org/refmterr/-/refmterr-3.1.9.tgz#sha1:03d4679c564fb1d1de28d1c0ce8b1fb934406bac",
25+
"archive:https://registry.npmjs.org/refmterr/-/refmterr-3.1.10.tgz#sha1:7c3e238022acb5de4e2254ab506d70eee13c0a46",
2626
"files": [],
2727
"opam": null
2828
},
2929
"dependencies": [
30-
"@esy-ocaml/reason@3.3.7", "@opam/jbuilder@opam:transition",
30+
"@esy-ocaml/reason@3.3.7", "@opam/dune@opam:1.6.2",
3131
"@opam/re@opam:1.7.3", "ocaml@4.6.9"
3232
]
3333
},
@@ -160,7 +160,7 @@
160160
}
161161
},
162162
"dependencies": [
163-
"@esy-ocaml/substs@0.0.1", "@opam/dune@opam:1.5.1",
163+
"@esy-ocaml/substs@0.0.1", "@opam/dune@opam:1.6.2",
164164
"@opam/menhir@opam:20181113", "@opam/merlin-extend@opam:0.3",
165165
"@opam/ocaml-migrate-parsetree@opam:1.1.0",
166166
"@opam/ocamlfind@opam:1.8.0", "@opam/result@opam:1.3", "ocaml@4.6.9"
@@ -202,7 +202,7 @@
202202
}
203203
},
204204
"dependencies": [
205-
"@esy-ocaml/substs@0.0.1", "@opam/dune@opam:1.5.1",
205+
"@esy-ocaml/substs@0.0.1", "@opam/dune@opam:1.6.2",
206206
"@opam/ocaml-migrate-parsetree@opam:1.1.0",
207207
"@opam/reason@opam:3.3.7", "ocaml@4.6.9"
208208
]
@@ -332,7 +332,7 @@
332332
}
333333
},
334334
"dependencies": [
335-
"@esy-ocaml/substs@0.0.1", "@opam/dune@opam:1.5.1",
335+
"@esy-ocaml/substs@0.0.1", "@opam/dune@opam:1.6.2",
336336
"@opam/result@opam:1.3", "ocaml@4.6.9"
337337
]
338338
},
@@ -405,7 +405,7 @@
405405
}
406406
},
407407
"dependencies": [
408-
"@esy-ocaml/substs@0.0.1", "@opam/dune@opam:1.5.1", "ocaml@4.6.9"
408+
"@esy-ocaml/substs@0.0.1", "@opam/dune@opam:1.6.2", "ocaml@4.6.9"
409409
]
410410
},
411411
"@opam/fmt@opam:0.8.5": {
@@ -449,18 +449,18 @@
449449
"ocaml@4.6.9"
450450
]
451451
},
452-
"@opam/dune@opam:1.5.1": {
452+
"@opam/dune@opam:1.6.2": {
453453
"record": {
454454
"name": "@opam/dune",
455-
"version": "opam:1.5.1",
455+
"version": "opam:1.6.2",
456456
"source":
457-
"archive:https://github.com/ocaml/dune/releases/download/1.5.1/dune-1.5.1.tbz#md5:071ff387b85e08bdfd49dee728dc8358",
457+
"archive:https://github.com/ocaml/dune/releases/download/1.6.2/dune-1.6.2.tbz#md5:e628e3903d2418d410e058ca49938a5d",
458458
"files": [],
459459
"opam": {
460460
"name": "dune",
461-
"version": "1.5.1",
461+
"version": "1.6.2",
462462
"opam":
463-
"opam-version: \"2.0\"\nname: \"dune\"\nversion: \"1.5.1\"\nsynopsis: \"Fast, portable and opinionated build system\"\ndescription: \"\"\"\ndune is a build system that was designed to simplify the release of\nJane Street packages. It reads metadata from \"dune\" files following a\nvery simple s-expression syntax.\n\ndune is fast, it has very low-overhead and support parallel builds on\nall platforms. It has no system dependencies, all you need to build\ndune and packages using dune is OCaml. You don't need or make or bash\nas long as the packages themselves don't use bash explicitly.\n\ndune supports multi-package development by simply dropping multiple\nrepositories into the same directory.\n\nIt also supports multi-context builds, such as building against\nseveral opam roots/switches simultaneously. This helps maintaining\npackages across several versions of OCaml and gives cross-compilation\nfor free.\"\"\"\nmaintainer: \"opensource@janestreet.com\"\nauthors: \"Jane Street Group, LLC <opensource@janestreet.com>\"\nlicense: \"MIT\"\nhomepage: \"https://github.com/ocaml/dune\"\nbug-reports: \"https://github.com/ocaml/dune/issues\"\ndepends: [\n \"ocaml\" {>= \"4.02\"}\n]\nconflicts: [\n \"jbuilder\" {!= \"transition\"}\n]\nbuild: [\n [\"ocaml\" \"configure.ml\" \"--libdir\" lib] {opam-version < \"2\"}\n [\"ocaml\" \"bootstrap.ml\"]\n [\"./boot.exe\" \"--release\" \"--subst\"] {pinned}\n [\"./boot.exe\" \"--release\" \"-j\" jobs]\n]\ndev-repo: \"git+https://github.com/ocaml/dune.git\"\nurl {\n src: \"https://github.com/ocaml/dune/releases/download/1.5.1/dune-1.5.1.tbz\"\n checksum: \"md5=071ff387b85e08bdfd49dee728dc8358\"\n}",
463+
"opam-version: \"2.0\"\nname: \"dune\"\nversion: \"1.6.2\"\nsynopsis: \"Fast, portable and opinionated build system\"\ndescription: \"\"\"\ndune is a build system that was designed to simplify the release of\nJane Street packages. It reads metadata from \"dune\" files following a\nvery simple s-expression syntax.\n\ndune is fast, it has very low-overhead and support parallel builds on\nall platforms. It has no system dependencies, all you need to build\ndune and packages using dune is OCaml. You don't need or make or bash\nas long as the packages themselves don't use bash explicitly.\n\ndune supports multi-package development by simply dropping multiple\nrepositories into the same directory.\n\nIt also supports multi-context builds, such as building against\nseveral opam roots/switches simultaneously. This helps maintaining\npackages across several versions of OCaml and gives cross-compilation\nfor free.\"\"\"\nmaintainer: \"opensource@janestreet.com\"\nauthors: \"Jane Street Group, LLC <opensource@janestreet.com>\"\nlicense: \"MIT\"\nhomepage: \"https://github.com/ocaml/dune\"\nbug-reports: \"https://github.com/ocaml/dune/issues\"\ndepends: [\n \"ocaml\" {>= \"4.02\"}\n \"base-unix\"\n \"base-threads\"\n]\nconflicts: [\n \"jbuilder\" {!= \"transition\"}\n \"odoc\" {< \"1.3.0\"}\n]\nbuild: [\n [\"ocaml\" \"configure.ml\" \"--libdir\" lib] {opam-version < \"2\"}\n [\"ocaml\" \"bootstrap.ml\"]\n [\"./boot.exe\" \"--release\" \"--subst\"] {pinned}\n [\"./boot.exe\" \"--release\" \"-j\" jobs]\n]\ndev-repo: \"git+https://github.com/ocaml/dune.git\"\nurl {\n src: \"https://github.com/ocaml/dune/releases/download/1.6.2/dune-1.6.2.tbz\"\n checksum: \"md5=e628e3903d2418d410e058ca49938a5d\"\n}",
464464
"override": {
465465
"build": [
466466
[ "ocaml", "bootstrap.ml" ],
@@ -469,7 +469,10 @@
469469
}
470470
}
471471
},
472-
"dependencies": [ "@esy-ocaml/substs@0.0.1", "ocaml@4.6.9" ]
472+
"dependencies": [
473+
"@esy-ocaml/substs@0.0.1", "@opam/base-threads@opam:base",
474+
"@opam/base-unix@opam:base", "ocaml@4.6.9"
475+
]
473476
},
474477
"@opam/cppo@opam:1.6.5": {
475478
"record": {
@@ -523,26 +526,22 @@
523526
},
524527
"dependencies": [ "@esy-ocaml/substs@0.0.1" ]
525528
},
526-
"@opam/cmdliner@opam:1.0.2": {
529+
"@opam/cmdliner@opam:1.0.3": {
527530
"record": {
528531
"name": "@opam/cmdliner",
529-
"version": "opam:1.0.2",
532+
"version": "opam:1.0.3",
530533
"source":
531-
"archive:http://erratique.ch/software/cmdliner/releases/cmdliner-1.0.2.tbz#md5:ab2f0130e88e8dcd723ac6154c98a881",
534+
"archive:http://erratique.ch/software/cmdliner/releases/cmdliner-1.0.3.tbz#md5:3674ad01d4445424105d33818c78fba8",
532535
"files": [],
533536
"opam": {
534537
"name": "cmdliner",
535-
"version": "1.0.2",
538+
"version": "1.0.3",
536539
"opam":
537-
"opam-version: \"2.0\"\nname: \"cmdliner\"\nversion: \"1.0.2\"\nsynopsis: \"Declarative definition of command line interfaces for OCaml\"\ndescription: \"\"\"\nCmdliner allows the declarative definition of command line interfaces\nfor OCaml.\n\nIt provides a simple and compositional mechanism to convert command\nline arguments to OCaml values and pass them to your functions. The\nmodule automatically handles syntax errors, help messages and UNIX man\npage generation. It supports programs with single or multiple commands\nand respects most of the [POSIX][1] and [GNU][2] conventions.\n\nCmdliner has no dependencies and is distributed under the ISC license.\n\n[1]: http://pubs.opengroup.org/onlinepubs/009695399/basedefs/xbd_chap12.html\n[2]: http://www.gnu.org/software/libc/manual/html_node/Argument-Syntax.html\"\"\"\nmaintainer: \"Daniel Bünzli <daniel.buenzl i@erratique.ch>\"\nauthors: \"Daniel Bünzli <daniel.buenzl i@erratique.ch>\"\nlicense: \"ISC\"\ntags: [\"cli\" \"system\" \"declarative\" \"org:erratique\"]\nhomepage: \"http://erratique.ch/software/cmdliner\"\ndoc: \"http://erratique.ch/software/cmdliner/doc/Cmdliner\"\nbug-reports: \"https://github.com/dbuenzli/cmdliner/issues\"\ndepends: [\n \"ocaml\" {>= \"4.01.0\"}\n \"ocamlfind\" {build}\n \"ocamlbuild\" {build}\n \"topkg\" {build}\n \"result\"\n]\nbuild: [\"ocaml\" \"pkg/pkg.ml\" \"build\" \"--pinned\" \"%{pinned}%\"]\ndev-repo: \"git+http://erratique.ch/repos/cmdliner.git\"\nurl {\n src: \"http://erratique.ch/software/cmdliner/releases/cmdliner-1.0.2.tbz\"\n checksum: \"md5=ab2f0130e88e8dcd723ac6154c98a881\"\n}",
540+
"opam-version: \"2.0\"\nname: \"cmdliner\"\nversion: \"1.0.3\"\nsynopsis: \"Declarative definition of command line interfaces for OCaml\"\ndescription: \"\"\"\nCmdliner allows the declarative definition of command line interfaces\nfor OCaml.\n\nIt provides a simple and compositional mechanism to convert command\nline arguments to OCaml values and pass them to your functions. The\nmodule automatically handles syntax errors, help messages and UNIX man\npage generation. It supports programs with single or multiple commands\nand respects most of the [POSIX][1] and [GNU][2] conventions.\n\nCmdliner has no dependencies and is distributed under the ISC license.\n\n[1]: http://pubs.opengroup.org/onlinepubs/009695399/basedefs/xbd_chap12.html\n[2]: http://www.gnu.org/software/libc/manual/html_node/Argument-Syntax.html\"\"\"\nmaintainer: \"Daniel Bünzli <daniel.buenzl i@erratique.ch>\"\nauthors: \"Daniel Bünzli <daniel.buenzl i@erratique.ch>\"\nlicense: \"ISC\"\ntags: [\"cli\" \"system\" \"declarative\" \"org:erratique\"]\nhomepage: \"http://erratique.ch/software/cmdliner\"\ndoc: \"http://erratique.ch/software/cmdliner/doc/Cmdliner\"\nbug-reports: \"https://github.com/dbuenzli/cmdliner/issues\"\ndepends: [\n \"ocaml\" {>= \"4.03.0\"}\n]\nbuild: [make \"all\" \"PREFIX=%{prefix}%\"]\ninstall: [\n [make \"install\" \"LIBDIR=%{_:lib}%\" \"DOCDIR=%{_:doc}%\"]\n [make \"install-doc\" \"LIBDIR=%{_:lib}%\" \"DOCDIR=%{_:doc}%\"]\n]\ndev-repo: \"git+http://erratique.ch/repos/cmdliner.git\"\nurl {\n src: \"http://erratique.ch/software/cmdliner/releases/cmdliner-1.0.3.tbz\"\n checksum: \"md5=3674ad01d4445424105d33818c78fba8\"\n}",
538541
"override": null
539542
}
540543
},
541-
"dependencies": [
542-
"@esy-ocaml/substs@0.0.1", "@opam/ocamlbuild@opam:0.12.0",
543-
"@opam/ocamlfind@opam:1.8.0", "@opam/result@opam:1.3",
544-
"@opam/topkg@opam:1.0.0", "ocaml@4.6.9"
545-
]
544+
"dependencies": [ "@esy-ocaml/substs@0.0.1", "ocaml@4.6.9" ]
546545
},
547546
"@opam/biniou@opam:1.2.0": {
548547
"record": {
@@ -581,6 +580,22 @@
581580
},
582581
"dependencies": [ "@esy-ocaml/substs@0.0.1" ]
583582
},
583+
"@opam/base-threads@opam:base": {
584+
"record": {
585+
"name": "@opam/base-threads",
586+
"version": "opam:base",
587+
"source": "no-source:",
588+
"files": [],
589+
"opam": {
590+
"name": "base-threads",
591+
"version": "base",
592+
"opam":
593+
"opam-version: \"2.0\"\nname: \"base-threads\"\nversion: \"base\"\nsynopsis: \"\"\ndescription: \"Threads library distributed with the OCaml compiler\"\nmaintainer: \"https://github.com/ocaml/opam-repository/issues\"",
594+
"override": null
595+
}
596+
},
597+
"dependencies": [ "@esy-ocaml/substs@0.0.1" ]
598+
},
584599
"@opam/base-bytes@opam:base": {
585600
"record": {
586601
"name": "@opam/base-bytes",
@@ -638,7 +653,7 @@
638653
},
639654
"dependencies": [
640655
"@esy-ocaml/substs@0.0.1", "@opam/astring@opam:0.8.3",
641-
"@opam/cmdliner@opam:1.0.2", "@opam/fmt@opam:0.8.5",
656+
"@opam/cmdliner@opam:1.0.3", "@opam/fmt@opam:0.8.5",
642657
"@opam/jbuilder@opam:transition", "@opam/result@opam:1.3",
643658
"@opam/uuidm@opam:0.9.6", "ocaml@4.6.9"
644659
]
@@ -664,7 +679,7 @@
664679
"opam": null
665680
},
666681
"dependencies": [
667-
"@opam/dune@opam:1.5.1", "@opam/menhir@opam:20181113",
682+
"@opam/dune@opam:1.6.2", "@opam/menhir@opam:20181113",
668683
"@opam/merlin-extend@opam:0.3",
669684
"@opam/ocaml-migrate-parsetree@opam:1.1.0",
670685
"@opam/ocamlfind@opam:1.8.0", "@opam/result@opam:1.3", "ocaml@4.6.9"

‎package.json

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,13 @@
99
"url": "https://github.com/cknitt/bs-react-intl-extractor.git"
1010
},
1111
"esy": {
12-
"build": [["refmterr", "dune", "build"]]
12+
"build": [
13+
[
14+
"refmterr",
15+
"dune",
16+
"build"
17+
]
18+
]
1319
},
1420
"scripts": {
1521
"format": "refmt --in-place -w 120 `find bin lib -name \"*.re\"`",
@@ -19,11 +25,11 @@
1925
"dependencies": {
2026
"@esy-ocaml/reason": "^3.3.7",
2127
"@opam/alcotest": "^0.8.4",
22-
"@opam/dune": "^1.4.0",
28+
"@opam/dune": "^1.6.2",
2329
"@opam/ppx_fast_pipe": "^0.0.1",
2430
"@opam/yojson": "^1.4.1",
2531
"ocaml": "~4.6.7",
26-
"refmterr": "^3.1.8"
32+
"refmterr": "^3.1.10"
2733
},
2834
"devDependencies": {
2935
"@esy-ocaml/merlin": "*"

0 commit comments

Comments
 (0)