From beb98c6baa3764dd9073028b8596de1a392369b5 Mon Sep 17 00:00:00 2001
From: Jules Villard <jul@fb.com>
Date: Mon, 11 Sep 2017 04:47:28 -0700
Subject: [PATCH] use ocaml 4.05.0

Summary: So modern.

Reviewed By: mbouaziz

Differential Revision: D5784449

fbshipit-source-id: 8672fad
---
 .travis.yml    |  2 +-
 build-infer.sh |  2 +-
 opam.lock      | 11 ++++++-----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6fd2858f8..4229c296b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,7 @@ before_install:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install opam; fi
 install:
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then travis_wait 60 ./build-infer.sh --yes java --opam-switch 4.04.2 --only-setup-opam; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then travis_wait 60 ./build-infer.sh --yes java --opam-switch 4.05.0 --only-setup-opam; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then eval `opam config env`; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then opam pin add -y --no-action -k git infer .; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then opam install -y infer; fi
diff --git a/build-infer.sh b/build-infer.sh
index 948beda66..8581b31e4 100755
--- a/build-infer.sh
+++ b/build-infer.sh
@@ -16,7 +16,7 @@ INFER_ROOT="$SCRIPT_DIR"
 INFER_DEPS_DIR="$INFER_ROOT/dependencies/infer-deps"
 PLATFORM="$(uname)"
 NCPU="$(getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1)"
-OCAML_VERSION=${OCAML_VERSION:-"4.04.2"}
+OCAML_VERSION=${OCAML_VERSION:-"4.05.0"}
 OPAM_LOCK_URL=${OPAM_LOCK_URL:-"https://github.com/rgrinberg/opam-lock"}
 
 INFER_OPAM_SWITCH_DEFAULT=infer-"$OCAML_VERSION"
diff --git a/opam.lock b/opam.lock
index 07c7ac886..bf25f77d7 100644
--- a/opam.lock
+++ b/opam.lock
@@ -4,7 +4,7 @@ atdgen = 1.12.0
 base = v0.9.3
 bin_prot = v0.9.1
 biniou = 1.2.0
-camlp4 = 4.04+1
+camlp4 = 4.05+1
 camlzip = 1.07
 cmdliner = 1.0.2
 conf-aclocal = 1.0.0
@@ -24,11 +24,11 @@ fieldslib = v0.9.0
 integers = 0.2.2
 jane-street-headers = v0.9.0
 javalib = 2.3.3
-jbuilder = 1.0+beta11
+jbuilder = 1.0+beta13
 menhir = 20170712
 num = 0
 ocaml-compiler-libs = v0.9.0
-ocaml-migrate-parsetree = 1.0.3
+ocaml-migrate-parsetree = 1.0.4
 ocamlbuild = 0.11.0
 ocamlfind = 1.7.3
 octavius = 1.1.0
@@ -42,7 +42,8 @@ ppx_bin_prot = v0.9.0
 ppx_compare = v0.9.0
 ppx_core = v0.9.0
 ppx_custom_printf = v0.9.0
-ppx_deriving = 4.1
+ppx_derivers = 1.0
+ppx_deriving = 4.2
 ppx_driver = v0.9.1
 ppx_enumerate = v0.9.0
 ppx_expect = v0.9.0
@@ -61,7 +62,7 @@ ppx_pipebang = v0.9.0
 ppx_sexp_conv = v0.9.0
 ppx_sexp_message = v0.9.0
 ppx_sexp_value = v0.9.0
-ppx_tools = 5.0
+ppx_tools = 5.0+4.05.0
 ppx_traverse = v0.9.0
 ppx_traverse_builtins = v0.9.0
 ppx_type_conv = v0.9.0