Release 0.22.2 (Fix cram test)

ocaml-ppx · May 24, 2022 · 9775096 · 9775096
1 parent 364aaa8
commit 9775096
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 18 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,4 +1,4 @@
-## 0.22.1 (2022-05-24)
+## 0.22.2 (2022-05-24)
 
 ### Removed
 

diff --git a/README.md b/README.md
@@ -29,7 +29,7 @@ Alternatively, see [`ocamlformat.opam`](./ocamlformat.opam) for manual build ins
 Setting up your project to use the default profile and the OCamlFormat version you installed (hopefully the last one) in this `.ocamlformat` file is considered good practice:
 ```
 profile = default
-version = 0.22.1
+version = 0.22.2
 ```
 
 To manually invoke OCamlformat the general command is:

diff --git a/doc/faq.mld b/doc/faq.mld
@@ -21,7 +21,7 @@ The recommended way is to use a versioned default profile, such as:
 
 {[
 profile = default
-version = 0.22.1
+version = 0.22.2
 ]}
 
 (or replace with the output of [ocamlformat --version])

diff --git a/doc/getting_started.mld b/doc/getting_started.mld
@@ -21,7 +21,7 @@ dune build @install
 First of all, make sure you have an [.ocamlformat] file at the root of your project. Setting up your project to use the default profile and the OCamlFormat version you installed (hopefully the last one) in this [.ocamlformat] file is considered good practice:
 {[
 profile = default
-version = 0.22.1
+version = 0.22.2
 ]}
 
 To manually invoke OCamlformat the general command is:

diff --git a/lib/Conf.ml b/lib/Conf.ml
@@ -201,15 +201,15 @@ module Formatting = struct
 
   let ( (* align_cases *) ) =
     let names = ["align-cases"] in
-    C.removed_option ~names ~since:V0_22_0 ~msg:""
+    C.removed_option ~names ~since:V0_22_2 ~msg:""
 
   let ( (* align_constructors_decl *) ) =
     let names = ["align-constructors-decl"] in
-    C.removed_option ~names ~since:V0_22_0 ~msg:""
+    C.removed_option ~names ~since:V0_22_2 ~msg:""
 
   let ( (* align_variants_decl *) ) =
     let names = ["align-variants-decl"] in
-    C.removed_option ~names ~since:V0_22_0 ~msg:""
+    C.removed_option ~names ~since:V0_22_2 ~msg:""
 
   let assignment_operator =
     let doc = "Position of the assignment operator." in
@@ -1201,7 +1201,7 @@ let ( (* disable_outside_detected_project *) ) =
      enable the opposite behavior use `enable-outside-detected-project`."
   in
   let names = ["disable-outside-detected-project"] in
-  C.removed_option ~names ~since:V0_22_0 ~msg
+  C.removed_option ~names ~since:V0_22_2 ~msg
 
 let enable_outside_detected_project =
   let witness =
@@ -1642,8 +1642,8 @@ let (_profile : fmt_opts option C.t) =
   in
   C.choice ~names ~all ~doc ~kind:C.Formatting
     ~removed_values:
-      [ C.Value_removed.make ~name:"compact" ~since:V0_22_0 ~msg:""
-      ; C.Value_removed.make ~name:"sparse" ~since:V0_22_0 ~msg:"" ]
+      [ C.Value_removed.make ~name:"compact" ~since:V0_22_2 ~msg:""
+      ; C.Value_removed.make ~name:"sparse" ~since:V0_22_2 ~msg:"" ]
     (fun conf p ->
       selected_profile_ref := p ;
       let new_fmt_opts = Option.value p ~default:conf.fmt_opts in

diff --git a/lib/Version.ml b/lib/Version.ml
@@ -16,7 +16,7 @@ type t =
   | V0_16_0
   | V0_17_0
   | V0_20_0
-  | V0_22_0
+  | V0_22_2
   | V1_0_0
 
 let to_string = function
@@ -26,7 +26,7 @@ let to_string = function
   | V0_16_0 -> "0.16.0"
   | V0_17_0 -> "0.17.0"
   | V0_20_0 -> "0.20.0"
-  | V0_22_0 -> "0.22.0"
+  | V0_22_2 -> "0.22.2"
   | V1_0_0 -> "1.0.0"
 
 let pp fs v = Format.fprintf fs "%s" (to_string v)

diff --git a/lib/Version.mli b/lib/Version.mli
@@ -16,7 +16,7 @@ type t =
   | V0_16_0
   | V0_17_0
   | V0_20_0
-  | V0_22_0
+  | V0_22_2
   | V1_0_0
 
 val to_string : t -> string

diff --git a/ocamlformat-help.txt b/ocamlformat-help.txt
@@ -451,16 +451,16 @@ OPTIONS (CODE FORMATTING STYLE)
 
 OPTIONS (REMOVED)
        --align-cases=VAL
-           This option has been removed in version 0.22.0.
+           This option has been removed in version 0.22.2.
 
        --align-constructors-decl=VAL
-           This option has been removed in version 0.22.0.
+           This option has been removed in version 0.22.2.
 
        --align-variants-decl=VAL
-           This option has been removed in version 0.22.0.
+           This option has been removed in version 0.22.2.
 
        --disable-outside-detected-project=VAL
-           This option has been removed in version 0.22.0. OCamlFormat is
+           This option has been removed in version 0.22.2. OCamlFormat is
            disabled outside of a detected project by default, to enable the
            opposite behavior use `enable-outside-detected-project`.
 

diff --git a/test/cli/conf.t b/test/cli/conf.t
@@ -7,7 +7,7 @@ Exit code is printed by hand because sed succeeding would hide the error.
 
   $ (<a.ml ocamlformat --impl -; echo [$?]) 2>&1 | sed 's/version is "[^"]*"/version is "..."/g'
   ocamlformat: Error while parsing $TESTCASE_ROOT/.ocamlformat:
-               Project should be formatted using ocamlformat version "bad", but the installed version is "unknown"
+               Project should be formatted using ocamlformat version "bad", but the installed version is "..."
   [1]
 
 Invalid syntax in .ocamlformat file: