Move OpamSWHID and its dependency towards the swhid_core library from opam-core to opam-format

opam-core.opam

@@ -29,7 +29,6 @@ depends: [
   "dune" {>= "2.8.0"}
   "sha" {>= "1.13"}
   "jsonm"
-  "swhid_core"
   "uutf"
   (("host-system-mingw" {os = "win32" & os-distribution != "cygwinports"} &
     "conf-mingw-w64-gcc-i686" {os = "win32" & os-distribution != "cygwinports"} &

opam-format.opam

@@ -32,5 +32,6 @@ depends: [
   "opam-core" {= version}
   "opam-file-format" {>= "2.1.4"}
   "re" {>= "1.9.0"}
+  "swhid_core" {>= "0.1"}
   "dune" {>= "2.8.0"}
 ]

src/core/dune

@@ -3,7 +3,7 @@
   (public_name opam-core)
   (synopsis    "OCaml Package Manager core internal stdlib")
   ; TODO: Remove (re_export ...) when CI uses the OCaml version that includes https://github.com/ocaml/ocaml/pull/11989
-  (libraries   re (re_export ocamlgraph) unix sha jsonm swhid_core uutf)
+  (libraries   re (re_export ocamlgraph) unix sha jsonm uutf)
   (flags       (:standard
                (:include ../ocaml-flags-standard.sexp)
                (:include ../ocaml-flags-configure.sexp)

src/format/dune

@@ -3,7 +3,7 @@
   (public_name opam-format)
   (synopsis    "OCaml Package Manager file format handling library")
   ; TODO: Remove (re_export ...) when CI uses the OCaml version that includes https://github.com/ocaml/ocaml/pull/11989
-  (libraries   (re_export opam-core) (re_export opam-file-format) re)
+  (libraries   (re_export opam-core) (re_export opam-file-format) re swhid_core)
   (modules_without_implementation OpamTypes)
   (flags       (:standard
                (:include ../ocaml-flags-standard.sexp)