From fea97e1d8d812c16af230690afd2744811c34a6c Mon Sep 17 00:00:00 2001 From: "Alejandro R. Mosteo" Date: Sat, 14 Sep 2024 12:42:26 +0200 Subject: [PATCH] Bump submodules, testsuite dependencies --- alire.toml | 13 ++++++++++--- deps/den | 2 +- src/alr/alr-commands-version.adb | 12 ++++++------ testsuite/requirements.txt | 2 ++ 4 files changed, 19 insertions(+), 10 deletions(-) diff --git a/alire.toml b/alire.toml index aebe4d5d4..b853e5fa8 100644 --- a/alire.toml +++ b/alire.toml @@ -18,7 +18,7 @@ executables = ["alr"] aaa = "~0.3.0" ada_toml = "~0.3" ajunitgen = "^1.0.1" -ansiada = "^1.0" +ansiada = "^1.1" c_strings = "^1.0" clic = "~0.3" den = "~0.1" @@ -51,13 +51,19 @@ windows = { ALIRE_OS = "windows" } # Some dependencies require precise versions during the development cycle: [[pins]] + [pins.aaa] url = "https://github.com/mosteo/aaa" -commit = "0c3b440ac183c450345d4a67d407785678779aae" +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" + [pins.c_strings] url = "https://github.com/mosteo/cstrings" commit = "e4d58ad90bf32bc44304197e5906a519f5a9a7bf" @@ -65,9 +71,10 @@ commit = "e4d58ad90bf32bc44304197e5906a519f5a9a7bf" [pins.clic] url = "https://github.com/alire-project/clic" commit = "56bbdc008e16996b6f76e443fd0165a240de1b13" + [pins.den] url = "https://github.com/mosteo/den" -commit = "681ab5ca522585953f2e1d70763731df34c96012" +commit = "b12e8461bf41e2cfe199c8196b45fa4fc213a6aa" [pins.dirty_booleans] url = "https://github.com/mosteo/dirty_booleans" diff --git a/deps/den b/deps/den index 681ab5ca5..b12e8461b 160000 --- a/deps/den +++ b/deps/den @@ -1 +1 @@ -Subproject commit 681ab5ca522585953f2e1d70763731df34c96012 +Subproject commit b12e8461bf41e2cfe199c8196b45fa4fc213a6aa diff --git a/src/alr/alr-commands-version.adb b/src/alr/alr-commands-version.adb index 5ed63d42a..a89057d9e 100644 --- a/src/alr/alr-commands-version.adb +++ b/src/alr/alr-commands-version.adb @@ -89,7 +89,7 @@ package body Alr.Commands.Version is end if; Add ("APPLICATION", ""); - Add ("alr version:", Alire.Version.Current.Image); + Add ("alr version:", Alire.Version.Current.Image); Add ("libalire version:", Alire.Version.Current.Image); Add ("compilation date:", GNAT.Source_Info.Compilation_ISO_Date & " " @@ -99,11 +99,11 @@ package body Alr.Commands.Version is Add (""); Add ("CONFIGURATION"); Add ("settings folder:", Alire.Settings.Edit.Path); - Add ("cache folder:", Alire.Cache.Path); - Add ("vault folder:", Paths.Vault.Path); - Add ("build folder:", Build_Path); - Add ("temp folder:", Alire.Platforms.Folders.Temp); - Add ("force flag:", Alire.Force'Image); + Add ("cache folder:", Alire.Cache.Path); + Add ("vault folder:", Paths.Vault.Path); + Add ("build folder:", Build_Path); + Add ("temp folder:", Alire.Platforms.Folders.Temp); + Add ("force flag:", Alire.Force'Image); Add ("non-interactive flag:", CLIC.User_Input.Not_Interactive'Image); Add ("community index branch:", Alire.Index.Community_Branch); diff --git a/testsuite/requirements.txt b/testsuite/requirements.txt index dcaf78ee3..bc0daa894 100644 --- a/testsuite/requirements.txt +++ b/testsuite/requirements.txt @@ -1,3 +1,5 @@ docker e3-testsuite +json pexpect +toml