Chores: update metadata and address deprecations

.github/workflows/test.yml

@@ -35,8 +35,8 @@ jobs:
     - name: Install OCaml dependencies
       run: opam install -t . --deps-only
     - name: Build and test independently
-      run: opam install -t rpclib rpclib-js rpclib-html rpclib-lwt rpclib-async ppx_deriving_rpc
-    - name: Run Rpc Tests
-      run: opam exec -- dune runtest -p rpc
+      run: opam install -t rpclib rpclib-js rpclib-html rpclib-lwt rpclib-async
+    - name: Run Rpc and Ppx_deriving_rpc Tests
+      run: opam exec -- dune runtest -p ppx_deriving_rpc
     - name: Build and run Examples
-      run: opam exec -- dune build @runexamples -p rpc
+      run: opam exec -- dune build @runexamples -p ppx_deriving_rpc

CHANGES.md

@@ -1,3 +1,6 @@
+## unreleased
+* Removed deprecated rpc virutal package
+
 ## 9.0.0 (June 2022)
 * Breaking: change Cmdlinergen to use non-deprecated types (psafont #172)
 

example/dune

@@ -23,22 +23,22 @@
  (alias runexamples)
  (deps
   (:e example.exe))
- (package rpc)
+ (package ppx_deriving_rpc)
  (action
   (run %{e})))
 
 (rule
  (alias runexamples)
  (deps
   (:e example2.exe))
- (package rpc)
+ (package ppx_deriving_rpc)
  (action
   (run %{e})))
 
 (rule
  (alias runexamples)
  (deps
   (:e example3_client.exe))
- (package rpc)
+ (package ppx_deriving_rpc)
  (action
   (run %{e})))

ppx_deriving_rpc.opam

@@ -1,7 +1,7 @@
 opam-version: "2.0"
 synopsis: "Ppx deriver for ocaml-rpc, a library to deal with RPCs in OCaml"
-maintainer: "thomas@gazagnaire.org"
-authors: "Thomas Gazagnaire, Jon Ludlam"
+maintainer: "Marcello Seri"
+authors: ["Thomas Gazagnaire" "Jon Ludlam"]
 tags: ["org:mirage" "org:xapi-project"]
 homepage: "https://github.com/mirage/ocaml-rpc"
 doc: "https://mirage.github.io/ocaml-rpc/ppx_deriving_rpc"

rpclib-async.opam

@@ -1,7 +1,7 @@
 opam-version: "2.0"
 synopsis: "A library to deal with RPCs in OCaml - Async interface"
-maintainer: "thomas@gazagnaire.org"
-authors: "Thomas Gazagnaire, Jon Ludlam"
+maintainer: "Marcello Seri"
+authors: ["Thomas Gazagnaire" "Jon Ludlam"]
 tags: ["org:mirage" "org:xapi-project"]
 homepage: "https://github.com/mirage/ocaml-rpc"
 doc: "https://mirage.github.io/ocaml-rpc/rpclib-async"

rpclib-html.opam

@@ -1,8 +1,8 @@
 opam-version: "2.0"
 synopsis:
   "A library to deal with RPCs in OCaml - html documentation generator"
-maintainer: "thomas@gazagnaire.org"
-authors: "Thomas Gazagnaire, Jon Ludlam"
+maintainer: "Marcello Seri"
+authors: ["Thomas Gazagnaire" "Jon Ludlam"]
 tags: ["org:mirage" "org:xapi-project"]
 homepage: "https://github.com/mirage/ocaml-rpc"
 doc: "https://mirage.github.io/ocaml-rpc/rpclib-html"

rpclib-js.opam

@@ -1,7 +1,7 @@
 opam-version: "2.0"
 synopsis: "A library to deal with RPCs in OCaml - Bindings for js_of_ocaml"
-maintainer: "thomas@gazagnaire.org"
-authors: "Thomas Gazagnaire, Jon Ludlam"
+maintainer: "Marcello Seri"
+authors: ["Thomas Gazagnaire" "Jon Ludlam"]
 tags: ["org:mirage" "org:xapi-project"]
 homepage: "https://github.com/mirage/ocaml-rpc"
 doc: "https://mirage.github.io/ocaml-rpc/rpclib-js"

rpclib-lwt.opam

@@ -1,7 +1,7 @@
 opam-version: "2.0"
 synopsis: "A library to deal with RPCs in OCaml - Lwt interface"
-maintainer: "thomas@gazagnaire.org"
-authors: "Thomas Gazagnaire, Jon Ludlam"
+maintainer: "Marcello Seri"
+authors: ["Thomas Gazagnaire" "Jon Ludlam"]
 tags: ["org:mirage" "org:xapi-project"]
 homepage: "https://github.com/mirage/ocaml-rpc"
 doc: "https://mirage.github.io/ocaml-rpc/rpclib-lwt"

rpclib.opam

@@ -1,7 +1,7 @@
 opam-version: "2.0"
 synopsis: "A library to deal with RPCs in OCaml"
-maintainer: "thomas@gazagnaire.org"
-authors: "Thomas Gazagnaire, Jon Ludlam"
+maintainer: "Marcello Seri"
+authors: ["Thomas Gazagnaire" "Jon Ludlam"]
 tags: ["org:mirage" "org:xapi-project"]
 homepage: "https://github.com/mirage/ocaml-rpc"
 doc: "https://mirage.github.io/ocaml-rpc/rpclib"

src/js/rpc_client_js_helper.ml

@@ -5,7 +5,7 @@
 let keys obj =
   let arr =
     Js_of_ocaml.Js.Unsafe.meth_call
-      (Js_of_ocaml.Js.Unsafe.variable "Object")
+      (Js_of_ocaml.Js.Unsafe.pure_js_expr "Object")
       "keys"
       [| Js_of_ocaml.Js.Unsafe.inject obj |]
   in
@@ -16,15 +16,15 @@ let keys obj =
 let is_array obj =
   let str =
     Js_of_ocaml.Js.Unsafe.call
-      (Js_of_ocaml.Js.Unsafe.variable "Object.prototype.toString")
+      (Js_of_ocaml.Js.Unsafe.pure_js_expr "Object.prototype.toString")
       obj
       [||]
   in
   Js_of_ocaml.Js.to_string str = "[object Array]"
 
 
 (* Magic to find out whether something is one of the Js_of_ocaml Javascript string types *)
-let mlString_constr = Js_of_ocaml.Js.Unsafe.variable "MlString"
+let mlString_constr = Js_of_ocaml.Js.Unsafe.pure_js_expr "MlString"
 let is_string obj = Js_of_ocaml.Js.instanceof obj mlString_constr
 
 (* Seems to work. I hope there's a better way of doing this! *)

tests/rpc/dune

@@ -22,7 +22,7 @@
 
 (rule
  (alias runtest)
- (package rpc)
+ (package ppx_deriving_rpc)
  (deps
   (:s suite.exe)
   (source_tree .))