From ab1bdb985f0a73e3965d95f93824d6f7bd833a2f Mon Sep 17 00:00:00 2001 From: Mathieu Barbin Date: Mon, 30 Sep 2024 15:51:34 +0200 Subject: [PATCH] Add cli version for 2.4 Co-authored-by: Raja Boujbel --- master_changes.md | 1 + src/client/opamArg.mli | 1 + src/client/opamArgTools.ml | 1 + src/client/opamArgTools.mli | 1 + src/client/opamCLIVersion.ml | 2 +- 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/master_changes.md b/master_changes.md index 05890e864c8..4a4a5094825 100644 --- a/master_changes.md +++ b/master_changes.md @@ -14,6 +14,7 @@ users) * Bump the version of opam to 2.4.0~alpha1~dev [#6204 @kit-ty-kate] ## Global CLI + * Add cli version 2.4 [#6268 @mbarbin @rjbou] ## Plugins diff --git a/src/client/opamArg.mli b/src/client/opamArg.mli index 2f1b6634c5a..75a31250362 100644 --- a/src/client/opamArg.mli +++ b/src/client/opamArg.mli @@ -25,6 +25,7 @@ val cli2_0: OpamCLIVersion.t val cli2_1: OpamCLIVersion.t val cli2_2: OpamCLIVersion.t val cli2_3: OpamCLIVersion.t +val cli2_4: OpamCLIVersion.t (* [cli_from ?platform ?experimental since] validity flag since [since], and no removal version. If [experimental] is true, it is marked as is (warning and diff --git a/src/client/opamArgTools.ml b/src/client/opamArgTools.ml index 41eaec82593..6915a8679c1 100644 --- a/src/client/opamArgTools.ml +++ b/src/client/opamArgTools.ml @@ -16,6 +16,7 @@ let cli2_0 = OpamCLIVersion.of_string "2.0" let cli2_1 = OpamCLIVersion.of_string "2.1" let cli2_2 = OpamCLIVersion.of_string "2.2" let cli2_3 = OpamCLIVersion.of_string "2.3" +let cli2_4 = OpamCLIVersion.of_string "2.4" type subplatform = [ `windows | `unix ] type platform = [ `all | subplatform ] diff --git a/src/client/opamArgTools.mli b/src/client/opamArgTools.mli index 1b875c67ea0..4fb10bd7295 100644 --- a/src/client/opamArgTools.mli +++ b/src/client/opamArgTools.mli @@ -29,6 +29,7 @@ val cli2_0: OpamCLIVersion.t val cli2_1: OpamCLIVersion.t val cli2_2: OpamCLIVersion.t val cli2_3: OpamCLIVersion.t +val cli2_4: OpamCLIVersion.t val mk_flag: cli:OpamCLIVersion.Sourced.t -> validity -> section:string -> string list -> diff --git a/src/client/opamCLIVersion.ml b/src/client/opamCLIVersion.ml index d9ae9ff5fee..ee36851dd99 100644 --- a/src/client/opamCLIVersion.ml +++ b/src/client/opamCLIVersion.ml @@ -10,7 +10,7 @@ type t = int * int -let supported_versions = [(2, 0); (2, 1); (2,2); (2,3)] +let supported_versions = [(2, 0); (2, 1); (2,2); (2,3); (2,4)] let is_supported v = List.mem v supported_versions