Skip to content

Commit

Permalink
Put upper bound of 2.0.0 for Ocaml migrate parsetree.
Browse files Browse the repository at this point in the history
This is a more complete version of [this PR](#2621)

Questions:
I think that this won't be enough to fix package installs because we might need
to deprecated the old version of Reason packages, or at least edit the esy opam
overrides repo to make sure earlier versions of Reason don't get solved
assuming it is compatible with omp 2.0.0
  • Loading branch information
jordwalke committed Aug 16, 2020
1 parent 659e1d5 commit cd06d0e
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions esy.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "reason-cli",
"notes": "This is just the dev package config (also built as globally installable reason-cli). See ./refmt.json ./rtop.json for individual release package configs.",
"license": "MIT",
"version": "3.6.0",
"version": "3.6.1",
"dependencies": {
"ocaml": " >= 4.2.0 < 4.11.0",
"@opam/fix": "*",
Expand All @@ -11,7 +11,7 @@
"@opam/utop": " >= 1.17.0 < 2.5.0",
"@opam/merlin-extend": " >= 0.6",
"@opam/result": "*",
"@opam/ocaml-migrate-parsetree": "*",
"@opam/ocaml-migrate-parsetree": " < 2.0.0",
"@opam/dune": "< 2.0.0"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "reason",
"version": "3.6.0",
"version": "3.6.1",
"description": "Simple, fast & type safe code that leverages the JavaScript & OCaml ecosystems",
"repository": {
"type": "git",
Expand Down
4 changes: 2 additions & 2 deletions reason.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@esy-ocaml/reason",
"version": "3.6.0",
"version": "3.6.1",
"license": "MIT",
"description": "Native Compiler Support for Reason: Simple, fast & type safe code that leverages the JavaScript & OCaml ecosystems",
"repository": {
Expand All @@ -14,7 +14,7 @@
"@opam/menhir": " >= 20170418.0.0",
"@opam/merlin-extend": " >= 0.3",
"@opam/result": "*",
"@opam/ocaml-migrate-parsetree": "*",
"@opam/ocaml-migrate-parsetree": " < 2.0.0",
"@opam/dune": "*"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion reason.opam
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ depends: [
"merlin-extend" {>= "0.6"}
"fix"
"result"
"ocaml-migrate-parsetree"
"ocaml-migrate-parsetree" {< "2.0.0"}
]
synopsis: "Reason: Syntax & Toolchain for OCaml"
description: """
Expand Down
2 changes: 1 addition & 1 deletion src/refmt/package.ml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@

let version = "3.6.0"
let version = "3.6.1"
let git_version = "59339f6fde0ea2cd4822d32bb99a7ec5b6865e3a"
let git_short_version = "59339f6"

0 comments on commit cd06d0e

Please sign in to comment.