Skip to content

Commit

Permalink
Merge remote-tracking branch 'alire/release/2.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
mosteo committed Jan 8, 2025
2 parents c5c58c0 + 7f7b962 commit 0d255c2
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 6 deletions.
3 changes: 0 additions & 3 deletions alire.toml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ commit = "ddfeffe2d6c8f9d19161df7b31d16d37bef4ba71"
[pins.ada_toml]
url = "https://github.com/mosteo/ada-toml"
commit = "da4e59c382ceb0de6733d571ecbab7ea4919b33d"

[pins.ansiada]
url = "https://github.com/mosteo/ansi-ada"
commit = "0772e48d3e1f640829d142745a36b37edcd5470b"
Expand All @@ -70,7 +69,6 @@ commit = "e4d58ad90bf32bc44304197e5906a519f5a9a7bf"
[pins.clic]
url = "https://github.com/alire-project/clic"
commit = "56bbdc008e16996b6f76e443fd0165a240de1b13"

[pins.den]
url = "https://github.com/mosteo/den"
commit = "653a4c9ba4469d7e1a8896088789b6514ecdf834"
Expand All @@ -86,7 +84,6 @@ commit = "60729edf31816aca0036b13b2794c39a9bd0172e"
[pins.gnatcoll]
url = "https://github.com/alire-project/gnatcoll-core.git"
commit = "4e663b87a028252e7e074f054f8f453661397166"

[pins.lml]
url = "https://github.com/mosteo/lml_ada.git"
commit = "ae156ef82a2fedb7e28bb4dcaeb3d5c0a2e046ec"
Expand Down
3 changes: 2 additions & 1 deletion src/alire/alire-version.ads
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ private
-- be replaced by `alr build` with the current commit, and appended with
-- "_or_later" after build.

Current_Str : constant String := "2.1-dev";
Current_Str : constant String := "2.1.0-dev";
-- 2.0.2: quarterly bugfix maintenance release
-- 2.0.1: fix `alr install` and minor fixes
-- 2.0.0: alr settings refactor and minor fixes
-- 2.0.0-rc1: release candidate for 2.0
Expand Down
2 changes: 0 additions & 2 deletions src/alr/alr-commands-version.adb
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ package body Alr.Commands.Version is
/ Paths.Cache_Folder_Inside_Working_Folder
/ Paths.Deps_Folder_Inside_Cache_Folder)
else Builds.Path);

---------
-- Add --
---------
Expand All @@ -78,7 +77,6 @@ package body Alr.Commands.Version is

Table.Append (Key).Append (Val).New_Row;
end Add;

begin
if Args.Count /= 0 then
Reportaise_Wrong_Arguments (Cmd.Name & " doesn't take arguments");
Expand Down

0 comments on commit 0d255c2

Please sign in to comment.