Fix dependency challenges with 4.x

Author: andersfugmann

.github/workflows/workflow.yml

@@ -63,9 +63,9 @@ jobs:
       - name: Test (${{ matrix.package }})
         if: startsWith(matrix.ocaml-compiler, '5')
         run: |
-          opam_files="./ppx_protocol_conv.opam"
+          dune_packages="${{ matrix.package }}"
           if [ "${{ matrix.package }}" != "ppx_protocol_conv" ]; then
-            opam_files="$opam_files ./${{ matrix.package }}.opam"
+            dune_packages="ppx_protocol_conv,${{ matrix.package }}"
           fi
-          opam install $opam_files --deps-only --with-test
-          opam exec -- dune runtest -p ${{ matrix.package }}
+          opam install ./*.opam --deps-only --with-test
+          opam exec -- dune runtest -p "$dune_packages"

drivers/json/dune

@@ -1,8 +1,16 @@
 (library
  (name protocol_conv_json)
  (public_name ppx_protocol_conv_json)
- (private_modules test_expect)
+ (modules (:standard \ test_expect))
  (libraries ppx_protocol_conv.runtime ppx_protocol_conv.driver yojson)
  (synopsis "yojson (de)serialization driver for ppx_protocol_conv")
+ (preprocess (pps ppx_protocol_conv))
+)
+
+(library
+ (name protocol_conv_json_inline_tests)
+ (modules test_expect)
+ (libraries ppx_protocol_conv_json ppx_protocol_conv.driver)
  (preprocess (pps ppx_protocol_conv ppx_expect))
+ (inline_tests)
 )

drivers/json/test_expect.ml

@@ -1,5 +1,5 @@
 module Default_parameters = Ppx_protocol_driver.Default_parameters
-module Make = Json.Make
+module Make = Protocol_conv_json.Json.Make
 
 (** Test parameters. *)
 module Test = struct
@@ -182,7 +182,7 @@ module Test = struct
   end
 
   module Yojson_test = struct
-    module Json = Json.Yojson
+    module Json = Protocol_conv_json.Json.Yojson
     type 'a v = A of int | B of { int: int; t: 'a } | C [@name "C-D"]
     and t = {
       int : int [@default 5];

dune-project

@@ -31,8 +31,7 @@
   (ocaml (>= 4.08))
   (ppx_protocol_conv (= :version))
   (yojson (>= 1.6.0))
-  ppx_expect
-  ppx_inline_test
+  (ppx_expect :with-test)
   (ppx_sexp_conv :with-test)
   (sexplib :with-test)
   (alcotest :with-test)))

ppx_protocol_conv_json.opam

@@ -13,8 +13,7 @@ depends: [
   "ocaml" {>= "4.08"}
   "ppx_protocol_conv" {= version}
   "yojson" {>= "1.6.0"}
-  "ppx_expect"
-  "ppx_inline_test"
+  "ppx_expect" {with-test}
   "ppx_sexp_conv" {with-test}
   "sexplib" {with-test}
   "alcotest" {with-test}