Compatibility with javalib 3.1 release

Summary:
This javalib release gives compatibility with java 9 modules.
It should also remove some Infer warnings (when a class has no superclass)
JFile.sep is now a char

Reviewed By: jvillard

Differential Revision: D16220583

fbshipit-source-id: 5d05afde0
master
David Pichardie 5 years ago committed by Facebook Github Bot
parent 380515bc89
commit f47d4ed285

@ -40,11 +40,7 @@ let add_models jar_filename =
let is_model procname = String.Set.mem !models_specs_filenames (Typ.Procname.to_filename procname) let is_model procname = String.Set.mem !models_specs_filenames (Typ.Procname.to_filename procname)
let split_classpath = let split_classpath = String.split ~on:JFile.sep
assert (Int.( = ) (String.length JFile.sep) 1) ;
let char_sep = JFile.sep.[0] in
fun cp -> String.split ~on:char_sep cp
let classpath_of_paths paths = let classpath_of_paths paths =
let of_path path = let of_path path =
@ -56,7 +52,8 @@ let classpath_of_paths paths =
L.debug Capture Medium "Path %s not found" full_path ; L.debug Capture Medium "Path %s not found" full_path ;
None None
in in
List.filter_map paths ~f:of_path |> String.concat ~sep:JFile.sep let string_sep = Char.to_string JFile.sep in
List.filter_map paths ~f:of_path |> String.concat ~sep:string_sep
type file_entry = Singleton of SourceFile.t | Duplicate of (string * SourceFile.t) list type file_entry = Singleton of SourceFile.t | Duplicate of (string * SourceFile.t) list

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

@ -38,7 +38,6 @@ depends: [
"camlidl" {= "1.05"} "camlidl" {= "1.05"}
"camlp4" {= "4.07+1"} "camlp4" {= "4.07+1"}
"camlzip" {= "1.08"} "camlzip" {= "1.08"}
"camomile" {= "1.0.1"}
"cmdliner" {= "1.0.4"} "cmdliner" {= "1.0.4"}
"conf-autoconf" {= "0.1"} "conf-autoconf" {= "0.1"}
"conf-gmp" {= "1"} "conf-gmp" {= "1"}
@ -60,7 +59,7 @@ depends: [
"fieldslib" {= "v0.12.0"} "fieldslib" {= "v0.12.0"}
"integers" {= "0.2.2"} "integers" {= "0.2.2"}
"jane-street-headers" {= "v0.12.0"} "jane-street-headers" {= "v0.12.0"}
"javalib" {= "3.0"} "javalib" {= "3.1"}
"jbuilder" {= "transition"} "jbuilder" {= "transition"}
"jst-config" {= "v0.12.0"} "jst-config" {= "v0.12.0"}
"menhir" {= "20190626"} "menhir" {= "20190626"}

Loading…
Cancel
Save