[opam] use javalib 2.3.4

Summary:
No need for our own patched version now that it's available in opam.

You should `opam pin remove --no-action javalib && ./build-infer.sh` to get rid of the previous version.

Reviewed By: mbouaziz

Differential Revision: D6063730

fbshipit-source-id: 8efd598

.gitignore

@@ -18,7 +18,6 @@
 /_build_logs
 /infer/tests/codetoanalyze/java/*/codetoanalyze
 /dependencies/infer-deps-*
-/dependencies/javalib/javalib-2.3.3/
 _build_infer
 *.exp.test*
 *.test.dot

build-infer.sh

@@ -166,18 +166,6 @@ install_infer-deps () {
     opam pin add infer-deps "$INFER_DEPS_DIR"
 }
 
-# temporary: patch javalib and use local version as source of truth. can be removed once javalib
-# creates a new release with the patch
-# (https://gforge.inria.fr/tracker/index.php?func=detail&aid=21418&group_id=686&atid=2817)
-install_patched_javalib() {
-    local javalib_dir="$INFER_ROOT"/dependencies/javalib
-    local unzipped_javalib_dir="$javalib_dir"/javalib-2.3.3
-    tar xvf "$javalib_dir"/javalib-2.3.3.tar.bz2 -C "$javalib_dir"
-    # apply the patch
-    patch -d "$unzipped_javalib_dir"/src < "$javalib_dir"/allow_empty_method.patch
-    opam pin add --no-action javalib "$unzipped_javalib_dir"
-}
-
 install_locked_deps() {
     if ! opam lock 2> /dev/null; then
         echo "opam-lock not found in the current switch, installing from '$OPAM_LOCK_URL'..." >&2
@@ -187,7 +175,6 @@ install_locked_deps() {
 }
 
 install_opam_deps() {
-    install_patched_javalib
     if [ "$USE_OPAM_LOCK" = yes ]; then
         install_locked_deps
     else

dependencies/javalib/allow_empty_method.patch

@@ -1,15 +0,0 @@
---- jLow2High.ml	2016-11-01 08:10:40.000000000 -0700
-+++ jLow2High.ml	2017-08-30 14:54:09.000000000 -0700
-@@ -630,9 +630,9 @@
- 	Java (lazy (low2high_code consts bootstrap_methods (Lazy.force c)))
-     | [] when is_native -> Native
-     | [] ->
--        raise
--          (Class_structure_error
--             "A method not declared as Native, nor Abstract has been found without code.")
-+        (* although this will never happen in bytecode generated by Javac, some bytecode generators
-+           create empty method bodies without bothering to mark them native *)
-+        Native
-     | [_] ->
-         raise
-           (Class_structure_error)

opam

@@ -33,7 +33,7 @@ depends: [
   "conf-autoconf" {build}
   "ctypes" {>="0.9.2"}
   "extlib-compat"
-  "javalib" {>="2.3.3"}
+  "javalib" {>="2.3.4"}
   "jbuilder" {build & >="1.0+beta14"}
   "mtime"
   "ocamlfind" {build}

opam.lock

@@ -23,7 +23,7 @@ extlib-compat = 1.7.2
 fieldslib = v0.9.0
 integers = 0.2.2
 jane-street-headers = v0.9.0
-javalib = 2.3.3
+javalib = 2.3.4
 jbuilder = 1.0+beta14
 menhir = 20170712
 mtime = 1.1.0