Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reason is now compatible with OCaml 4.13 #2660

Merged
merged 1 commit into from
Oct 14, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ release: release_check pre_release
git commit -m "Version $(version)"
git tag -a $(version) -m "Version $(version)."
# Push first the objects, then the tag.
git push "[email protected]:facebook/Reason.git"
git push "[email protected]:facebook/Reason.git" tag $(version)
git push "[email protected]:reasonml/reason.git"
git push "[email protected]:reasonml/reason.git" tag $(version)
git clean -fdx
./scripts/opam-release.sh

Expand Down
2 changes: 1 addition & 1 deletion esy.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"license": "MIT",
"version": "3.7.0",
"dependencies": {
"ocaml": " >= 4.2.0 < 4.13.0",
"ocaml": " >= 4.2.0 < 4.14.0",
"@opam/fix": "*",
"@opam/ocamlfind": "*",
"@opam/menhir": " >= 20170418.0.0",
Expand Down
2 changes: 1 addition & 1 deletion miscTests/rtopIntegrationTest.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/sh
# Context: https://github.com/facebook/reason/pull/674
# Context: https://github.com/reasonml/reason/pull/674

# We can't directly call `rtop -stdin` because it circumvents what we're trying to
# test. See rtop.sh for the reason. We want to make sure utop's reason
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "Simple, fast & type safe code that leverages the JavaScript & OCaml ecosystems",
"repository": {
"type": "git",
"url": "https://github.com/facebook/reason.git"
"url": "https://github.com/reasonml/reason.git"
},
"main": "refmt.js",
"keywords": [
Expand All @@ -15,7 +15,7 @@
"won't you look at all these nice types"
],
"license": "MIT",
"homepage": "https://github.com/facebook/reason",
"homepage": "https://github.com/reasonml/reason",
"dependencies": {},
"devDependencies": {
"bs-platform": "1.9.3"
Expand Down
2 changes: 1 addition & 1 deletion reason.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"description": "Native Compiler Support for Reason: Simple, fast & type safe code that leverages the JavaScript & OCaml ecosystems",
"repository": {
"type": "git",
"url": "https://github.com/facebook/reason.git"
"url": "https://github.com/reasonml/reason.git"
},
"dependencies": {
"ocaml": " >= 4.2.0 < 4.13.0",
Expand Down
8 changes: 4 additions & 4 deletions reason.opam
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@ opam-version: "2.0"
maintainer: "Jordan Walke <[email protected]>"
authors: [ "Jordan Walke <[email protected]>" ]
license: "MIT"
homepage: "https://github.com/facebook/reason"
homepage: "https://github.com/reasonml/reason"
doc: "http://reasonml.github.io/"
bug-reports: "https://github.com/facebook/reason/issues"
dev-repo: "git://github.com/facebook/reason.git"
bug-reports: "https://github.com/reasonml/reason/issues"
dev-repo: "git://github.com/reasonml/reason.git"
tags: [ "syntax" ]
build: [
["dune" "build" "-p" name "-j" jobs]
["dune" "runtest" "-p" name "-j" jobs] {with-test}
]
depends: [
"ocaml" {>= "4.03" & < "4.13"}
"ocaml" {>= "4.03" & < "4.14"}
"dune" {>= "1.4"}
"ocamlfind" {build}
"menhir" {>= "20170418"}
Expand Down
4 changes: 2 additions & 2 deletions rtop.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"license": "MIT",
"repository": {
"type": "git",
"url": "https://github.com/facebook/reason.git"
"url": "https://github.com/reasonml/reason.git"
},
"dependencies": {
"@esy-ocaml/substs": "^0.0.1",
Expand All @@ -13,7 +13,7 @@
"@opam/dune": "*",
"@esy-ocaml/reason": "^3.2.0",
"@opam/utop": " >= 1.17.0",
"ocaml": ">= 4.2.0 < 4.12.0"
"ocaml": ">= 4.2.0 < 4.14.0"
},
"devDependencies": {
"@opam/merlin": "*",
Expand Down
8 changes: 4 additions & 4 deletions rtop.opam
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@ opam-version: "2.0"
maintainer: "Jordan Walke <[email protected]>"
authors: [ "Jordan Walke <[email protected]>" ]
license: "MIT"
homepage: "https://github.com/facebook/reason"
homepage: "https://github.com/reasonml/reason"
doc: "http://reasonml.github.io/"
bug-reports: "https://github.com/facebook/reason/issues"
dev-repo: "git://github.com/facebook/reason.git"
bug-reports: "https://github.com/reasonml/reason/issues"
dev-repo: "git://github.com/reasonml/reason.git"
tags: [ "syntax" ]
build: [
["dune" "build" "-p" name "-j" jobs]
["dune" "runtest" "-p" name "-j" jobs] {with-test}
]
depends: [
"ocaml" {>= "4.02" & < "4.13"}
"ocaml" {>= "4.02" & < "4.14"}
"dune" {>= "1.4"}
"reason"
"utop" {>= "1.17"}
Expand Down
4 changes: 2 additions & 2 deletions scripts/opam-release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ RELEASE_ID=$(\
curl --silent -H 'Accept: application/vnd.github.v3+json' \
--user "${USERNAME}:${TOKEN}" \
-X POST --data "{\"tag_name\": \"${version}\"}" \
https://api.github.com/repos/facebook/reason/releases \
https://api.github.com/repos/reasonml/reason/releases \
| python -c 'import sys, json; print json.load(sys.stdin)["id"]' \
)

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

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