From a3a7568cc1e5bc7bd24d897001d65f49b2f73c1a Mon Sep 17 00:00:00 2001 From: Tim McGilchrist Date: Wed, 5 Jul 2023 16:21:40 +1000 Subject: [PATCH] Add lower bound on yojson 2.0 --- aws-autoscaling.opam | 4 ++++ aws-cloudformation.opam | 4 ++++ aws-cloudtrail.opam | 4 ++++ aws-cloudwatch.opam | 4 ++++ aws-ec2.opam | 4 ++++ aws-elasticache.opam | 4 ++++ aws-elasticloadbalancing.opam | 4 ++++ aws-gen.opam | 5 ++++- aws-kms.opam | 4 ++++ aws-rds.opam | 4 ++++ aws-route53.opam | 4 ++++ aws-sdb.opam | 4 ++++ aws-sqs.opam | 4 ++++ aws-ssm.opam | 4 ++++ aws-sts.opam | 4 ++++ 15 files changed, 60 insertions(+), 1 deletion(-) diff --git a/aws-autoscaling.opam b/aws-autoscaling.opam index f9857a1b7..603ce1d1c 100644 --- a/aws-autoscaling.opam +++ b/aws-autoscaling.opam @@ -23,7 +23,11 @@ depends: [ "cohttp-lwt" {with-test & >= "2.4.0"} "cohttp-lwt-unix" {with-test & >= "2.4.0"} "lwt" {with-test & >= "4.0.0"} +<<<<<<< HEAD "yojson" {with-test & >= "1.7.0"} +======= + "yojson" {with-test & >= "2.0"} +>>>>>>> 15b920809 (Add lower bound on yojson 2.0) ] build: [ ["dune" "subst"] {pinned} diff --git a/aws-cloudformation.opam b/aws-cloudformation.opam index a90bd1f2a..75edb31ff 100644 --- a/aws-cloudformation.opam +++ b/aws-cloudformation.opam @@ -23,7 +23,11 @@ depends: [ "cohttp-lwt" {with-test & >= "2.4.0"} "cohttp-lwt-unix" {with-test & >= "2.4.0"} "lwt" {with-test & >= "4.0.0"} +<<<<<<< HEAD "yojson" {with-test & >= "1.7.0"} +======= + "yojson" {with-test & >= "2.0"} +>>>>>>> 15b920809 (Add lower bound on yojson 2.0) ] build: [ ["dune" "subst"] {pinned} diff --git a/aws-cloudtrail.opam b/aws-cloudtrail.opam index f8cb809a4..a077afa09 100644 --- a/aws-cloudtrail.opam +++ b/aws-cloudtrail.opam @@ -23,7 +23,11 @@ depends: [ "cohttp-lwt" {with-test & >= "2.4.0"} "cohttp-lwt-unix" {with-test & >= "2.4.0"} "lwt" {with-test & >= "4.0.0"} +<<<<<<< HEAD "yojson" {with-test & >= "1.7.0"} +======= + "yojson" {with-test & >= "2.0"} +>>>>>>> 15b920809 (Add lower bound on yojson 2.0) ] build: [ ["dune" "subst"] {pinned} diff --git a/aws-cloudwatch.opam b/aws-cloudwatch.opam index fe1ef7900..71d4d7e61 100644 --- a/aws-cloudwatch.opam +++ b/aws-cloudwatch.opam @@ -23,7 +23,11 @@ depends: [ "cohttp-lwt" {with-test & >= "2.4.0"} "cohttp-lwt-unix" {with-test & >= "2.4.0"} "lwt" {with-test & >= "4.0.0"} +<<<<<<< HEAD "yojson" {with-test & >= "1.7.0"} +======= + "yojson" {with-test & >= "2.0"} +>>>>>>> 15b920809 (Add lower bound on yojson 2.0) ] build: [ ["dune" "subst"] {pinned} diff --git a/aws-ec2.opam b/aws-ec2.opam index f26d96152..dfc1ff9c0 100644 --- a/aws-ec2.opam +++ b/aws-ec2.opam @@ -23,7 +23,11 @@ depends: [ "cohttp-lwt" {with-test & >= "2.4.0"} "cohttp-lwt-unix" {with-test & >= "2.4.0"} "lwt" {with-test & >= "4.0.0"} +<<<<<<< HEAD "yojson" {with-test & >= "1.7.0"} +======= + "yojson" {with-test & >= "2.0"} +>>>>>>> 15b920809 (Add lower bound on yojson 2.0) ] build: [ ["dune" "subst"] {pinned} diff --git a/aws-elasticache.opam b/aws-elasticache.opam index bf8d45fea..b632d5c75 100644 --- a/aws-elasticache.opam +++ b/aws-elasticache.opam @@ -23,7 +23,11 @@ depends: [ "cohttp-lwt" {with-test & >= "2.4.0"} "cohttp-lwt-unix" {with-test & >= "2.4.0"} "lwt" {with-test & >= "4.0.0"} +<<<<<<< HEAD "yojson" {with-test & >= "1.7.0"} +======= + "yojson" {with-test & >= "2.0"} +>>>>>>> 15b920809 (Add lower bound on yojson 2.0) ] build: [ ["dune" "subst"] {pinned} diff --git a/aws-elasticloadbalancing.opam b/aws-elasticloadbalancing.opam index acdc844d4..ec31817d7 100644 --- a/aws-elasticloadbalancing.opam +++ b/aws-elasticloadbalancing.opam @@ -23,7 +23,11 @@ depends: [ "cohttp-lwt" {with-test & >= "2.4.0"} "cohttp-lwt-unix" {with-test & >= "2.4.0"} "lwt" {with-test & >= "4.0.0"} +<<<<<<< HEAD "yojson" {with-test & >= "1.7.0"} +======= + "yojson" {with-test & >= "2.0"} +>>>>>>> 15b920809 (Add lower bound on yojson 2.0) ] build: [ ["dune" "subst"] {pinned} diff --git a/aws-gen.opam b/aws-gen.opam index 405a646e9..d549a8447 100644 --- a/aws-gen.opam +++ b/aws-gen.opam @@ -15,11 +15,14 @@ dev-repo: "git+https://github.com/inhabitedtype/ocaml-aws.git" depends: [ "ocaml" {>= "4.08"} "atdgen" {>= "2.10"} - "yojson" + "yojson" {>= "2.0"} "base-unix" "cmdliner" {>= "1.1.0"} "fmt" +<<<<<<< HEAD "yojson" {>= "1.6.0"} +======= +>>>>>>> 15b920809 (Add lower bound on yojson 2.0) "ocaml-compiler-libs" {>= "0.11.0" } "ocamlgraph" "dune" {>= "2.7"} diff --git a/aws-kms.opam b/aws-kms.opam index a5bd04e1b..1edcb4d42 100644 --- a/aws-kms.opam +++ b/aws-kms.opam @@ -23,7 +23,11 @@ depends: [ "cohttp-lwt" {with-test & >= "2.4.0"} "cohttp-lwt-unix" {with-test & >= "2.4.0"} "lwt" {with-test & >= "4.0.0"} +<<<<<<< HEAD "yojson" {with-test & >= "1.7.0"} +======= + "yojson" {with-test & "2.0"} +>>>>>>> 15b920809 (Add lower bound on yojson 2.0) ] build: [ ["dune" "subst"] {pinned} diff --git a/aws-rds.opam b/aws-rds.opam index 3054fb226..27502637e 100644 --- a/aws-rds.opam +++ b/aws-rds.opam @@ -23,7 +23,11 @@ depends: [ "cohttp-lwt" {with-test & >= "2.4.0"} "cohttp-lwt-unix" {with-test & >= "2.4.0"} "lwt" {with-test & >= "4.0.0"} +<<<<<<< HEAD "yojson" {with-test & >= "1.7.0"} +======= + "yojson" {with-test & >= "2.0"} +>>>>>>> 15b920809 (Add lower bound on yojson 2.0) ] build: [ ["dune" "subst"] {pinned} diff --git a/aws-route53.opam b/aws-route53.opam index 9d9a536ee..190d28060 100644 --- a/aws-route53.opam +++ b/aws-route53.opam @@ -23,7 +23,11 @@ depends: [ "cohttp-lwt" {with-test & >= "2.4.0"} "cohttp-lwt-unix" {with-test & >= "2.4.0"} "lwt" {with-test & >= "4.0.0"} +<<<<<<< HEAD "yojson" {with-test & >= "1.7.0"} +======= + "yojson" {with-test & "2.0"} +>>>>>>> 15b920809 (Add lower bound on yojson 2.0) ] build: [ ["dune" "subst"] {pinned} diff --git a/aws-sdb.opam b/aws-sdb.opam index 0eb4e16a0..8e47fe5b8 100644 --- a/aws-sdb.opam +++ b/aws-sdb.opam @@ -23,7 +23,11 @@ depends: [ "cohttp-lwt" {with-test & >= "2.4.0"} "cohttp-lwt-unix" {with-test & >= "2.4.0"} "lwt" {with-test & >= "4.0.0"} +<<<<<<< HEAD "yojson" {with-test & >= "1.7.0"} +======= + "yojson" {with-test & >= "2.0"} +>>>>>>> 15b920809 (Add lower bound on yojson 2.0) ] build: [ ["dune" "subst"] {pinned} diff --git a/aws-sqs.opam b/aws-sqs.opam index 62180fdc9..e289aaaa1 100644 --- a/aws-sqs.opam +++ b/aws-sqs.opam @@ -23,7 +23,11 @@ depends: [ "cohttp-lwt" {with-test & >= "2.4.0"} "cohttp-lwt-unix" {with-test & >= "2.4.0"} "lwt" {with-test & >= "4.0.0"} +<<<<<<< HEAD "yojson" {with-test & >= "1.7.0"} +======= + "yojson" {with-test & >= "2.0"} +>>>>>>> 15b920809 (Add lower bound on yojson 2.0) ] build: [ ["dune" "subst"] {pinned} diff --git a/aws-ssm.opam b/aws-ssm.opam index 41d66ca07..25f678089 100644 --- a/aws-ssm.opam +++ b/aws-ssm.opam @@ -23,7 +23,11 @@ depends: [ "cohttp-lwt" {with-test & >= "2.4.0"} "cohttp-lwt-unix" {with-test & >= "2.4.0"} "lwt" {with-test & >= "4.0.0"} +<<<<<<< HEAD "yojson" {with-test & >= "1.7.0"} +======= + "yojson" {with-test & >= "2.0"} +>>>>>>> 15b920809 (Add lower bound on yojson 2.0) ] build: [ ["dune" "subst"] {pinned} diff --git a/aws-sts.opam b/aws-sts.opam index c0c1b3557..4dd0f9987 100644 --- a/aws-sts.opam +++ b/aws-sts.opam @@ -23,7 +23,11 @@ depends: [ "cohttp-lwt" {with-test & >= "2.4.0"} "cohttp-lwt-unix" {with-test & >= "2.4.0"} "lwt" {with-test & >= "4.0.0"} +<<<<<<< HEAD "yojson" {with-test & >= "1.7.0"} +======= + "yojson" {with-test & >= "2.0"} +>>>>>>> 15b920809 (Add lower bound on yojson 2.0) ] build: [ ["dune" "subst"] {pinned}