From 83f8d8a85d6b9be36cca2134916ca02a040eeba2 Mon Sep 17 00:00:00 2001 From: Javier Chavarri Date: Wed, 14 Aug 2024 17:26:05 +0000 Subject: [PATCH] build passing --- dune-project | 2 +- melange-json.opam | 2 +- ppx/browser/dune | 4 ++-- ppx/native/dune | 4 ++-- ppx/test/ppx_deriving_json_browser.e2e.t | 2 +- ppx/test/ppx_deriving_json_native.e2e.t | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dune-project b/dune-project index 3fd6668..d750d4d 100644 --- a/dune-project +++ b/dune-project @@ -40,4 +40,4 @@ yojson ; only used for the native version (opam-check-npm-deps :with-test) ; todo: use with-dev-setup once opam 2.2 is out (ocaml-lsp-server :with-test) - (ocaml-format :with-test))) + (ocamlformat :with-test))) diff --git a/melange-json.opam b/melange-json.opam index 50d9322..f90c359 100644 --- a/melange-json.opam +++ b/melange-json.opam @@ -23,7 +23,7 @@ depends: [ "yojson" "opam-check-npm-deps" {with-test} "ocaml-lsp-server" {with-test} - "ocaml-format" {with-test} + "ocamlformat" {with-test} "odoc" {with-doc} ] build: [ diff --git a/ppx/browser/dune b/ppx/browser/dune index 96f7772..bcabed0 100644 --- a/ppx/browser/dune +++ b/ppx/browser/dune @@ -7,7 +7,7 @@ ppx_deriving_json_runtime ppx_deriving_json_browser_test) (libraries ppxlib containers) - (ppx_runtime_libraries ppx_deriving_json.browser_runtime) + (ppx_runtime_libraries melange-json.browser_runtime) (preprocess (pps ppxlib.metaquot)) (kind ppx_deriver)) @@ -22,7 +22,7 @@ (executable (name ppx_deriving_json_browser_test) (modules ppx_deriving_json_browser_test) - (libraries ppx_deriving_json.browser ppxlib)) + (libraries melange-json.browser ppxlib)) (rule (target ppx_deriving_json_browser.mli) diff --git a/ppx/native/dune b/ppx/native/dune index 4e41706..797cda5 100644 --- a/ppx/native/dune +++ b/ppx/native/dune @@ -7,7 +7,7 @@ ppx_deriving_json_runtime ppx_deriving_json_native_test) (libraries ppxlib containers) - (ppx_runtime_libraries ppx_deriving_json.native_runtime) + (ppx_runtime_libraries melange-json.native_runtime) (preprocess (pps ppxlib.metaquot)) (kind ppx_deriver)) @@ -22,7 +22,7 @@ (executable (name ppx_deriving_json_native_test) (modules ppx_deriving_json_native_test) - (libraries ppx_deriving_json.native ppxlib)) + (libraries melange-json.native ppxlib)) (rule (target ppx_deriving_json_native.mli) diff --git a/ppx/test/ppx_deriving_json_browser.e2e.t b/ppx/test/ppx_deriving_json_browser.e2e.t index 4b4264a..9fc0752 100644 --- a/ppx/test/ppx_deriving_json_browser.e2e.t +++ b/ppx/test/ppx_deriving_json_browser.e2e.t @@ -8,7 +8,7 @@ > (modes melange) > (modules example main) > (flags :standard -w -37-69 -open Ppx_deriving_json_runtime.Primitives) - > (preprocess (pps melange.ppx ppx_deriving_json.browser))) + > (preprocess (pps melange.ppx melange-json.browser))) > (melange.emit > (alias js) > (target output) diff --git a/ppx/test/ppx_deriving_json_native.e2e.t b/ppx/test/ppx_deriving_json_native.e2e.t index 217579a..29e1d44 100644 --- a/ppx/test/ppx_deriving_json_native.e2e.t +++ b/ppx/test/ppx_deriving_json_native.e2e.t @@ -5,7 +5,7 @@ > (name main) > (libraries yojson) > (flags :standard -w -37-69 -open Ppx_deriving_json_runtime.Primitives) - > (preprocess (pps ppx_deriving_json.native)))' > dune + > (preprocess (pps melange-json.native)))' > dune $ echo ' > open Example