From cad737418f0d2383f83d2fbc6d2f731e7f6c7934 Mon Sep 17 00:00:00 2001 From: Nikos Gorogiannis Date: Fri, 22 Nov 2024 10:13:14 -0800 Subject: [PATCH] [core] upgrade to 0.16.1 Summary: Upgrading core to 0.16.1 removes one of the obstacles to OCaml 5.2. Reviewed By: jvillard Differential Revision: D66358373 Privacy Context Container: L1208441 fbshipit-source-id: 01ddc382bef3d78f387bfbd907f1771d710adaac --- infer/src/base/ResultsDir.ml | 2 +- infer/src/deadcode/dune.in | 4 +- infer/src/linking-flags.sexp | 4 +- opam/infer-tests.opam.locked | 130 ++++++++++++++++++----------------- opam/infer.opam | 16 ++--- opam/infer.opam.locked | 130 ++++++++++++++++++----------------- opam/ocamlformat.opam.locked | 14 ++-- 7 files changed, 152 insertions(+), 148 deletions(-) diff --git a/infer/src/base/ResultsDir.ml b/infer/src/base/ResultsDir.ml index 108c3998aeb..38fd90059f4 100644 --- a/infer/src/base/ResultsDir.ml +++ b/infer/src/base/ResultsDir.ml @@ -11,7 +11,7 @@ module L = Logging let get_path entry = ResultsDirEntryName.get_path ~results_dir:Config.results_dir entry module RunState = struct - let run_time_string = Time.now () |> Time.to_string_utc + let run_time_string = Time_float.now () |> Time_float.to_string_utc let state0 = let open Runstate_t in diff --git a/infer/src/deadcode/dune.in b/infer/src/deadcode/dune.in index 5a84083ad12..d26b1182fe1 100644 --- a/infer/src/deadcode/dune.in +++ b/infer/src/deadcode/dune.in @@ -7,7 +7,9 @@ (name all_infer_in_one_file) (modes byte) (flags - (:standard -w +60)) + (:standard -w +60 + -open + Ppx_yojson_conv_lib.Yojson_conv.Primitives)) (libraries javalib ANSITerminal async atdgen base base64 bheap cmdliner core fmt iter memtrace menhirLib mtime.clock.os ocamlgraph oUnit parmap ppx_show.runtime pyml re sawja sedlex sqlite3 tdigest unix xmlm yojson zarith zip) diff --git a/infer/src/linking-flags.sexp b/infer/src/linking-flags.sexp index 5dc1d783091..b19290bbe43 100644 --- a/infer/src/linking-flags.sexp +++ b/infer/src/linking-flags.sexp @@ -9,7 +9,7 @@ ; 2. Check the dune logs in infer/_build/log. At the very end is the linking command, which ; contains linking directives starting with `-l`, e.g. ; -; '-lzarith' '-lgmp' '-lcamlzip' '-lz' '-lsqlite3_stubs' '-lsqlite3' '-lpthread' '-lparmap_stubs' '-lmtime_clock_stubs' '-lrt' '-lcamlstr' '-lfilename_unix_stubs' '-lsys_unix_stubs' '-lcore_unix_stubs' '-lspawn_stubs' '-lsignal_unix_stubs' '-lerror_checking_mutex_stubs' '-lthreadsnat' '-lpthread' '-lANSITerminal_stubs' '-lcore_stubs' '-lbase_bigstring_stubs' '-lexpect_test_collector_stubs' '-ltime_now_stubs' '-lbin_prot_stubs' '-lunix' '-lbase_stubs' '-lbase_internalhash_types_stubs' '/data/users/jul/opam/4.14.0+flambda/lib/ocaml/libasmrun.a' -lm -ldl +; '-lcamlstr' '-lzarith' '-lgmp' '-lcamlzip' '-lz' '-lsqlite3_stubs' '-lsqlite3' '-lparmap_stubs' '-lmtime_clock_stubs' '-lrt' '-lfilename_unix_stubs' '-lsys_unix_stubs' '-lcore_unix_stubs' '-lspawn_stubs' '-lsignal_unix_stubs' '-lerror_checking_mutex_stubs' '-lthreadsnat' '-lpthread' '-lANSITerminal_stubs' '-lpyml_stubs' '-lstdcompat_stubs' '-lcore_stubs' '-lheap_block_stubs' '-lbase_bigstring_stubs' '-lunix' '-lexpect_test_collector_stubs' '-ltime_now_stubs' '-lbin_prot_stubs' '-lbase_stubs' '-lbase_internalhash_types_stubs' '/home/nikosg/.opam/4.14.0+flambda/lib/ocaml/libasmrun.a' -lm ; ; 3. Copy those below as follows: Keep the flags the same until the dynamic section after ; `-cclib -Wl,-Bdynamic`. The flags already included are for static libraries; we want to keep @@ -33,7 +33,7 @@ -cclib -lmtime_clock_stubs -cclib -lrt -cclib -lcamlstr -cclib -lfilename_unix_stubs -cclib -lsys_unix_stubs -cclib -lcore_unix_stubs -cclib -lspawn_stubs -cclib -lsignal_unix_stubs -cclib -lerror_checking_mutex_stubs -cclib -lthreadsnat -cclib -lpthread - -cclib -lANSITerminal_stubs -cclib -lpyml_stubs -cclib -lstdcompat_stubs -cclib -lcore_stubs + -cclib -lANSITerminal_stubs -cclib -lpyml_stubs -cclib -lstdcompat_stubs -cclib -lcore_stubs -cclib -lheap_block_stubs -cclib -lbase_bigstring_stubs -cclib -lexpect_test_collector_stubs -cclib -ltime_now_stubs -cclib -lbin_prot_stubs -cclib -lunix -cclib -lbase_stubs -cclib -lbase_internalhash_types_stubs -cclib -lasmrun -cclib -lm -cclib -ldl diff --git a/opam/infer-tests.opam.locked b/opam/infer-tests.opam.locked index 244026d132e..ab8d6737dcc 100644 --- a/opam/infer-tests.opam.locked +++ b/opam/infer-tests.opam.locked @@ -9,56 +9,57 @@ homepage: "https://github.com/facebook/infer" bug-reports: "https://github.com/facebook/infer/issues" depends: [ "ANSITerminal" {= "0.8.5"} - "async" {= "v0.15.0"} - "async_kernel" {= "v0.15.0"} - "async_rpc_kernel" {= "v0.15.0"} - "async_unix" {= "v0.15.0"} + "async" {= "v0.16.0"} + "async_kernel" {= "v0.16.0"} + "async_rpc_kernel" {= "v0.16.0"} + "async_unix" {= "v0.16.0"} "atd" {= "2.15.0"} "atdgen" {= "2.15.0"} "atdgen-runtime" {= "2.15.0"} - "base" {= "v0.15.1"} + "base" {= "v0.16.3"} "base-bigarray" {= "base"} "base-bytes" {= "base"} "base-threads" {= "base"} "base-unix" {= "base"} "base64" {= "3.5.1"} - "base_bigstring" {= "v0.15.0"} - "base_quickcheck" {= "v0.15.0"} + "base_bigstring" {= "v0.16.0"} + "base_quickcheck" {= "v0.16.0"} "bheap" {= "2.0.0"} "bigarray-compat" {= "1.1.0"} - "bin_prot" {= "v0.15.0"} + "bin_prot" {= "v0.16.0"} "biniou" {= "1.2.2"} "camlp-streams" {= "5.0.1"} "camlzip" {= "1.12"} "cmdliner" {= "1.3.0"} "conf-autoconf" {= "0.2"} + "conf-bash" {= "1"} "conf-gmp" {= "4"} "conf-pkg-config" {= "3"} "conf-sqlite3" {= "1"} "conf-which" {= "1"} "conf-zlib" {= "1"} - "core" {= "v0.15.1"} - "core_kernel" {= "v0.15.0"} - "core_unix" {= "v0.15.2"} + "core" {= "v0.16.2"} + "core_kernel" {= "v0.16.0"} + "core_unix" {= "v0.16.0"} "cppo" {= "1.6.9"} "csexp" {= "1.5.2"} "ctypes" {= "0.23.0"} "dune" {= "3.16.0"} "dune-configurator" {= "3.16.0"} "easy-format" {= "1.3.4"} - "expect_test_helpers_core" {= "v0.15.0"} + "expect_test_helpers_core" {= "v0.16.0"} "extlib" {= "1.7.9"} - "fieldslib" {= "v0.15.0"} + "fieldslib" {= "v0.16.0"} "fmt" {= "0.9.0"} "gen" {= "1.1"} - "int_repr" {= "v0.15.0"} + "int_repr" {= "v0.16.0"} "integers" {= "0.7.0"} "iter" {= "1.8"} - "jane-street-headers" {= "v0.15.0"} + "jane-street-headers" {= "v0.16.0"} "javalib" {= "3.2.2"} "js_of_ocaml" {= "5.8.2"} "js_of_ocaml-compiler" {= "5.8.2"} - "jst-config" {= "v0.15.1"} + "jst-config" {= "v0.16.0"} "lambda-term" {= "3.3.2"} "logs" {= "0.7.0"} "lwt" {= "5.7.0"} @@ -77,7 +78,7 @@ depends: [ "ocaml-config" {= "2"} "ocaml-option-flambda" {= "1"} "ocaml-variants" {= "4.14.0+options"} - "ocaml_intrinsics" {= "v0.15.2"} + "ocaml_intrinsics" {= "v0.16.1"} "ocamlbuild" {= "0.15.0"} "ocamlfind" {= "1.9.6"} "ocamlgraph" {= "2.1.0"} @@ -86,46 +87,49 @@ depends: [ "ounit" {= "2.2.7"} "ounit2" {= "2.2.7"} "parmap" {= "1.2.5"} - "parsexp" {= "v0.15.0"} - "ppx_assert" {= "v0.15.0"} - "ppx_base" {= "v0.15.0"} - "ppx_bench" {= "v0.15.1"} - "ppx_bin_prot" {= "v0.15.0"} + "parsexp" {= "v0.16.0"} + "ppx_assert" {= "v0.16.0"} + "ppx_base" {= "v0.16.0"} + "ppx_bench" {= "v0.16.0"} + "ppx_bin_prot" {= "v0.16.0"} "ppx_blob" {= "0.9.0"} - "ppx_cold" {= "v0.15.0"} - "ppx_compare" {= "v0.15.0"} - "ppx_custom_printf" {= "v0.15.0"} + "ppx_cold" {= "v0.16.0"} + "ppx_compare" {= "v0.16.0"} + "ppx_custom_printf" {= "v0.16.0"} "ppx_derivers" {= "1.2.1"} "ppx_deriving" {= "6.0.2"} - "ppx_disable_unused_warnings" {= "v0.15.0"} - "ppx_enumerate" {= "v0.15.0"} - "ppx_expect" {= "v0.15.1"} - "ppx_fields_conv" {= "v0.15.0"} - "ppx_fixed_literal" {= "v0.15.0"} - "ppx_hash" {= "v0.15.0"} - "ppx_here" {= "v0.15.0"} - "ppx_ignore_instrumentation" {= "v0.15.0"} - "ppx_inline_test" {= "v0.15.1"} - "ppx_jane" {= "v0.15.0"} - "ppx_js_style" {= "v0.15.0"} - "ppx_let" {= "v0.15.0"} - "ppx_log" {= "v0.15.0"} - "ppx_module_timer" {= "v0.15.0"} - "ppx_optcomp" {= "v0.15.0"} - "ppx_optional" {= "v0.15.0"} - "ppx_pipebang" {= "v0.15.0"} - "ppx_sexp_conv" {= "v0.15.1"} - "ppx_sexp_message" {= "v0.15.0"} - "ppx_sexp_value" {= "v0.15.0"} + "ppx_disable_unused_warnings" {= "v0.16.0"} + "ppx_enumerate" {= "v0.16.0"} + "ppx_expect" {= "v0.16.0"} + "ppx_fields_conv" {= "v0.16.0"} + "ppx_fixed_literal" {= "v0.16.0"} + "ppx_globalize" {= "v0.16.0"} + "ppx_hash" {= "v0.16.0"} + "ppx_here" {= "v0.16.0"} + "ppx_ignore_instrumentation" {= "v0.16.0"} + "ppx_inline_test" {= "v0.16.1"} + "ppx_jane" {= "v0.16.0"} + "ppx_js_style" {= "v0.16.0"} + "ppx_let" {= "v0.16.0"} + "ppx_log" {= "v0.16.0"} + "ppx_module_timer" {= "v0.16.0"} + "ppx_optcomp" {= "v0.16.0"} + "ppx_optional" {= "v0.16.0"} + "ppx_pipebang" {= "v0.16.0"} + "ppx_sexp_conv" {= "v0.16.0"} + "ppx_sexp_message" {= "v0.16.0"} + "ppx_sexp_value" {= "v0.16.0"} "ppx_show" {= "0.2.1"} - "ppx_stable" {= "v0.15.0"} - "ppx_string" {= "v0.15.0"} - "ppx_typerep_conv" {= "v0.15.0"} - "ppx_variants_conv" {= "v0.15.0"} - "ppx_yojson_conv" {= "v0.15.1"} - "ppx_yojson_conv_lib" {= "v0.15.0"} + "ppx_stable" {= "v0.16.0"} + "ppx_stable_witness" {= "v0.16.0"} + "ppx_string" {= "v0.16.0"} + "ppx_tydi" {= "v0.16.0"} + "ppx_typerep_conv" {= "v0.16.0"} + "ppx_variants_conv" {= "v0.16.0"} + "ppx_yojson_conv" {= "v0.16.0"} + "ppx_yojson_conv_lib" {= "v0.16.0"} "ppxlib" {= "0.33.0"} - "protocol_version_header" {= "v0.15.0"} + "protocol_version_header" {= "v0.16.0"} "pyml" {= "20220905"} "re" {= "1.11.0"} "react" {= "1.2.2"} @@ -133,29 +137,29 @@ depends: [ "sawja" {= "1.5.12"} "sedlex" {= "3.2"} "seq" {= "base"} - "sexp_pretty" {= "v0.15.1"} - "sexplib" {= "v0.15.1"} - "sexplib0" {= "v0.15.1"} + "sexp_pretty" {= "v0.16.0"} + "sexplib" {= "v0.16.0"} + "sexplib0" {= "v0.16.0"} "spawn" {= "v0.15.1"} - "splittable_random" {= "v0.15.0"} + "splittable_random" {= "v0.16.0"} "sqlite3" {= "5.2.0"} "stdcompat" {= "19"} - "stdio" {= "v0.15.0"} + "stdio" {= "v0.16.0"} "stdlib-shims" {= "0.3.0"} "tdigest" {= "2.1.3"} - "textutils" {= "v0.15.0"} - "textutils_kernel" {= "v0.15.0"} - "time_now" {= "v0.15.0"} - "timezone" {= "v0.15.0"} + "textutils" {= "v0.16.0"} + "textutils_kernel" {= "v0.16.0"} + "time_now" {= "v0.16.0"} + "timezone" {= "v0.16.0"} "topkg" {= "1.0.7"} "trie" {= "1.0.0"} - "typerep" {= "v0.15.0"} + "typerep" {= "v0.16.0"} "uchar" {= "0.0.2"} "utop" {= "2.14.0"} "uucp" {= "15.1.0"} "uuseg" {= "15.1.0"} "uutf" {= "1.0.3"} - "variantslib" {= "v0.15.0"} + "variantslib" {= "v0.16.0"} "xdg" {= "3.16.0"} "xmlm" {= "1.4.0"} "yojson" {= "2.2.2"} diff --git a/opam/infer.opam b/opam/infer.opam index 05c69141fe7..32c73d85b0d 100644 --- a/opam/infer.opam +++ b/opam/infer.opam @@ -10,13 +10,13 @@ dev-repo: "git://github.com/facebook/infer.git" license: "MIT" depends: [ "ANSITerminal" {>="0.7"} - "async" {>= "v0.15.0" & < "v0.16"} + "async" {>= "v0.16.0" & < "v0.17"} "atdgen" {>="2.0.0"} "base64" {>="3.0.0"} "bheap" "cmdliner" {>="1.0.0"} - "core" {>= "v0.15.0" & < "v0.16"} - "core_unix" {>= "v0.15.0" & < "v0.16"} + "core" {>= "v0.16.1" & < "v0.17"} + "core_unix" {>= "v0.16.0" & < "v0.17"} "conf-autoconf" {build} "conf-sqlite3" {build} "conf-zlib" {build} @@ -34,13 +34,13 @@ depends: [ "ounit" {>="2.0.5"} "parmap" {>="1.0-rc8"} "ppx_blob" - "ppx_compare" {>= "v0.15.0" & < "v0.16"} + "ppx_compare" {>= "v0.16.0" & < "v0.17"} "ppx_deriving" {>="4.1"} - "ppx_enumerate" {>= "v0.15.0" & < "v0.16"} - "ppx_expect" {>= "v0.15.0" & < "v0.16"} - "ppx_fields_conv" {>= "v0.15.0" & < "v0.16"} + "ppx_enumerate" {>= "v0.16.0" & < "v0.17"} + "ppx_expect" {>= "v0.16.0" & < "v0.17"} + "ppx_fields_conv" {>= "v0.16.0" & < "v0.17"} "ppx_show" - "ppx_yojson_conv" {>= "v0.15.0" & < "v0.16"} + "ppx_yojson_conv" {>= "v0.16.0" & < "v0.17"} "pyml" {= "20220905"} "sawja" {>="1.5.11"} "sedlex" {>="3.0"} diff --git a/opam/infer.opam.locked b/opam/infer.opam.locked index 27cdef3144b..81bf2abbeb5 100644 --- a/opam/infer.opam.locked +++ b/opam/infer.opam.locked @@ -9,56 +9,57 @@ homepage: "https://github.com/facebook/infer" bug-reports: "https://github.com/facebook/infer/issues" depends: [ "ANSITerminal" {= "0.8.5"} - "async" {= "v0.15.0"} - "async_kernel" {= "v0.15.0"} - "async_rpc_kernel" {= "v0.15.0"} - "async_unix" {= "v0.15.0"} + "async" {= "v0.16.0"} + "async_kernel" {= "v0.16.0"} + "async_rpc_kernel" {= "v0.16.0"} + "async_unix" {= "v0.16.0"} "atd" {= "2.15.0"} "atdgen" {= "2.15.0"} "atdgen-runtime" {= "2.15.0"} - "base" {= "v0.15.1"} + "base" {= "v0.16.3"} "base-bigarray" {= "base"} "base-bytes" {= "base"} "base-threads" {= "base"} "base-unix" {= "base"} "base64" {= "3.5.1"} - "base_bigstring" {= "v0.15.0"} - "base_quickcheck" {= "v0.15.0"} + "base_bigstring" {= "v0.16.0"} + "base_quickcheck" {= "v0.16.0"} "bheap" {= "2.0.0"} "bigarray-compat" {= "1.1.0"} - "bin_prot" {= "v0.15.0"} + "bin_prot" {= "v0.16.0"} "biniou" {= "1.2.2"} "camlp-streams" {= "5.0.1"} "camlzip" {= "1.12"} "cmdliner" {= "1.3.0"} "conf-autoconf" {= "0.2"} + "conf-bash" {= "1"} "conf-gmp" {= "4"} "conf-pkg-config" {= "3"} "conf-sqlite3" {= "1"} "conf-which" {= "1"} "conf-zlib" {= "1"} - "core" {= "v0.15.1"} - "core_kernel" {= "v0.15.0"} - "core_unix" {= "v0.15.2"} + "core" {= "v0.16.2"} + "core_kernel" {= "v0.16.0"} + "core_unix" {= "v0.16.0"} "cppo" {= "1.6.9"} "csexp" {= "1.5.2"} "ctypes" {= "0.23.0"} "dune" {= "3.16.0"} "dune-configurator" {= "3.16.0"} "easy-format" {= "1.3.4"} - "expect_test_helpers_core" {= "v0.15.0"} + "expect_test_helpers_core" {= "v0.16.0"} "extlib" {= "1.7.9"} - "fieldslib" {= "v0.15.0"} + "fieldslib" {= "v0.16.0"} "fmt" {= "0.9.0"} "gen" {= "1.1"} - "int_repr" {= "v0.15.0"} + "int_repr" {= "v0.16.0"} "integers" {= "0.7.0"} "iter" {= "1.8"} - "jane-street-headers" {= "v0.15.0"} + "jane-street-headers" {= "v0.16.0"} "javalib" {= "3.2.2"} "js_of_ocaml" {= "5.8.2"} "js_of_ocaml-compiler" {= "5.8.2"} - "jst-config" {= "v0.15.1"} + "jst-config" {= "v0.16.0"} "lambda-term" {= "3.3.2"} "logs" {= "0.7.0"} "lwt" {= "5.7.0"} @@ -77,7 +78,7 @@ depends: [ "ocaml-config" {= "2"} "ocaml-option-flambda" {= "1"} "ocaml-variants" {= "4.14.0+options"} - "ocaml_intrinsics" {= "v0.15.2"} + "ocaml_intrinsics" {= "v0.16.1"} "ocamlbuild" {= "0.15.0"} "ocamlfind" {= "1.9.6"} "ocamlgraph" {= "2.1.0"} @@ -86,46 +87,49 @@ depends: [ "ounit" {= "2.2.7"} "ounit2" {= "2.2.7"} "parmap" {= "1.2.5"} - "parsexp" {= "v0.15.0"} - "ppx_assert" {= "v0.15.0"} - "ppx_base" {= "v0.15.0"} - "ppx_bench" {= "v0.15.1"} - "ppx_bin_prot" {= "v0.15.0"} + "parsexp" {= "v0.16.0"} + "ppx_assert" {= "v0.16.0"} + "ppx_base" {= "v0.16.0"} + "ppx_bench" {= "v0.16.0"} + "ppx_bin_prot" {= "v0.16.0"} "ppx_blob" {= "0.9.0"} - "ppx_cold" {= "v0.15.0"} - "ppx_compare" {= "v0.15.0"} - "ppx_custom_printf" {= "v0.15.0"} + "ppx_cold" {= "v0.16.0"} + "ppx_compare" {= "v0.16.0"} + "ppx_custom_printf" {= "v0.16.0"} "ppx_derivers" {= "1.2.1"} "ppx_deriving" {= "6.0.2"} - "ppx_disable_unused_warnings" {= "v0.15.0"} - "ppx_enumerate" {= "v0.15.0"} - "ppx_expect" {= "v0.15.1"} - "ppx_fields_conv" {= "v0.15.0"} - "ppx_fixed_literal" {= "v0.15.0"} - "ppx_hash" {= "v0.15.0"} - "ppx_here" {= "v0.15.0"} - "ppx_ignore_instrumentation" {= "v0.15.0"} - "ppx_inline_test" {= "v0.15.1"} - "ppx_jane" {= "v0.15.0"} - "ppx_js_style" {= "v0.15.0"} - "ppx_let" {= "v0.15.0"} - "ppx_log" {= "v0.15.0"} - "ppx_module_timer" {= "v0.15.0"} - "ppx_optcomp" {= "v0.15.0"} - "ppx_optional" {= "v0.15.0"} - "ppx_pipebang" {= "v0.15.0"} - "ppx_sexp_conv" {= "v0.15.1"} - "ppx_sexp_message" {= "v0.15.0"} - "ppx_sexp_value" {= "v0.15.0"} + "ppx_disable_unused_warnings" {= "v0.16.0"} + "ppx_enumerate" {= "v0.16.0"} + "ppx_expect" {= "v0.16.0"} + "ppx_fields_conv" {= "v0.16.0"} + "ppx_fixed_literal" {= "v0.16.0"} + "ppx_globalize" {= "v0.16.0"} + "ppx_hash" {= "v0.16.0"} + "ppx_here" {= "v0.16.0"} + "ppx_ignore_instrumentation" {= "v0.16.0"} + "ppx_inline_test" {= "v0.16.1"} + "ppx_jane" {= "v0.16.0"} + "ppx_js_style" {= "v0.16.0"} + "ppx_let" {= "v0.16.0"} + "ppx_log" {= "v0.16.0"} + "ppx_module_timer" {= "v0.16.0"} + "ppx_optcomp" {= "v0.16.0"} + "ppx_optional" {= "v0.16.0"} + "ppx_pipebang" {= "v0.16.0"} + "ppx_sexp_conv" {= "v0.16.0"} + "ppx_sexp_message" {= "v0.16.0"} + "ppx_sexp_value" {= "v0.16.0"} "ppx_show" {= "0.2.1"} - "ppx_stable" {= "v0.15.0"} - "ppx_string" {= "v0.15.0"} - "ppx_typerep_conv" {= "v0.15.0"} - "ppx_variants_conv" {= "v0.15.0"} - "ppx_yojson_conv" {= "v0.15.1"} - "ppx_yojson_conv_lib" {= "v0.15.0"} + "ppx_stable" {= "v0.16.0"} + "ppx_stable_witness" {= "v0.16.0"} + "ppx_string" {= "v0.16.0"} + "ppx_tydi" {= "v0.16.0"} + "ppx_typerep_conv" {= "v0.16.0"} + "ppx_variants_conv" {= "v0.16.0"} + "ppx_yojson_conv" {= "v0.16.0"} + "ppx_yojson_conv_lib" {= "v0.16.0"} "ppxlib" {= "0.33.0"} - "protocol_version_header" {= "v0.15.0"} + "protocol_version_header" {= "v0.16.0"} "pyml" {= "20220905"} "re" {= "1.11.0"} "react" {= "1.2.2"} @@ -133,29 +137,29 @@ depends: [ "sawja" {= "1.5.12"} "sedlex" {= "3.2"} "seq" {= "base"} - "sexp_pretty" {= "v0.15.1"} - "sexplib" {= "v0.15.1"} - "sexplib0" {= "v0.15.1"} + "sexp_pretty" {= "v0.16.0"} + "sexplib" {= "v0.16.0"} + "sexplib0" {= "v0.16.0"} "spawn" {= "v0.15.1"} - "splittable_random" {= "v0.15.0"} + "splittable_random" {= "v0.16.0"} "sqlite3" {= "5.2.0"} "stdcompat" {= "19"} - "stdio" {= "v0.15.0"} + "stdio" {= "v0.16.0"} "stdlib-shims" {= "0.3.0"} "tdigest" {= "2.1.3"} - "textutils" {= "v0.15.0"} - "textutils_kernel" {= "v0.15.0"} - "time_now" {= "v0.15.0"} - "timezone" {= "v0.15.0"} + "textutils" {= "v0.16.0"} + "textutils_kernel" {= "v0.16.0"} + "time_now" {= "v0.16.0"} + "timezone" {= "v0.16.0"} "topkg" {= "1.0.7"} "trie" {= "1.0.0"} - "typerep" {= "v0.15.0"} + "typerep" {= "v0.16.0"} "uchar" {= "0.0.2"} "utop" {= "2.14.0" & with-test} "uucp" {= "15.1.0"} "uuseg" {= "15.1.0"} "uutf" {= "1.0.3"} - "variantslib" {= "v0.15.0"} + "variantslib" {= "v0.16.0"} "xdg" {= "3.16.0"} "xmlm" {= "1.4.0"} "yojson" {= "2.2.2"} diff --git a/opam/ocamlformat.opam.locked b/opam/ocamlformat.opam.locked index 4e1116aab71..0690dfcf98c 100644 --- a/opam/ocamlformat.opam.locked +++ b/opam/ocamlformat.opam.locked @@ -14,22 +14,20 @@ homepage: "https://github.com/ocaml-ppx/ocamlformat" bug-reports: "https://github.com/ocaml-ppx/ocamlformat/issues" depends: [ "astring" {= "0.8.5"} - "base" {= "v0.15.1"} + "base" {= "v0.16.3"} "base-bigarray" {= "base"} "base-bytes" {= "base"} "base-threads" {= "base"} "base-unix" {= "base"} "camlp-streams" {= "5.0.1"} "cmdliner" {= "1.3.0"} - "cppo" {= "1.6.9" & with-doc} - "crunch" {= "3.3.1" & with-doc} + "conf-bash" {= "1"} "csexp" {= "1.5.2"} "dune" {= "3.16.0"} "dune-build-info" {= "3.14.2"} "dune-configurator" {= "3.16.0"} "either" {= "1.0.0"} "fix" {= "20230505"} - "fmt" {= "0.9.0" & with-doc} "fpath" {= "0.7.3"} "menhir" {= "20240715"} "menhirCST" {= "20240715"} @@ -44,16 +42,12 @@ depends: [ "ocamlfind" {= "1.9.6"} "ocamlformat-lib" {= "0.26.2"} "ocp-indent" {= "1.8.1"} - "odoc" {= "2.4.2" & with-doc} - "odoc-parser" {= "2.4.2" & with-doc} - "ptime" {= "1.1.0" & with-doc} "re" {= "1.11.0"} "result" {= "1.5"} "seq" {= "base"} - "sexplib0" {= "v0.15.1"} - "stdio" {= "v0.15.0"} + "sexplib0" {= "v0.16.0"} + "stdio" {= "v0.16.0"} "topkg" {= "1.0.7"} - "tyxml" {= "4.6.0" & with-doc} "uucp" {= "15.1.0"} "uuseg" {= "15.1.0"} "uutf" {= "1.0.3"}