Update dune-project and dependencies

mbarbin · Nov 10, 2024 · c6facae · c6facae
1 parent 722287e
commit c6facae
Show file tree

Hide file tree

Showing 19 changed files with 35 additions and 47 deletions.
diff --git a/bopkit-tests.opam b/bopkit-tests.opam
@@ -25,8 +25,6 @@ depends: [
   "core" {>= "v0.17" & < "v0.18"}
   "core_unix" {>= "v0.17" & < "v0.18"}
   "dune-site" {>= "3.16"}
-  "err" {>= "0.0.5"}
-  "err-cli" {>= "0.0.5"}
   "expect_test_helpers_core" {>= "v0.17" & < "v0.18"}
   "fpath" {>= "0.7.3"}
   "fpath-base" {>= "0.2.2"}
@@ -37,6 +35,7 @@ depends: [
   "parsing-utils" {>= "0.2.1"}
   "pp" {>= "1.2.0"}
   "pp-extended" {>= "0.0.2"}
+  "pp-log" {>= "0.0.1"}
   "ppx_compare" {>= "v0.17" & < "v0.18"}
   "ppx_enumerate" {>= "v0.17" & < "v0.18"}
   "ppx_expect" {>= "v0.17" & < "v0.18"}

diff --git a/bopkit.opam b/bopkit.opam
@@ -23,8 +23,6 @@ depends: [
   "core" {>= "v0.17" & < "v0.18"}
   "core_unix" {>= "v0.17" & < "v0.18"}
   "dune-site" {>= "3.16"}
-  "err" {>= "0.0.5"}
-  "err-cli" {>= "0.0.5"}
   "fpath" {>= "0.7.3"}
   "fpath-base" {>= "0.2.2"}
   "graphics" {>= "5.1.2"}
@@ -34,6 +32,7 @@ depends: [
   "parsing-utils" {>= "0.2.1"}
   "pp" {>= "1.2.0"}
   "pp-extended" {>= "0.0.2"}
+  "pp-log" {>= "0.0.1"}
   "ppx_compare" {>= "v0.17" & < "v0.18"}
   "ppx_enumerate" {>= "v0.17" & < "v0.18"}
   "ppx_fields_conv" {>= "v0.17" & < "v0.18"}

diff --git a/dune-project b/dune-project
@@ -69,10 +69,6 @@
     (< v0.18)))
   (dune-site
    (>= 3.16))
-  (err
-   (>= 0.0.5))
-  (err-cli
-   (>= 0.0.5))
   (fpath
    (>= 0.7.3))
   (fpath-base
@@ -91,6 +87,8 @@
    (>= 1.2.0))
   (pp-extended
    (>= 0.0.2))
+  (pp-log
+   (>= 0.0.1))
   (ppx_compare
    (and
     (>= v0.17)
@@ -178,10 +176,6 @@
     (< v0.18)))
   (dune-site
    (>= 3.16))
-  (err
-   (>= 0.0.5))
-  (err-cli
-   (>= 0.0.5))
   (fpath
    (>= 0.7.3))
   (fpath-base
@@ -200,6 +194,8 @@
    (>= 1.2.0))
   (pp-extended
    (>= 0.0.2))
+  (pp-log
+   (>= 0.0.1))
   (ppx_compare
    (and
     (>= v0.17)
@@ -283,10 +279,6 @@
     (< v0.18)))
   (dune-site
    (>= 3.16))
-  (err
-   (>= 0.0.5))
-  (err-cli
-   (>= 0.0.5))
   (fpath
    (>= 0.7.3))
   (fpath-base
@@ -305,6 +297,8 @@
    (>= 1.2.0))
   (pp-extended
    (>= 0.0.2))
+  (pp-log
+   (>= 0.0.1))
   (ppx_compare
    (and
     (>= v0.17)
@@ -394,10 +388,6 @@
     (< v0.18)))
   (dune-site
    (>= 3.16))
-  (err
-   (>= 0.0.5))
-  (err-cli
-   (>= 0.0.5))
   (expect_test_helpers_core
    (and
     (>= v0.17)
@@ -420,6 +410,8 @@
    (>= 1.2.0))
   (pp-extended
    (>= 0.0.2))
+  (pp-log
+   (>= 0.0.1))
   (ppx_compare
    (and
     (>= v0.17)

diff --git a/lib/bopkit/src/dune b/lib/bopkit/src/dune
@@ -19,12 +19,12 @@
   bit_utils
   cmdlang
   comments-parser
-  pp-log.err
   fpath
   fpath-base
   loc
   parsing-utils
-  pp)
+  pp
+  pp-log.err)
  (lint
   (pps ppx_js_style -check-doc-comments))
  (preprocess

diff --git a/lib/bopkit_circuit/src/dune b/lib/bopkit_circuit/src/dune
@@ -8,8 +8,8 @@
   bopkit
   bopkit_sites
   core ;; For [Core.Set_once]
-  pp-log.err
-  loc)
+  loc
+  pp-log.err)
  (lint
   (pps ppx_js_style -check-doc-comments))
  (preprocess

diff --git a/lib/bopkit_command/src/dune b/lib/bopkit_command/src/dune
@@ -30,10 +30,10 @@
   bopkit_to_c
   cmdlang
   core
-  pp-log.err
-  pp-log.cli
   fpath
   fpath-base
+  pp-log.cli
+  pp-log.err
   seven_segment_display
   stdio)
  (lint

diff --git a/lib/bopkit_compiler/src/dune b/lib/bopkit_compiler/src/dune
@@ -26,12 +26,12 @@
   bopkit_topological_sort
   cmdlang
   core
-  pp-log.err
   fpath
   fpath-base
   graphics
   loc
   parsing-utils
+  pp-log.err
   unix)
  (lint
   (pps ppx_js_style -check-doc-comments))

diff --git a/lib/bopkit_process_command/src/dune b/lib/bopkit_process_command/src/dune
@@ -21,11 +21,11 @@
   bopkit_process_pp
   bopkit_process_syntax
   cmdlang
-  pp-log.err
-  pp-log.cli
   fpath
   fpath-base
-  pp)
+  pp
+  pp-log.cli
+  pp-log.err)
  (lint
   (pps ppx_js_style -check-doc-comments))
  (preprocess

diff --git a/lib/bopkit_process_interpreter/src/dune b/lib/bopkit_process_interpreter/src/dune
@@ -16,8 +16,8 @@
   bit_utils
   bopkit_process
   bopkit_process_syntax
-  pp-log.err
   loc
+  pp-log.err
   stdio)
  (lint
   (pps ppx_js_style -check-doc-comments))

diff --git a/lib/bopkit_simulator/src/dune b/lib/bopkit_simulator/src/dune
@@ -20,9 +20,9 @@
   core
   core_unix
   core_unix.sys_unix
-  pp-log.err
   fpath
   loc
+  pp-log.err
   stdio)
  (lint
   (pps ppx_js_style -check-doc-comments))

diff --git a/lib/bopkit_to_c/src/dune b/lib/bopkit_to_c/src/dune
@@ -6,11 +6,11 @@
   base
   bopkit_circuit
   bopkit_compiler
-  pp-log.err
   loc
   parsing-utils
   pp
-  pp-extended)
+  pp-extended
+  pp-log.err)
  (lint
   (pps ppx_js_style -check-doc-comments))
  (preprocess

diff --git a/lib/bopkit_topological_sort/test/dune b/lib/bopkit_topological_sort/test/dune
@@ -14,8 +14,8 @@
  (libraries
   base
   bopkit_topological_sort
-  pp-log.err
-  expect_test_helpers_core.expect_test_helpers_base)
+  expect_test_helpers_core.expect_test_helpers_base
+  pp-log.err)
  (inline_tests)
  (lint
   (pps ppx_js_style -check-doc-comments))

diff --git a/project/visa/lib/visa/src/dune b/project/visa/lib/visa/src/dune
@@ -16,11 +16,11 @@
   bit_utils
   cmdlang
   core ;; For [Core.String_id]
-  pp-log.err
   fpath
   loc
   parsing-utils
   pp
+  pp-log.err
   stdio)
  (lint
   (pps ppx_js_style -check-doc-comments))

diff --git a/project/visa/lib/visa_assembler/src/dune b/project/visa/lib/visa_assembler/src/dune
@@ -2,7 +2,7 @@
  (name visa_assembler)
  (public_name bopkit.visa-assembler)
  (flags :standard -w +a-4-40-41-42-44-45-48-66 -warn-error +a -open Base)
- (libraries base pp-log.err loc visa)
+ (libraries base loc pp-log.err visa)
  (lint
   (pps ppx_js_style -check-doc-comments))
  (preprocess

diff --git a/project/visa/lib/visa_command/src/dune b/project/visa/lib/visa_command/src/dune
@@ -20,10 +20,10 @@
   base
   cmdlang
   core
-  pp-log.err
-  pp-log.cli
   fpath
   fpath-base
+  pp-log.cli
+  pp-log.err
   seven_segment_display
   stdio
   visa

diff --git a/project/visa/lib/visa_dsl/test/dune b/project/visa/lib/visa_dsl/test/dune
@@ -13,11 +13,11 @@
   Expect_test_helpers_base)
  (libraries
   base
-  pp-log.err
   expect_test_helpers_core.expect_test_helpers_base
   parsing-utils
   pp
   pp-extended
+  pp-log.err
   visa
   visa_dsl
   visa_pp

diff --git a/project/visa/lib/visa_simulator/src/dune b/project/visa/lib/visa_simulator/src/dune
@@ -23,11 +23,11 @@
   core_unix
   core_unix.core_thread
   core_unix.sys_unix
-  pp-log.err
-  pp-log.cli
   fpath
   fpath-base
   loc
+  pp-log.cli
+  pp-log.err
   stdio
   visa
   visa_assembler

diff --git a/subleq.opam b/subleq.opam
@@ -23,8 +23,6 @@ depends: [
   "core" {>= "v0.17" & < "v0.18"}
   "core_unix" {>= "v0.17" & < "v0.18"}
   "dune-site" {>= "3.16"}
-  "err" {>= "0.0.5"}
-  "err-cli" {>= "0.0.5"}
   "fpath" {>= "0.7.3"}
   "fpath-base" {>= "0.2.2"}
   "graphics" {>= "5.1.2"}
@@ -34,6 +32,7 @@ depends: [
   "parsing-utils" {>= "0.2.1"}
   "pp" {>= "1.2.0"}
   "pp-extended" {>= "0.0.2"}
+  "pp-log" {>= "0.0.1"}
   "ppx_compare" {>= "v0.17" & < "v0.18"}
   "ppx_enumerate" {>= "v0.17" & < "v0.18"}
   "ppx_fields_conv" {>= "v0.17" & < "v0.18"}

diff --git a/visa.opam b/visa.opam
@@ -23,8 +23,6 @@ depends: [
   "core" {>= "v0.17" & < "v0.18"}
   "core_unix" {>= "v0.17" & < "v0.18"}
   "dune-site" {>= "3.16"}
-  "err" {>= "0.0.5"}
-  "err-cli" {>= "0.0.5"}
   "fpath" {>= "0.7.3"}
   "fpath-base" {>= "0.2.2"}
   "graphics" {>= "5.1.2"}
@@ -34,6 +32,7 @@ depends: [
   "parsing-utils" {>= "0.2.1"}
   "pp" {>= "1.2.0"}
   "pp-extended" {>= "0.0.2"}
+  "pp-log" {>= "0.0.1"}
   "ppx_compare" {>= "v0.17" & < "v0.18"}
   "ppx_enumerate" {>= "v0.17" & < "v0.18"}
   "ppx_fields_conv" {>= "v0.17" & < "v0.18"}