diff --git a/dune-project b/dune-project index fd96d81..c14a037 100644 --- a/dune-project +++ b/dune-project @@ -18,16 +18,16 @@ (ocaml (>= 5.1.1)) (dune (>= 3.16.0)) - yocaml - yocaml_jingoo - yocaml_yaml - yocaml_omd - yocaml_eio - yocaml_syndication + (yocaml (>= 2.0.0)) + (yocaml_jingoo (>= 2.0.0)) + (yocaml_yaml (>= 2.0.0)) + (yocaml_omd (>= 2.0.0)) + (yocaml_eio (>= 2.0.0)) + (yocaml_syndication (>= 2.0.0)) (cmdliner (= 1.3.0)) - (ppx_expect :with-test) + ppx_expect (ocamlformat :with-dev-setup) (ocp-indent :with-dev-setup) diff --git a/lib/resolver.ml b/lib/resolver.ml index 78afeed..c9e64a6 100644 --- a/lib/resolver.ml +++ b/lib/resolver.ml @@ -45,4 +45,4 @@ module Make (R : Sigs.RESOLVABLE) = struct end let track_common_dependencies = Yocaml.Pipeline.track_files Source.common_deps -end +end \ No newline at end of file diff --git a/ring.opam b/ring.opam index 447289c..e0e9310 100644 --- a/ring.opam +++ b/ring.opam @@ -11,14 +11,14 @@ bug-reports: "https://github.com/muhokama/ring/issues" depends: [ "ocaml" {>= "5.1.1"} "dune" {>= "3.16" & >= "3.16.0"} - "yocaml" - "yocaml_jingoo" - "yocaml_yaml" - "yocaml_omd" - "yocaml_eio" - "yocaml_syndication" + "yocaml" {>= "2.0.0"} + "yocaml_jingoo" {>= "2.0.0"} + "yocaml_yaml" {>= "2.0.0"} + "yocaml_omd" {>= "2.0.0"} + "yocaml_eio" {>= "2.0.0"} + "yocaml_syndication" {>= "2.0.0"} "cmdliner" {= "1.3.0"} - "ppx_expect" {with-test} + "ppx_expect" "ocamlformat" {with-dev-setup} "ocp-indent" {with-dev-setup} "merlin" {with-dev-setup} @@ -42,12 +42,3 @@ build: [ ] ] dev-repo: "git+https://github.com/muhokama/ring.git" -pin-depends: [ - ["yocaml.dev" "git+https://gitlab.com/funkywork/yocaml.git"] - ["yocaml_runtime.dev" "git+https://gitlab.com/funkywork/yocaml.git"] - ["yocaml_jingoo.dev" "git+https://gitlab.com/funkywork/yocaml.git"] - ["yocaml_yaml.dev" "git+https://gitlab.com/funkywork/yocaml.git"] - ["yocaml_omd.dev" "git+https://gitlab.com/funkywork/yocaml.git"] - ["yocaml_eio.dev" "git+https://gitlab.com/funkywork/yocaml.git"] - ["yocaml_syndication.dev" "git+https://gitlab.com/funkywork/yocaml.git"] -] diff --git a/ring.opam.template b/ring.opam.template deleted file mode 100644 index e435fc2..0000000 --- a/ring.opam.template +++ /dev/null @@ -1,9 +0,0 @@ -pin-depends: [ - ["yocaml.dev" "git+https://gitlab.com/funkywork/yocaml.git"] - ["yocaml_runtime.dev" "git+https://gitlab.com/funkywork/yocaml.git"] - ["yocaml_jingoo.dev" "git+https://gitlab.com/funkywork/yocaml.git"] - ["yocaml_yaml.dev" "git+https://gitlab.com/funkywork/yocaml.git"] - ["yocaml_omd.dev" "git+https://gitlab.com/funkywork/yocaml.git"] - ["yocaml_eio.dev" "git+https://gitlab.com/funkywork/yocaml.git"] - ["yocaml_syndication.dev" "git+https://gitlab.com/funkywork/yocaml.git"] -]