Skip to content

Commit 20b1997

Browse files
authored
Build with OCaml 5 (#271)
1 parent fcb7494 commit 20b1997

82 files changed

Lines changed: 1497 additions & 1288 deletions

File tree

Some content is hidden

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

cli.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"@opam/re": "*",
2323
"@reason-native/pastel": "*",
2424
"@opam/reason": ">= 3.6.0",
25-
"ocaml": "^4.2.0"
25+
"ocaml": "^4.2.0 || ^5.0.0"
2626
},
2727
"devDependencies": {
2828
"@opam/merlin": "*"

cli.opam

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ depends: [
1313
"re"
1414
"pastel"
1515
"reason" {< "4.0.0"}
16-
"ocaml" {>= "4.2.0" & < "5.0.0"}
16+
"ocaml" {>= "4.2.0"}
1717
]
1818
synopsis: "Build Command Line Interfaces in Reason"
1919
description: "Build Command Line Interfaces in Reason"

console.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,9 @@
1919
"dependencies": {
2020
"@opam/dune": "*",
2121
"@opam/reason": ">= 3.6.0",
22-
"ocaml": "^4.2.0"
22+
"ocaml": "^4.2.0 || ^5.0.0"
2323
},
2424
"devDependencies": {
25-
"@opam/merlin": "*",
26-
"ocaml": "~4.12.0"
25+
"@opam/merlin": "*"
2726
}
2827
}

console.opam

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ build: [ ["dune" "build" "-p" "console" ] ]
1111
depends: [
1212
"dune"
1313
"reason" {< "4.0.0"}
14-
"ocaml" {>= "4.2.0" & < "5.0.0"}
14+
"ocaml" {>= "4.2.0"}
1515
]
1616
synopsis: "No effort, universal logger"
1717
description: "No effort, universal logger"

dir.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,11 @@
2929
"@reason-native/fp": "*",
3030
"@opam/dune": "*",
3131
"@opam/reason": ">= 3.6.0",
32-
"ocaml": "^4.2.0"
32+
"ocaml": "^4.2.0 || ^5.0.0"
3333
},
3434
"devDependencies": {
3535
"@reason-native/fp": "./fp.json",
3636
"@opam/merlin": "*",
37-
"ocaml": "~4.6.0",
3837
"@reason-native/rely": "./rely.json"
3938
},
4039
"resolutions": {

dir.opam

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ depends: [
1212
"fp" {>= "0.0.0" & <= "1.0.0"}
1313
"dune"
1414
"reason" {< "4.0.0"}
15-
"ocaml" {>= "4.2.0" & < "5.0.0"}
15+
"ocaml" {>= "4.2.0"}
1616
]
1717
synopsis: "Reason native system directories"
1818
description: "Reason native system directories"

esy.json

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,22 +44,19 @@
4444
"test-ci": "esy x bash -cx ./scripts/test-ci.cmd",
4545
"doc": "esy refmterr dune build --profile=release @doc"
4646
},
47-
"dependencies": {
47+
"devDependencies": {
48+
"ocaml": "~5.1.0",
4849
"refmterr": "*",
4950
"@opam/re": "*",
5051
"@opam/atdgen": "*",
5152
"@opam/junit": "*",
52-
"@opam/qcheck-core": "0.9",
53+
"@opam/qcheck-core": "0.21.3",
5354
"@opam/merlin": "*",
54-
"ocaml": "~4.6.4",
55-
"@opam/dune": "2.8.4",
56-
"@opam/reason": "3.8.0",
55+
"@opam/dune": "3.15.2",
56+
"@opam/reason": "3.11.0",
5757
"@opam/sexplib0": "*",
5858
"@opam/odoc": "*"
5959
},
60-
"devDependencies": {
61-
"ocaml": "~4.12.0"
62-
},
6360
"resolutions": {
6461
"refmterr": "./refmterr.json",
6562
"@reason-native/pastel": "./pastel.json",

0 commit comments

Comments
 (0)