Skip to content

Commit 241a7ac

Browse files
Add support to OCaml 4.14 (#2662)
* copy 412<>413 migrations * remove gencopy, fails on 4.14 * add support to 4.14 on Reason * fix Warnings.Bad_docstring * another fix * fix a syntax error under 4.03 * run on ubuntu 20.04 in azure * use Locations.extension_of_error * another syntax fix for 4.03 * more fixes * oops * one more fix i guess * update esy lockfiles Co-authored-by: Antonio Nuno Monteiro <[email protected]>
1 parent ccc3472 commit 241a7ac

File tree

65 files changed

+8511
-2059
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+8511
-2059
lines changed

azure-pipelines.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ stages:
3535
- template: .ci/build-platform.yml
3636
parameters:
3737
platform: Linux
38-
vmImage: ubuntu-16.04
38+
vmImage: ubuntu-20.04
3939

4040
- template: .ci/build-platform.yml
4141
parameters:

esy.json

+3-5
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,19 @@
22
"name": "reason-cli",
33
"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.",
44
"license": "MIT",
5-
"version": "3.7.0",
5+
"version": "3.7.1",
66
"dependencies": {
7-
"ocaml": " >= 4.2.0 < 4.14.0",
7+
"ocaml": " >= 4.2.0 < 4.15.0",
88
"@opam/fix": "*",
99
"@opam/ocamlfind": "*",
1010
"@opam/menhir": " >= 20170418.0.0",
1111
"@opam/utop": " >= 1.17.0",
1212
"@opam/merlin-extend": " >= 0.6",
1313
"@opam/result": "*",
14-
"@opam/dune": "*",
14+
"@opam/dune": "2.9.3",
1515
"@opam/ppx_derivers": "< 2.0.0"
1616
},
1717
"devDependencies": {
18-
"@opam/merlin": "*",
19-
"@opam/ocaml-lsp-server": "*",
2018
"@opam/odoc": "*",
2119
"ocaml": "~4.12.0"
2220
},

esy.lock/index.json

+327-520
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

esy.lock/opam/bigarray-compat.1.1.0/opam

+26
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

esy.lock/opam/biniou.1.2.1/opam

-45
This file was deleted.

esy.lock/opam/charInfo_width.1.1.0/opam

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

esy.lock/opam/cmdliner.1.0.4/opam esy.lock/opam/cmdliner.1.1.0/opam

+17-20
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

esy.lock/opam/cppo.1.6.7/opam esy.lock/opam/cppo.1.6.8/opam

+3-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

esy.lock/opam/dot-merlin-reader.4.1/opam

-30
This file was deleted.

esy.lock/opam/dune-build-info.2.9.0/opam

-42
This file was deleted.

esy.lock/opam/dune-configurator.2.9.0/opam esy.lock/opam/dune-configurator.2.9.3/opam

+5-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

esy.lock/opam/dune.2.9.0/opam esy.lock/opam/dune.2.9.3/opam

+5-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

esy.lock/opam/easy-format.1.3.2/opam

-46
This file was deleted.

esy.lock/opam/fix.20201120/opam esy.lock/opam/fix.20220121/opam

+7-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)