No need to support check version: there's only one.

Author: cristianoc

jscomp/gentype/Config_.ml

@@ -99,7 +99,7 @@ let rec findProjectRoot ~dir =
       assert false)
     else findProjectRoot ~dir:parent
 
-let readConfig ~bsVersion ~getBsConfigFile ~namespace =
+let readConfig ~getBsConfigFile ~namespace =
   let projectRoot = findProjectRoot ~dir:(Sys.getcwd ()) in
   let bsbProjectRoot =
     match Sys.getenv_opt "BSB_PROJECT_ROOT" with
@@ -145,37 +145,19 @@ let readConfig ~bsVersion ~getBsConfigFile ~namespace =
       | Some b -> b
     in
     let generatedFileExtension = generatedFileExtensionStringOption in
-    let bsVersion =
-      match bsVersion with
-      | None -> (0, 0, 0)
-      | Some s -> (
-          match s |> Str.split (Str.regexp (Str.quote ".")) with
-          | x1 :: x2 :: x3 :: _ ->
-              let v1 = int_of_string x1 in
-              let v2 = int_of_string x2 in
-              let v3 =
-                match x3 |> Str.split (Str.regexp "-") with
-                | x3 :: _ -> int_of_string x3
-                | _ -> 0
-              in
-              (v1, v2, v3)
-          | _ -> (0, 0, 0))
-    in
     let externalStdlib = bsconf |> getStringOption "external-stdlib" in
-    let v1, v2, v3 = bsVersion in
     let platformLib =
       match externalStdlib with
-      | None -> if v1 >= 9 && v2 >= 1 then "rescript" else "bs-platform"
+      | None -> "rescript"
       | Some externalStdlib -> externalStdlib
     in
     if !Debug.config then (
       Log_.item "Project root: %s\n" projectRoot;
       if bsbProjectRoot <> projectRoot then
         Log_.item "bsb project root: %s\n" bsbProjectRoot;
-      Log_.item "Config module:%s shims:%d entries bsVersion:%d.%d.%d\n"
+      Log_.item "Config module:%s shims:%d entries \n"
         (match moduleString with None -> "" | Some s -> s)
-        (shimsMap |> ModuleNameMap.cardinal)
-        v1 v2 v3);
+        (shimsMap |> ModuleNameMap.cardinal));
     let namespace =
       match bsconf |> getOpt "namespace" with
       | Some (True _) -> namespace

jscomp/gentype/GenType.ml

@@ -4,9 +4,7 @@ let signFile s = s
 type cliCommand = Add of string | Clean | NoOp | Rm of string list
 
 let cli () =
-  let bsVersion = ref None in
   let cliCommand = ref NoOp in
-  let setBsVersion s = bsVersion := Some s in
   let usage = "genType version " ^ version in
   let versionAndExit () =
     print_endline usage;
@@ -23,7 +21,6 @@ let cli () =
   and setClean () = Clean |> setCliCommand
   and speclist =
     [
-      ("-bs-version", Arg.String setBsVersion, "set the bucklescript version");
       ("-clean", Arg.Unit setClean, "clean all the generated files");
       ("-cmt-add", Arg.String setAdd, "compile a .cmt[i] file");
       ( "-cmt-rm",
@@ -33,7 +30,7 @@ let cli () =
       ("--version", Arg.Unit versionAndExit, "show version information and exit");
     ]
   in
-  let executeCliCommand ~bsVersion cliCommand =
+  let executeCliCommand cliCommand =
     match cliCommand with
     | Add s ->
         Log_.Color.forceColor := true;
@@ -45,14 +42,12 @@ let cli () =
               (cmt, mlast)
           | _ -> assert false
         in
-        let config =
-          Paths.readConfig ~bsVersion ~namespace:(cmt |> Paths.findNameSpace)
-        in
+        let config = Paths.readConfig ~namespace:(cmt |> Paths.findNameSpace) in
         if !Debug.basic then Log_.item "Add %s  %s\n" cmt mlast;
         cmt |> GenTypeMain.processCmtFile ~signFile ~config;
         exit 0
     | Clean ->
-        let config = Paths.readConfig ~bsVersion ~namespace:None in
+        let config = Paths.readConfig ~namespace:None in
         let sourceDirs = ModuleResolver.readSourceDirs ~config in
         if !Debug.basic then
           Log_.item "Clean %d dirs\n" (sourceDirs.dirs |> List.length);
@@ -83,7 +78,7 @@ let cli () =
           (* somehow the CMT hook is passing an absolute path here *)
           let cmt = cmtAbsolutePath |> Paths.relativePathFromBsLib in
           let config =
-            Paths.readConfig ~bsVersion ~namespace:(cmt |> Paths.findNameSpace)
+            Paths.readConfig ~namespace:(cmt |> Paths.findNameSpace)
           in
           let outputFile = cmt |> Paths.getOutputFile ~config in
           if !Debug.basic then Log_.item "Remove %s\n" cmt;
@@ -98,7 +93,7 @@ let cli () =
     | _ -> print_endline s
   in
   Arg.parse speclist anonArg usage;
-  executeCliCommand ~bsVersion:!bsVersion !cliCommand
+  executeCliCommand !cliCommand
 ;;
 
 cli ()

jscomp/gentype/Paths.ml

@@ -83,5 +83,4 @@ let relativePathFromBsLib fileName =
     | [] -> fileName
     | root :: dirs -> dirs |> List.fold_left concat root
 
-let readConfig ~bsVersion ~namespace =
-  Config.readConfig ~bsVersion ~getBsConfigFile ~namespace
+let readConfig ~namespace = Config.readConfig ~getBsConfigFile ~namespace