Merge pull request ocaml#28097 from mseri/jsonrpc

mseri · web-flow · commit bc5382643d1e · 2025-06-27T11:00:13.000+02:00
jsonrpc is not compatible with yojson &lt; 3.0.0
diff --git a/packages/jsonrpc/jsonrpc.1.15.1-5.0/opam b/packages/jsonrpc/jsonrpc.1.15.1-5.0/opam
@@ -22,6 +22,7 @@ depends: [
   "ocaml" {>= "4.08"}
   "odoc" {with-doc}
 ]
+conflicts: [ "yojson" {>= "3.0.0"} ]
 dev-repo: "git+https://github.com/ocaml/ocaml-lsp.git"
 build: [
   ["dune" "subst"] {dev}
diff --git a/packages/jsonrpc/jsonrpc.1.17.0/opam b/packages/jsonrpc/jsonrpc.1.17.0/opam
@@ -22,6 +22,7 @@ depends: [
   "ocaml" {>= "4.08"}
   "odoc" {with-doc}
 ]
+conflicts: [ "yojson" {>= "3.0.0"} ]
 dev-repo: "git+https://github.com/ocaml/ocaml-lsp.git"
 build: [
   ["dune" "subst"] {dev}
diff --git a/packages/jsonrpc/jsonrpc.1.18.0/opam b/packages/jsonrpc/jsonrpc.1.18.0/opam
@@ -22,6 +22,7 @@ depends: [
   "ocaml" {>= "4.08"}
   "odoc" {with-doc}
 ]
+conflicts: [ "yojson" {>= "3.0.0"} ]
 dev-repo: "git+https://github.com/ocaml/ocaml-lsp.git"
 build: [
   ["dune" "subst"] {dev}
diff --git a/packages/jsonrpc/jsonrpc.1.20.1/opam b/packages/jsonrpc/jsonrpc.1.20.1/opam
@@ -22,6 +22,7 @@ depends: [
   "ocaml" {>= "4.08"}
   "odoc" {with-doc}
 ]
+conflicts: [ "yojson" {>= "3.0.0"} ]
 dev-repo: "git+https://github.com/ocaml/ocaml-lsp.git"
 build: [
   ["dune" "subst"] {dev}
diff --git a/packages/jsonrpc/jsonrpc.1.21.0-4.14/opam b/packages/jsonrpc/jsonrpc.1.21.0-4.14/opam
@@ -22,6 +22,7 @@ depends: [
   "ocaml" {>= "4.08"}
   "odoc" {with-doc}
 ]
+conflicts: [ "yojson" {>= "3.0.0"} ]
 dev-repo: "git+https://github.com/ocaml/ocaml-lsp.git"
 build: [
   ["dune" "subst"] {dev}
diff --git a/packages/jsonrpc/jsonrpc.1.21.0/opam b/packages/jsonrpc/jsonrpc.1.21.0/opam
@@ -22,6 +22,7 @@ depends: [
   "ocaml" {>= "4.08"}
   "odoc" {with-doc}
 ]
+conflicts: [ "yojson" {>= "3.0.0"} ]
 dev-repo: "git+https://github.com/ocaml/ocaml-lsp.git"
 build: [
   ["dune" "subst"] {dev}
diff --git a/packages/jsonrpc/jsonrpc.1.22.0/opam b/packages/jsonrpc/jsonrpc.1.22.0/opam
@@ -22,6 +22,7 @@ depends: [
   "ocaml" {>= "4.08"}
   "odoc" {with-doc}
 ]
+conflicts: [ "yojson" {>= "3.0.0"} ]
 dev-repo: "git+https://github.com/ocaml/ocaml-lsp.git"
 build: [
   ["dune" "subst"] {dev}
diff --git a/packages/jsonrpc/jsonrpc.1.23.0/opam b/packages/jsonrpc/jsonrpc.1.23.0/opam
@@ -22,6 +22,7 @@ depends: [
   "ocaml" {>= "4.08"}
   "odoc" {with-doc}
 ]
+conflicts: [ "yojson" {>= "3.0.0"} ]
 dev-repo: "git+https://github.com/ocaml/ocaml-lsp.git"
 build: [
   ["dune" "subst"] {dev}
diff --git a/packages/jsonrpc/jsonrpc.1.4.1/opam b/packages/jsonrpc/jsonrpc.1.4.1/opam
@@ -16,7 +16,7 @@ homepage: "https://github.com/ocaml/ocaml-lsp"
 bug-reports: "https://github.com/ocaml/ocaml-lsp/issues"
 depends: [
   "dune" {>= "2.5"}
-  "yojson"
+  "yojson" {< "3.0.0"}
   "stdlib-shims"
   "ocaml-syntax-shims"
   "ppx_yojson_conv_lib"
diff --git a/packages/jsonrpc/jsonrpc.1.5.0/opam b/packages/jsonrpc/jsonrpc.1.5.0/opam
@@ -16,7 +16,7 @@ homepage: "https://github.com/ocaml/ocaml-lsp"
 bug-reports: "https://github.com/ocaml/ocaml-lsp/issues"
 depends: [
   "dune" {>= "2.5"}
-  "yojson"
+  "yojson" {< "3.0.0"}
   "stdlib-shims"
   "ocaml-syntax-shims"
   "ppx_yojson_conv_lib"
diff --git a/packages/jsonrpc/jsonrpc.1.6.0/opam b/packages/jsonrpc/jsonrpc.1.6.0/opam
@@ -19,6 +19,7 @@ depends: [
   "ocaml" {>= "4.08"}
   "odoc" {with-doc}
 ]
+conflicts: [ "yojson" {>= "3.0.0"} ]
 dev-repo: "git+https://github.com/ocaml/ocaml-lsp.git"
 build: [
   ["dune" "subst"] {dev}

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ depends: [`
`22`	`22`	`"ocaml" {>= "4.08"}`
`23`	`23`	`"odoc" {with-doc}`
`24`	`24`	`]`
	`25`	`+conflicts: [ "yojson" {>= "3.0.0"} ]`
`25`	`26`	`dev-repo: "git+https://github.com/ocaml/ocaml-lsp.git"`
`26`	`27`	`build: [`
`27`	`28`	`["dune" "subst"] {dev}`