From 2860cc274b1b5b76a71d0e5190bf67a133d6f809 Mon Sep 17 00:00:00 2001
From: Patrick Stapfer <ryyppy@users.noreply.github.com>
Date: Mon, 27 Jan 2020 16:42:48 +0100
Subject: [PATCH] Prepare 3.6.0 (#2536)

* Update HISTORY

* Bump esy.json, package.json, reason.json

* Bump package.ml
---
 HISTORY.md           | 9 +++++++++
 esy.json             | 2 +-
 package.json         | 2 +-
 reason.json          | 2 +-
 src/refmt/package.ml | 6 +++---
 5 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/HISTORY.md b/HISTORY.md
index 13282d78b..d5ac31a95 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,3 +1,12 @@
+## 3.6.0
+
+Minor:
+- External syntax: make the `external ... = ""` part optional (@romanschejbal)[#2464](https://github.com/facebook/reason/pull/2464)
+  - `external myFn: (string) => unit` is now equivalent to `external myFn: (string) => "myFn"`
+
+Fixes:
+- Fixes issues where `method` and similar keywords will be transformed to `method_` (@cristianoc) [#2530](https://github.com/facebook/reason/pull/2530)
+
 ## 3.5.4
 
 Fixes:
diff --git a/esy.json b/esy.json
index f5217a46d..3570181cb 100644
--- a/esy.json
+++ b/esy.json
@@ -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.5.4",
+  "version": "3.6.0",
   "dependencies": {
     "ocaml": " >= 4.2.0 < 4.11.0",
     "@opam/fix": "*",
diff --git a/package.json b/package.json
index 70b34d280..f20eb58c9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "reason",
-	"version": "3.5.4",
+	"version": "3.6.0",
 	"description": "Simple, fast & type safe code that leverages the JavaScript & OCaml ecosystems",
 	"repository": {
 		"type": "git",
diff --git a/reason.json b/reason.json
index 269b9b5d6..a4b484238 100644
--- a/reason.json
+++ b/reason.json
@@ -1,6 +1,6 @@
 {
   "name": "@esy-ocaml/reason",
-  "version": "3.5.4",
+  "version": "3.6.0",
   "license": "MIT",
   "description": "Native Compiler Support for Reason: Simple, fast & type safe code that leverages the JavaScript & OCaml ecosystems",
   "repository": {
diff --git a/src/refmt/package.ml b/src/refmt/package.ml
index 53772ca47..f01d48cd9 100644
--- a/src/refmt/package.ml
+++ b/src/refmt/package.ml
@@ -1,4 +1,4 @@
 
-let version = "3.5.1"
-let git_version = "d3deb518e7ada9d39be8eb9e1d6d7ed140b821c4"
-let git_short_version = "d3deb518"
+let version = "3.6.0"
+let git_version = "59339f6fde0ea2cd4822d32bb99a7ec5b6865e3a"
+let git_short_version = "59339f6"