From 9075af7002105f48859e13458c7998e34358dbfc Mon Sep 17 00:00:00 2001 From: Tim McGilchrist Date: Mon, 30 Oct 2023 14:19:04 +1100 Subject: [PATCH] fixup! 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 | 4 ---- 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 deletions(-) diff --git a/aws-autoscaling.opam b/aws-autoscaling.opam index 603ce1d1c..3bb0bad30 100644 --- a/aws-autoscaling.opam +++ b/aws-autoscaling.opam @@ -23,11 +23,7 @@ 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 75edb31ff..c84fb2784 100644 --- a/aws-cloudformation.opam +++ b/aws-cloudformation.opam @@ -23,11 +23,7 @@ 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 a077afa09..235320dcc 100644 --- a/aws-cloudtrail.opam +++ b/aws-cloudtrail.opam @@ -23,11 +23,7 @@ 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 71d4d7e61..ced078119 100644 --- a/aws-cloudwatch.opam +++ b/aws-cloudwatch.opam @@ -23,11 +23,7 @@ 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 dfc1ff9c0..0b55eba62 100644 --- a/aws-ec2.opam +++ b/aws-ec2.opam @@ -23,11 +23,7 @@ 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 b632d5c75..f56779e01 100644 --- a/aws-elasticache.opam +++ b/aws-elasticache.opam @@ -23,11 +23,7 @@ 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 ec31817d7..0ae5a024f 100644 --- a/aws-elasticloadbalancing.opam +++ b/aws-elasticloadbalancing.opam @@ -23,11 +23,7 @@ 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 d549a8447..6864d6cf1 100644 --- a/aws-gen.opam +++ b/aws-gen.opam @@ -19,10 +19,6 @@ depends: [ "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 1edcb4d42..1b5fb83e8 100644 --- a/aws-kms.opam +++ b/aws-kms.opam @@ -23,11 +23,7 @@ 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 27502637e..6b1ab818d 100644 --- a/aws-rds.opam +++ b/aws-rds.opam @@ -23,11 +23,7 @@ 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 190d28060..1ddabe78d 100644 --- a/aws-route53.opam +++ b/aws-route53.opam @@ -23,11 +23,7 @@ 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 8e47fe5b8..47318313a 100644 --- a/aws-sdb.opam +++ b/aws-sdb.opam @@ -23,11 +23,7 @@ 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 e289aaaa1..b0fe96008 100644 --- a/aws-sqs.opam +++ b/aws-sqs.opam @@ -23,11 +23,7 @@ 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 25f678089..1da336b28 100644 --- a/aws-ssm.opam +++ b/aws-ssm.opam @@ -23,11 +23,7 @@ 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 4dd0f9987..f31f6a2c4 100644 --- a/aws-sts.opam +++ b/aws-sts.opam @@ -23,11 +23,7 @@ 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}