Use ppxlib.0.36 in tests

.github/workflows/build-wasm_of_ocaml.yml

@@ -106,6 +106,7 @@ jobs:
         run: |
           opam repo add js janestreet/opam-repository
           opam install opam-format
+          opam pin add ppxlib -n 0.35.0
           opam exec -- dune exec --root wasm_of_ocaml tools/ci_setup.exe
 
       - name: Pin Jane Street packages

dune-project

@@ -21,7 +21,7 @@
   (ocaml (and (>= 4.13) (< 5.4)))
   (num :with-test)
   (ppx_expect (and (>= v0.16.1) :with-test))
-  (ppxlib (>= 0.15))
+  (ppxlib (>= 0.35))
   (re :with-test)
   (cmdliner (>= 1.1.0))
   (sedlex (>= 3.3))
@@ -49,7 +49,6 @@
   (lwt (>= 2.4.4))
   (num :with-test)
   (ppx_expect (and (>= v0.14.2) :with-test))
-  (ppxlib (and (>= 0.22.0) :with-test))
   (re (and (>= 1.9.0) :with-test)))
  (depopts
   graphics
@@ -64,7 +63,7 @@
  (depends
   (ocaml (>= 4.13))
   (js_of_ocaml (= :version))
-  (ppxlib (>= 0.15))
+  (ppxlib (>= 0.35))
   (num :with-test)
   (ppx_expect (and (>= v0.14.2) :with-test))
   (re (and (>= 1.9.0) :with-test))
@@ -78,8 +77,7 @@
  (depends
   (ocaml (>= 4.13))
   (js_of_ocaml (= :version))
-  (ppxlib (>= 0.15))
-  (ppxlib (and (< 0.36) :with-test))
+  (ppxlib (>= 0.35))
   (num :with-test)
   (ppx_expect (and (>= v0.14.2) :with-test))
   (re (and (>= 1.9.0) :with-test))
@@ -98,7 +96,7 @@
   (graphics :with-test)
   (num :with-test)
   (ppx_expect (and (>= v0.14.2) :with-test))
-  (ppxlib (>= 0.15))
+  (ppxlib (>= 0.35))
   (re (and (>= 1.9.0) :with-test))
 ))
 
@@ -116,7 +114,6 @@
   (tyxml (>= 4.6))
   (num :with-test)
   (ppx_expect (and (>= v0.14.2) :with-test))
-  (ppxlib (and (>= 0.22.0) :with-test))
   (re (and (>= 1.9.0) :with-test))
 ))
 
@@ -128,9 +125,9 @@
  (depends
   (ocaml (>= 4.13))
   (js_of_ocaml-compiler (= :version))
-  (ppxlib (>= 0.15))
   (num :with-test)
   (ppx_expect (and (>= v0.14.2) :with-test))
+  (ppxlib (>= 0.35))
   (re (and (>= 1.9.0) :with-test))
 ))
 
@@ -144,7 +141,7 @@
   (js_of_ocaml (= :version))
   (num :with-test)
   (ppx_expect (and (>= v0.14.2) :with-test))
-  (ppxlib (>= 0.15))
+  (ppxlib (>= 0.35))
   (re :with-test)
   (cmdliner (>= 1.1.0))
   (opam-format :with-test)

js_of_ocaml-compiler.opam

@@ -16,7 +16,7 @@ depends: [
   "ocaml" {>= "4.13" & < "5.4"}
   "num" {with-test}
   "ppx_expect" {>= "v0.16.1" & with-test}
-  "ppxlib" {>= "0.15"}
+  "ppxlib" {>= "0.35"}
   "re" {with-test}
   "cmdliner" {>= "1.1.0"}
   "sedlex" {>= "3.3"}

js_of_ocaml-lwt.opam

@@ -19,7 +19,6 @@ depends: [
   "lwt" {>= "2.4.4"}
   "num" {with-test}
   "ppx_expect" {>= "v0.14.2" & with-test}
-  "ppxlib" {>= "0.22.0" & with-test}
   "re" {>= "1.9.0" & with-test}
   "odoc" {with-doc}
 ]

js_of_ocaml-ppx.opam

@@ -15,8 +15,7 @@ depends: [
   "dune" {>= "3.19"}
   "ocaml" {>= "4.13"}
   "js_of_ocaml" {= version}
-  "ppxlib" {>= "0.15"}
-  "ppxlib" {< "0.36" & with-test}
+  "ppxlib" {>= "0.35"}
   "num" {with-test}
   "ppx_expect" {>= "v0.14.2" & with-test}
   "re" {>= "1.9.0" & with-test}

js_of_ocaml-ppx_deriving_json.opam

@@ -15,7 +15,7 @@ depends: [
   "dune" {>= "3.19"}
   "ocaml" {>= "4.13"}
   "js_of_ocaml" {= version}
-  "ppxlib" {>= "0.15"}
+  "ppxlib" {>= "0.35"}
   "num" {with-test}
   "ppx_expect" {>= "v0.14.2" & with-test}
   "re" {>= "1.9.0" & with-test}

js_of_ocaml-toplevel.opam

@@ -19,7 +19,7 @@ depends: [
   "graphics" {with-test}
   "num" {with-test}
   "ppx_expect" {>= "v0.14.2" & with-test}
-  "ppxlib" {>= "0.15"}
+  "ppxlib" {>= "0.35"}
   "re" {>= "1.9.0" & with-test}
   "odoc" {with-doc}
 ]

js_of_ocaml-tyxml.opam

@@ -21,7 +21,6 @@ depends: [
   "tyxml" {>= "4.6"}
   "num" {with-test}
   "ppx_expect" {>= "v0.14.2" & with-test}
-  "ppxlib" {>= "0.22.0" & with-test}
   "re" {>= "1.9.0" & with-test}
   "odoc" {with-doc}
 ]

js_of_ocaml.opam

@@ -15,9 +15,9 @@ depends: [
   "dune" {>= "3.19"}
   "ocaml" {>= "4.13"}
   "js_of_ocaml-compiler" {= version}
-  "ppxlib" {>= "0.15"}
   "num" {with-test}
   "ppx_expect" {>= "v0.14.2" & with-test}
+  "ppxlib" {>= "0.35"}
   "re" {>= "1.9.0" & with-test}
   "odoc" {with-doc}
 ]

ppx/ppx_deriving_json/lib/ppx_deriving_json.ml

@@ -174,7 +174,12 @@ let poly_fun_of_type_decl type_decl expr =
   fold_right_type_decl
     (fun name expr ->
       let name = name.txt in
-      Exp.fun_ nolabel None (pvar ("poly_" ^ name)) expr)
+      Ppxlib.Ast_builder.Default.pexp_fun
+        ~loc:Location.none
+        nolabel
+        None
+        (pvar ("poly_" ^ name))
+        expr)
     type_decl
     expr
 

ppx/ppx_deriving_json/tests/dune

@@ -35,7 +35,7 @@
 (rule
  (alias runtest)
  (enabled_if
-  (>= %{ocaml_version} 5.2))
+  (>= %{ocaml_version} 5.3))
  ;; (package js_of_ocaml-ppx)
  (action
   (diff gen.mlt gen.mlt.corrected)))