Skip to content

Commit ccc3472

Browse files
authored
Reason is now compatible with OCaml 4.13 (#2660)
1 parent 19bb40f commit ccc3472

9 files changed

+19
-19
lines changed

Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ release: release_check pre_release
7878
git commit -m "Version $(version)"
7979
git tag -a $(version) -m "Version $(version)."
8080
# Push first the objects, then the tag.
81-
git push "[email protected]:facebook/Reason.git"
82-
git push "[email protected]:facebook/Reason.git" tag $(version)
81+
git push "[email protected]:reasonml/reason.git"
82+
git push "[email protected]:reasonml/reason.git" tag $(version)
8383
git clean -fdx
8484
./scripts/opam-release.sh
8585

esy.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"license": "MIT",
55
"version": "3.7.0",
66
"dependencies": {
7-
"ocaml": " >= 4.2.0 < 4.13.0",
7+
"ocaml": " >= 4.2.0 < 4.14.0",
88
"@opam/fix": "*",
99
"@opam/ocamlfind": "*",
1010
"@opam/menhir": " >= 20170418.0.0",

miscTests/rtopIntegrationTest.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/sh
2-
# Context: https://github.com/facebook/reason/pull/674
2+
# Context: https://github.com/reasonml/reason/pull/674
33

44
# We can't directly call `rtop -stdin` because it circumvents what we're trying to
55
# test. See rtop.sh for the reason. We want to make sure utop's reason

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"description": "Simple, fast & type safe code that leverages the JavaScript & OCaml ecosystems",
55
"repository": {
66
"type": "git",
7-
"url": "https://github.com/facebook/reason.git"
7+
"url": "https://github.com/reasonml/reason.git"
88
},
99
"main": "refmt.js",
1010
"keywords": [
@@ -15,7 +15,7 @@
1515
"won't you look at all these nice types"
1616
],
1717
"license": "MIT",
18-
"homepage": "https://github.com/facebook/reason",
18+
"homepage": "https://github.com/reasonml/reason",
1919
"dependencies": {},
2020
"devDependencies": {
2121
"bs-platform": "1.9.3"

reason.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"description": "Native Compiler Support for Reason: Simple, fast & type safe code that leverages the JavaScript & OCaml ecosystems",
66
"repository": {
77
"type": "git",
8-
"url": "https://github.com/facebook/reason.git"
8+
"url": "https://github.com/reasonml/reason.git"
99
},
1010
"dependencies": {
1111
"ocaml": " >= 4.2.0 < 4.13.0",

reason.opam

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@ opam-version: "2.0"
22
maintainer: "Jordan Walke <[email protected]>"
33
authors: [ "Jordan Walke <[email protected]>" ]
44
license: "MIT"
5-
homepage: "https://github.com/facebook/reason"
5+
homepage: "https://github.com/reasonml/reason"
66
doc: "http://reasonml.github.io/"
7-
bug-reports: "https://github.com/facebook/reason/issues"
8-
dev-repo: "git://github.com/facebook/reason.git"
7+
bug-reports: "https://github.com/reasonml/reason/issues"
8+
dev-repo: "git://github.com/reasonml/reason.git"
99
tags: [ "syntax" ]
1010
build: [
1111
["dune" "build" "-p" name "-j" jobs]
1212
["dune" "runtest" "-p" name "-j" jobs] {with-test}
1313
]
1414
depends: [
15-
"ocaml" {>= "4.03" & < "4.13"}
15+
"ocaml" {>= "4.03" & < "4.14"}
1616
"dune" {>= "1.4"}
1717
"ocamlfind" {build}
1818
"menhir" {>= "20170418"}

rtop.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"license": "MIT",
55
"repository": {
66
"type": "git",
7-
"url": "https://github.com/facebook/reason.git"
7+
"url": "https://github.com/reasonml/reason.git"
88
},
99
"dependencies": {
1010
"@esy-ocaml/substs": "^0.0.1",
@@ -13,7 +13,7 @@
1313
"@opam/dune": "*",
1414
"@esy-ocaml/reason": "^3.2.0",
1515
"@opam/utop": " >= 1.17.0",
16-
"ocaml": ">= 4.2.0 < 4.12.0"
16+
"ocaml": ">= 4.2.0 < 4.14.0"
1717
},
1818
"devDependencies": {
1919
"@opam/merlin": "*",

rtop.opam

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@ opam-version: "2.0"
22
maintainer: "Jordan Walke <[email protected]>"
33
authors: [ "Jordan Walke <[email protected]>" ]
44
license: "MIT"
5-
homepage: "https://github.com/facebook/reason"
5+
homepage: "https://github.com/reasonml/reason"
66
doc: "http://reasonml.github.io/"
7-
bug-reports: "https://github.com/facebook/reason/issues"
8-
dev-repo: "git://github.com/facebook/reason.git"
7+
bug-reports: "https://github.com/reasonml/reason/issues"
8+
dev-repo: "git://github.com/reasonml/reason.git"
99
tags: [ "syntax" ]
1010
build: [
1111
["dune" "build" "-p" name "-j" jobs]
1212
["dune" "runtest" "-p" name "-j" jobs] {with-test}
1313
]
1414
depends: [
15-
"ocaml" {>= "4.02" & < "4.13"}
15+
"ocaml" {>= "4.02" & < "4.14"}
1616
"dune" {>= "1.4"}
1717
"reason"
1818
"utop" {>= "1.17"}

scripts/opam-release.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ RELEASE_ID=$(\
1212
curl --silent -H 'Accept: application/vnd.github.v3+json' \
1313
--user "${USERNAME}:${TOKEN}" \
1414
-X POST --data "{\"tag_name\": \"${version}\"}" \
15-
https://api.github.com/repos/facebook/reason/releases \
15+
https://api.github.com/repos/reasonml/reason/releases \
1616
| python -c 'import sys, json; print json.load(sys.stdin)["id"]' \
1717
)
1818

@@ -22,7 +22,7 @@ echo "The build artifacts are now in _build. To continue, please cd there."
2222
echo
2323

2424
echo "In order to publish reason, execute the following two commands:"
25-
echo " 1) opam-publish prepare https://github.com/facebook/reason/archive/${version}.tar.gz"
25+
echo " 1) opam-publish prepare https://github.com/reasonml/reason/archive/${version}.tar.gz"
2626
echo " 2) opam-publish submit reason.${version}"
2727
echo "The former will prepare a directory in your local folder and the latter"
2828
echo "will submit a pull request to the opam repository."

0 commit comments

Comments
 (0)