[opam] bump opam and javalib versions

Summary:
Avoid sandboxing issues and mark the incompatibility with javalib 3.0.

Also remove workaround for opam bug that has been fixed and that was
causing portability issues on osx where `realpath` isn't always
available.

Reviewed By: ngorogiannis

Differential Revision: D13450029

fbshipit-source-id: ea33b06d8

build-infer.sh

@@ -132,39 +132,15 @@ install_opam_deps () {
     opam install --deps-only $locked infer "$INFER_ROOT"
 }
 
-# temporary
-# https://github.com/ocaml/opam-repository/issues/13040
-warn_javalib_sandbox () {
-    echo "*** Did opam just fail to install javalib? If so you need to disable sandboxing." >&2
-    echo "*** Delete the following lines in $(opam var root)/config:" >&2
-    echo >&2
-    echo '  wrap-build-commands:' >&2
-    echo '    ["%{hooks}%/sandbox.sh" "build"] {os = "linux" | os = "macos"}' >&2
-    echo '  wrap-install-commands:' >&2
-    echo '    ["%{hooks}%/sandbox.sh" "install"] {os = "linux" | os = "macos"}' >&2
-    echo '  wrap-remove-commands:' >&2
-    echo '    ["%{hooks}%/sandbox.sh" "remove"] {os = "linux" | os = "macos"}' >&2
-    echo >&2
-    echo "*** once you are done don't forget to enable sandboxing again with" >&2
-    echo >&2
-    echo "  opam init --reinit -ni" >&2
-    exit 1
-}
-
 echo "initializing opam... " >&2
 . "$INFER_ROOT"/scripts/opam_utils.sh
-# workaround bug in opam regarding symlinks
-# https://github.com/ocaml/opam/issues/3622
-OPAMROOT=${OPAMROOT:-"$HOME"/.opam}
-OPAMROOT=$(realpath "$OPAMROOT")
-export OPAMROOT
 if [ "$USER_OPAM_SWITCH" == "no" ]; then
     setup_opam
 fi
 eval $(SHELL=bash opam env)
 echo >&2
 echo "installing infer dependencies; this can take up to 30 minutes... " >&2
-opam_retry install_opam_deps || warn_javalib_sandbox
+opam_retry install_opam_deps
 
 if [ "$ONLY_SETUP_OPAM" == "yes" ]; then
   exit 0

opam

@@ -33,7 +33,7 @@ depends: [
   "ctypes" {>="0.9.2"}
   "dune" {build & >="1.0"}
   "elina" {>="1.1"}
-  "javalib" {>="2.3.5"}
+  "javalib" {>="2.3.5" & <"3.0"}
   "mtime"
   "ocaml" {>="4.06.0"}
   "ocamlfind" {build}

opam.locked

@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "infer"
-version: "0.15.0"
+version: "fb"
 synopsis: "A static analyzer for Java, C, C++, and Objective-C"
 maintainer: "the infer team"
 authors: "Facebook"
@@ -25,17 +25,18 @@ depends: [
   "atdgen" {= "2.0.0"}
   "atdgen-runtime" {= "2.0.0"}
   "base" {= "v0.11.1"}
+  "base-bigarray" {= "base"}
   "base-bytes" {= "base"}
   "base-threads" {= "base"}
   "base-unix" {= "base"}
-  "base64" {= "2.2.0"}
+  "base64" {= "2.3.0"}
   "bin_prot" {= "v0.11.0"}
   "biniou" {= "1.2.0"}
   "camlidl" {= "1.05"}
   "camlp4" {= "4.07+1"}
   "camlzip" {= "1.07"}
   "camomile" {= "1.0.1"}
-  "cmdliner" {= "1.0.2"}
+  "cmdliner" {= "1.0.3"}
   "conf-autoconf" {= "0.1"}
   "conf-gmp" {= "1"}
   "conf-m4" {= "1"}
@@ -51,14 +52,14 @@ depends: [
   "cppo" {= "1.6.5"}
   "cppo_ocamlbuild" {= "1.6.0"}
   "ctypes" {= "0.14.0"}
-  "dune" {= "1.5.1"}
+  "dune" {= "1.6.2"}
   "easy-format" {= "1.3.1"}
   "elina" {= "1.1"}
   "extlib" {= "1.7.5"}
   "fieldslib" {= "v0.11.0"}
   "integers" {= "0.2.2"}
   "jane-street-headers" {= "v0.11.0"}
-  "javalib" {= "2.3.5"}
+  "javalib" {= "2.3.6"}
   "jbuilder" {= "transition"}
   "menhir" {= "20181113"}
   "mlgmpidl" {= "1.2.7"}
@@ -68,6 +69,7 @@ depends: [
   "ocaml-compiler-libs" {= "v0.11.0"}
   "ocaml-config" {= "1"}
   "ocaml-migrate-parsetree" {= "1.1.0"}
+  "ocaml-variants" {= "4.07.1+flambda"}
   "ocamlbuild" {= "0.12.0"}
   "ocamlfind" {= "1.8.0"}
   "ocamlgraph" {= "1.8.8"}
@@ -105,7 +107,7 @@ depends: [
   "ppxlib" {= "0.3.1"}
   "re" {= "1.8.0"}
   "result" {= "1.3"}
-  "sawja" {= "1.5.4"}
+  "sawja" {= "1.5.5"}
   "seq" {= "base"}
   "sexplib" {= "v0.11.0"}
   "sexplib0" {= "v0.11.0"}