From c6a42487f034ebd860cb9dd596af2cf78733db30 Mon Sep 17 00:00:00 2001 From: Alejandro R Mosteo Date: Mon, 14 Jun 2021 12:15:01 +0200 Subject: [PATCH] Fix new warnings in CE2021 (#746) * Initial fixes for CE2021 * Resolve conflicts with CE2020 * Update CI scripts to use CE2021 * Revert CE version for macOS CI tests * Remove conflicting Append_Vector * Remove unused entities in Windows * Fix bug uncovered by CE2021 * Fix timestamps compare when mixing G.OS_Lib/A.Dirs * Update pins for self-build * Disable self-build, that uses CE2021 It cannot succeed until the patches in this very PR are merged, as it is attempting to build the old code with the new compiler in the setup-alire action. * More fixes for relative paths in softlinks * Remove unused entities in Windows build --- .github/workflows/ci-linux.yml | 2 +- .../{ci-self.yml => ci-self.yml.disabled} | 10 ++++- .github/workflows/ci-unsupported.yml | 2 +- .github/workflows/ci-windows.yml | 2 +- .gitignore | 3 ++ alire.lock | 8 ++-- alire.toml | 2 +- deps/aaa | 2 +- deps/gnatcoll-slim | 2 +- src/alire/alire-crate_configuration.adb | 1 + src/alire/alire-crate_configuration.ads | 1 - src/alire/alire-crates.ads | 1 - src/alire/alire-dependencies-states.adb | 2 +- src/alire/alire-dependencies-states.ads | 1 - src/alire/alire-dependencies.ads | 1 - src/alire/alire-environment-formatting.ads | 2 - src/alire/alire-environment.adb | 1 + src/alire/alire-environment.ads | 1 - src/alire/alire-externals-softlinks.adb | 44 ++++++++++++------- src/alire/alire-features-index.adb | 1 - src/alire/alire-index.ads | 4 -- src/alire/alire-lockfiles.ads | 1 - src/alire/alire-origins-tweaks.adb | 1 - src/alire/alire-properties-bool.ads | 1 - src/alire/alire-properties-cases.ads | 2 - src/alire/alire-publish.ads | 1 - src/alire/alire-root.adb | 1 - src/alire/alire-roots.adb | 7 +-- src/alire/alire-roots.ads | 3 +- src/alire/alire-selftest.adb | 2 - src/alire/alire-solutions-diffs.adb | 1 - src/alire/alire-solutions-diffs.ads | 2 - src/alire/alire-solutions.adb | 2 + src/alire/alire-solutions.ads | 2 +- src/alire/alire-solver.adb | 1 - src/alire/alire-solver.ads | 2 - src/alire/alire-toml_index.adb | 2 +- src/alire/alire-toml_index.ads | 3 -- src/alire/alire-utils.ads | 3 -- src/alire/os_windows/alire-platform.adb | 2 - src/alr/alr-commands-init.adb | 4 -- src/alr/alr-commands-withing.adb | 1 - src/alr/os_windows/alr-platforms-windows.adb | 1 - src/alr/os_windows/alr-platforms-windows.ads | 2 - 44 files changed, 60 insertions(+), 80 deletions(-) rename .github/workflows/{ci-self.yml => ci-self.yml.disabled} (84%) diff --git a/.github/workflows/ci-linux.yml b/.github/workflows/ci-linux.yml index 31653782..ddf8add3 100644 --- a/.github/workflows/ci-linux.yml +++ b/.github/workflows/ci-linux.yml @@ -30,7 +30,7 @@ jobs: submodules: true - name: Install toolchain - uses: ada-actions/toolchain@ce2020 + uses: ada-actions/toolchain@ce2021 with: distrib: community diff --git a/.github/workflows/ci-self.yml b/.github/workflows/ci-self.yml.disabled similarity index 84% rename from .github/workflows/ci-self.yml rename to .github/workflows/ci-self.yml.disabled index e009f59c..20426474 100644 --- a/.github/workflows/ci-self.yml +++ b/.github/workflows/ci-self.yml.disabled @@ -33,11 +33,19 @@ jobs: with: submodules: false # Not needed, should be retrieved by alr - - name: Install toolchain + # Use 2020 community on macOS since no 2021 exists + - name: Install toolchain CE ${{ matrix.os }} + if: matrix.os == 'macos-latest' uses: ada-actions/toolchain@ce2020 with: distrib: community + - name: Install toolchain CE ${{ matrix.os }} + if: matrix.os != 'macos-latest' + uses: ada-actions/toolchain@ce2021 + with: + distrib: community + # We need the devel version to build with remote pins - name: Install alr uses: alire-project/setup-alire@latest-devel diff --git a/.github/workflows/ci-unsupported.yml b/.github/workflows/ci-unsupported.yml index 2cab6896..03ab150d 100644 --- a/.github/workflows/ci-unsupported.yml +++ b/.github/workflows/ci-unsupported.yml @@ -25,7 +25,7 @@ jobs: submodules: true - name: Install toolchain - uses: ada-actions/toolchain@ce2020 + uses: ada-actions/toolchain@ce2021 with: distrib: community diff --git a/.github/workflows/ci-windows.yml b/.github/workflows/ci-windows.yml index c137cb15..b7824786 100644 --- a/.github/workflows/ci-windows.yml +++ b/.github/workflows/ci-windows.yml @@ -24,7 +24,7 @@ jobs: submodules: true - name: Install toolchain - uses: ada-actions/toolchain@ce2020 + uses: ada-actions/toolchain@ce2021 with: distrib: community diff --git a/.gitignore b/.gitignore index 042604a5..a4d0a0fe 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,8 @@ # Add any directories, files, or patterns you don't want to be tracked by version control +.clang-format +.clangd/ + *.cgpr *.db *.db-??? diff --git a/alire.lock b/alire.lock index e44fd326..2c84f1a6 100644 --- a/alire.lock +++ b/alire.lock @@ -11,11 +11,11 @@ transitivity = "direct" versions = "~0.2.1" [solution.state.link] kind = "softlink" -path = "file:alire/cache/pins/aaa_0.2.3-dev_4b4aa047" +path = "file:alire/cache/pins/aaa_0.2.3-dev_ccb78861" relative = true remote = true [solution.state.link.origin] -commit = "4b4aa047f29a4270c5b5003468617e153977ab97" +commit = "ccb78861bd7589dfcce08a70b69cdc72169bbf4a" url = "git+https://github.com/mosteo/aaa.git" [[solution.state]] crate = "ada_toml" @@ -86,11 +86,11 @@ transitivity = "direct" versions = "^21" [solution.state.link] kind = "softlink" -path = "file:alire/cache/pins/gnatcoll_0.0.0_f3bd1c51" +path = "file:alire/cache/pins/gnatcoll_0.0.0_e250e4e4" relative = true remote = true [solution.state.link.origin] -commit = "f3bd1c51d12962879f52733e790b394f5bbfe05f" +commit = "e250e4e42d9743b782788cf61b4ddc10a45e69e2" url = "git+https://github.com/alire-project/gnatcoll-core.git" [[solution.state]] crate = "minirest" diff --git a/alire.toml b/alire.toml index 72f6ea0c..2c4bdfbf 100644 --- a/alire.toml +++ b/alire.toml @@ -11,7 +11,7 @@ maintainers-logins = ["mosteo", "Fabien-Chouteau"] # alire.gpr only. For now this crate is not intended as a dependency but to be # used to build alr. auto-gpr-with = false -project-files = ["alr_env.gpr"] +project-files = ["alr.gpr"] executables = ["alr"] [[depends-on]] diff --git a/deps/aaa b/deps/aaa index 4b4aa047..ccb78861 160000 --- a/deps/aaa +++ b/deps/aaa @@ -1 +1 @@ -Subproject commit 4b4aa047f29a4270c5b5003468617e153977ab97 +Subproject commit ccb78861bd7589dfcce08a70b69cdc72169bbf4a diff --git a/deps/gnatcoll-slim b/deps/gnatcoll-slim index f3bd1c51..e250e4e4 160000 --- a/deps/gnatcoll-slim +++ b/deps/gnatcoll-slim @@ -1 +1 @@ -Subproject commit f3bd1c51d12962879f52733e790b394f5bbfe05f +Subproject commit e250e4e42d9743b782788cf61b4ddc10a45e69e2 diff --git a/src/alire/alire-crate_configuration.adb b/src/alire/alire-crate_configuration.adb index 4551da18..bc647423 100644 --- a/src/alire/alire-crate_configuration.adb +++ b/src/alire/alire-crate_configuration.adb @@ -5,6 +5,7 @@ with Ada.Characters.Handling; with Alire_Early_Elaboration; with Alire.Solutions; +with Alire.Releases; with Alire.Roots; with Alire.Origins; diff --git a/src/alire/alire-crate_configuration.ads b/src/alire/alire-crate_configuration.ads index 4cef7e72..b507f441 100644 --- a/src/alire/alire-crate_configuration.ads +++ b/src/alire/alire-crate_configuration.ads @@ -1,6 +1,5 @@ with TOML; -with Alire.Releases; with Alire.Properties.Configurations; limited with Alire.Roots; diff --git a/src/alire/alire-crates.ads b/src/alire/alire-crates.ads index 3bf8d3a7..cdb019be 100644 --- a/src/alire/alire-crates.ads +++ b/src/alire/alire-crates.ads @@ -2,7 +2,6 @@ with Alire.Conditional; with Alire.Containers; with Alire.Externals.Lists; with Alire.Policies; -with Alire.Properties; with Alire.Releases; with Alire.TOML_Adapters; with Alire.Utils; diff --git a/src/alire/alire-dependencies-states.adb b/src/alire/alire-dependencies-states.adb index 73a5ddd6..40b1fb26 100644 --- a/src/alire/alire-dependencies-states.adb +++ b/src/alire/alire-dependencies-states.adb @@ -1,5 +1,5 @@ -with Alire.Crates; with Alire.Manifest; +with Alire.Milestones; with Alire.Origins; with Alire.Roots.Optional; diff --git a/src/alire/alire-dependencies-states.ads b/src/alire/alire-dependencies-states.ads index 8f6d8df9..5d8e39fa 100644 --- a/src/alire/alire-dependencies-states.ads +++ b/src/alire/alire-dependencies-states.ads @@ -2,7 +2,6 @@ private with AAA.Containers.Indefinite_Holders; private with Alire.Containers; with Alire.Externals.Softlinks; -with Alire.Properties; with Alire.Releases; with Alire.TOML_Adapters; diff --git a/src/alire/alire-dependencies.ads b/src/alire/alire-dependencies.ads index 76635305..ec27e574 100644 --- a/src/alire/alire-dependencies.ads +++ b/src/alire/alire-dependencies.ads @@ -1,5 +1,4 @@ with Alire.Interfaces; -with Alire.Milestones; with Alire.Utils; with Semantic_Versioning.Basic; diff --git a/src/alire/alire-environment-formatting.ads b/src/alire/alire-environment-formatting.ads index e19d0ab7..0a28f002 100644 --- a/src/alire/alire-environment-formatting.ads +++ b/src/alire/alire-environment-formatting.ads @@ -1,5 +1,3 @@ -with Alire.Releases; - package Alire.Environment.Formatting is function Format (Release_Dir : Any_Path; diff --git a/src/alire/alire-environment.adb b/src/alire/alire-environment.adb index 766fb165..b450869a 100644 --- a/src/alire/alire-environment.adb +++ b/src/alire/alire-environment.adb @@ -9,6 +9,7 @@ with Alire.Properties.Environment; use Alire.Properties.Environment; with Alire.OS_Lib; with Alire.GPR; with Alire.Properties.Scenarios; +with Alire.Releases; with Alire.Roots; with Alire.Solutions; with Alire.Utils; diff --git a/src/alire/alire-environment.ads b/src/alire/alire-environment.ads index 69de6ca7..1b0ce32c 100644 --- a/src/alire/alire-environment.ads +++ b/src/alire/alire-environment.ads @@ -1,6 +1,5 @@ with Ada.Strings.Unbounded; -with Alire.Releases; with Alire.Properties; with Alire.Platforms; limited with Alire.Roots; diff --git a/src/alire/alire-externals-softlinks.adb b/src/alire/alire-externals-softlinks.adb index 3967b1bc..9b808608 100644 --- a/src/alire/alire-externals-softlinks.adb +++ b/src/alire/alire-externals-softlinks.adb @@ -51,12 +51,16 @@ package body Alire.Externals.Softlinks is function New_Remote (Origin : Origins.Origin; Path : Relative_Path) return External - is (Externals.External with - Has_Remote => True, - Remote => (Used => True, Origin => Origin), - Relative => True, - Path_Length => Path'Length, - Rel_Path => Alire.VFS.To_Portable (Path)); + is + Stored_Path : constant Portable_Path := Alire.VFS.To_Portable (Path); + begin + return (Externals.External with + Has_Remote => True, + Remote => (Used => True, Origin => Origin), + Relative => True, + Path_Length => Stored_Path'Length, + Rel_Path => Stored_Path); + end New_Remote; ------------------ -- New_Softlink -- @@ -96,12 +100,17 @@ package body Alire.Externals.Softlinks is Path_Length => Path'Length, Abs_Path => Path); else - return (Externals.External with - Has_Remote => False, - Remote => <>, - Relative => True, - Path_Length => Target'Length, - Rel_Path => Alire.VFS.To_Portable (+Target)); + declare + Portable_Target : constant Portable_Path := + Alire.VFS.To_Portable (+Target); + begin + return (Externals.External with + Has_Remote => False, + Remote => <>, + Relative => True, + Path_Length => Portable_Target'Length, + Rel_Path => Portable_Target); + end; end if; end; end; @@ -121,14 +130,15 @@ package body Alire.Externals.Softlinks is declare use Alire.OS_Lib.Operators; - New_Path : constant Any_Path := From / This.Path; + New_Path : constant Portable_Path := + Alire.VFS.To_Portable (From / This.Path); begin return (Externals.External with - Has_Remote => This.Has_Remote, - Remote => This.Remote, - Relative => True, + Has_Remote => This.Has_Remote, + Remote => This.Remote, + Relative => True, Path_Length => New_Path'Length, - Rel_Path => Alire.VFS.To_Portable (New_Path)); + Rel_Path => New_Path); end; end Relocate; diff --git a/src/alire/alire-features-index.adb b/src/alire/alire-features-index.adb index 980676dc..386720e5 100644 --- a/src/alire/alire-features-index.adb +++ b/src/alire/alire-features-index.adb @@ -2,7 +2,6 @@ with Ada.Directories; with Alire.Config.Edit; with Alire.Index; -with Alire.Origins.Deployers; with Alire.OS_Lib; with GNAT.OS_Lib; diff --git a/src/alire/alire-index.ads b/src/alire/alire-index.ads index 3a7beb07..f680b83b 100644 --- a/src/alire/alire-index.ads +++ b/src/alire/alire-index.ads @@ -1,13 +1,9 @@ private with Alire_Early_Elaboration; pragma Unreferenced (Alire_Early_Elaboration); -with Alire.Dependencies; -with Alire.GPR; -with Alire.Origins; with Alire.Crates.Containers; with Alire.Policies; with Alire.Properties; -with Alire.Properties.Licenses; with Alire.Releases; with Alire.Utils; diff --git a/src/alire/alire-lockfiles.ads b/src/alire/alire-lockfiles.ads index 51b0e58f..3e43e119 100644 --- a/src/alire/alire-lockfiles.ads +++ b/src/alire/alire-lockfiles.ads @@ -1,5 +1,4 @@ with Alire.Interfaces; -with Alire.Properties; with Alire.Solutions; with Alire.TOML_Adapters; diff --git a/src/alire/alire-origins-tweaks.adb b/src/alire/alire-origins-tweaks.adb index fa6092b8..aa9fcabb 100644 --- a/src/alire/alire-origins-tweaks.adb +++ b/src/alire/alire-origins-tweaks.adb @@ -1,7 +1,6 @@ with Ada.Directories; with Alire.OS_Lib; -with Alire.Utils; with Alire.URI; diff --git a/src/alire/alire-properties-bool.ads b/src/alire/alire-properties-bool.ads index 3e7bc88c..2d704e05 100644 --- a/src/alire/alire-properties-bool.ads +++ b/src/alire/alire-properties-bool.ads @@ -1,5 +1,4 @@ with Alire.Conditional; -with Alire.GPR; with Alire.TOML_Adapters; with Alire.TOML_Keys; with Alire.Utils; diff --git a/src/alire/alire-properties-cases.ads b/src/alire/alire-properties-cases.ads index d79925e9..51609deb 100644 --- a/src/alire/alire-properties-cases.ads +++ b/src/alire/alire-properties-cases.ads @@ -1,5 +1,3 @@ -with TOML; - generic -- Encapsulated enumeration type type Enum is (<>); diff --git a/src/alire/alire-publish.ads b/src/alire/alire-publish.ads index 88ba1050..64eb5f10 100644 --- a/src/alire/alire-publish.ads +++ b/src/alire/alire-publish.ads @@ -1,4 +1,3 @@ -with Alire.Origins; with Alire.Roots; with Alire.URI; diff --git a/src/alire/alire-root.adb b/src/alire/alire-root.adb index c1ef265f..94388a74 100644 --- a/src/alire/alire-root.adb +++ b/src/alire/alire-root.adb @@ -1,5 +1,4 @@ with Alire.Directories; -with Alire.Releases; package body Alire.Root is diff --git a/src/alire/alire-roots.adb b/src/alire/alire-roots.adb index 35dad775..34b3ca51 100644 --- a/src/alire/alire-roots.adb +++ b/src/alire/alire-roots.adb @@ -1,4 +1,3 @@ -with Ada.Calendar; with Ada.Directories; with Alire.Crate_Configuration; @@ -554,12 +553,10 @@ package body Alire.Roots is -------------------------- function Is_Lockfile_Outdated (This : Root) return Boolean is - use Ada.Directories; - use type Ada.Calendar.Time; + use GNAT.OS_Lib; begin return - Modification_Time (This.Crate_File) > - Modification_Time (This.Lock_File); + File_Time_Stamp (This.Crate_File) > File_Time_Stamp (This.Lock_File); end Is_Lockfile_Outdated; ---------------------------- diff --git a/src/alire/alire-roots.ads b/src/alire/alire-roots.ads index 754caf77..bdc43ef6 100644 --- a/src/alire/alire-roots.ads +++ b/src/alire/alire-roots.ads @@ -129,7 +129,8 @@ package Alire.Roots is -- releases in the lockfile are actually on disk (may be missing if cache -- was deleted, or the crate was just cloned). - procedure Sync_Manifest_And_Lockfile_Timestamps (This : Root); + procedure Sync_Manifest_And_Lockfile_Timestamps (This : Root) + with Post => not This.Is_Lockfile_Outdated; -- If the lockfile is older than the manifest, sync their timestamps, do -- nothing otherwise. We want this when the manifest has been manually -- edited but the solution hasn't changed (and so the lockfile hasn't been diff --git a/src/alire/alire-selftest.adb b/src/alire/alire-selftest.adb index 6c4984ab..f0fbfb9d 100644 --- a/src/alire/alire-selftest.adb +++ b/src/alire/alire-selftest.adb @@ -2,8 +2,6 @@ with Alire.Config.Edit; with Alire.Utils; with Alire.VCSs.Git; -with TOML; use TOML; - package body Alire.Selftest is -- Tests are Check_* procedures that end normally or raise some exception. diff --git a/src/alire/alire-solutions-diffs.adb b/src/alire/alire-solutions-diffs.adb index 9f674c9a..6e4fc1b6 100644 --- a/src/alire/alire-solutions-diffs.adb +++ b/src/alire/alire-solutions-diffs.adb @@ -1,4 +1,3 @@ -with Alire.Containers; with Alire.Utils.Tables; with Alire.Utils.TTY; diff --git a/src/alire/alire-solutions-diffs.ads b/src/alire/alire-solutions-diffs.ads index 70d96b7c..863c54be 100644 --- a/src/alire/alire-solutions-diffs.ads +++ b/src/alire/alire-solutions-diffs.ads @@ -1,5 +1,3 @@ -with Semantic_Versioning.Extended; - package Alire.Solutions.Diffs is type Diff is tagged private; diff --git a/src/alire/alire-solutions.adb b/src/alire/alire-solutions.adb index 861e91f4..841027ee 100644 --- a/src/alire/alire-solutions.adb +++ b/src/alire/alire-solutions.adb @@ -13,6 +13,8 @@ with Alire.Utils.Tables; with Alire.Utils.Tools; with Alire.Utils.TTY; +with Semantic_Versioning.Extended; + package body Alire.Solutions is package Semver renames Semantic_Versioning; diff --git a/src/alire/alire-solutions.ads b/src/alire/alire-solutions.ads index 99d5076c..c6399f26 100644 --- a/src/alire/alire-solutions.ads +++ b/src/alire/alire-solutions.ads @@ -10,7 +10,7 @@ with Alire.TOML_Adapters; limited with Alire.Solutions.Diffs; -with Semantic_Versioning.Extended; +with Semantic_Versioning; with TOML; diff --git a/src/alire/alire-solver.adb b/src/alire/alire-solver.adb index 3cca14f1..33619970 100644 --- a/src/alire/alire-solver.adb +++ b/src/alire/alire-solver.adb @@ -5,7 +5,6 @@ with Alire.Conditional; with Alire.Containers; with Alire.Dependencies.States; with Alire.Milestones; -with Alire.Origins.Deployers; with Alire.Utils.TTY; package body Alire.Solver is diff --git a/src/alire/alire-solver.ads b/src/alire/alire-solver.ads index caf0aedf..9270eb5e 100644 --- a/src/alire/alire-solver.ads +++ b/src/alire/alire-solver.ads @@ -6,8 +6,6 @@ with Alire.Types; with Semantic_Versioning.Extended; -with TOML; - package Alire.Solver is -------------- diff --git a/src/alire/alire-toml_index.adb b/src/alire/alire-toml_index.adb index b4285a5e..20c7e153 100644 --- a/src/alire/alire-toml_index.adb +++ b/src/alire/alire-toml_index.adb @@ -1,8 +1,8 @@ with Ada.Directories; +with Alire.Crates; with Alire.Directories; with Alire.Errors; -with Alire.GPR; with Alire.TOML_Adapters; with Alire.Hashes.SHA512_Impl; pragma Unreferenced (Alire.Hashes.SHA512_Impl); diff --git a/src/alire/alire-toml_index.ads b/src/alire/alire-toml_index.ads index da4c44d7..2b32b8cc 100644 --- a/src/alire/alire-toml_index.ads +++ b/src/alire/alire-toml_index.ads @@ -1,7 +1,4 @@ -private with TOML; - with Alire.Index_On_Disk; -with Alire.Crates; with Alire.Releases; with Semantic_Versioning; diff --git a/src/alire/alire-utils.ads b/src/alire/alire-utils.ads index 66846fa1..ba9751e1 100644 --- a/src/alire/alire-utils.ads +++ b/src/alire/alire-utils.ads @@ -154,9 +154,6 @@ package Alire.Utils with Preelaborate is C : Ada.Containers.Count_Type := 1) renames Append; - procedure Append_Vector (V : in out String_Vector; V2 : String_Vector) - renames Append; - function Append_To_Last_Line (V : String_Vector; S : String) return String_Vector; diff --git a/src/alire/os_windows/alire-platform.adb b/src/alire/os_windows/alire-platform.adb index 136a3ffe..f654751d 100644 --- a/src/alire/os_windows/alire-platform.adb +++ b/src/alire/os_windows/alire-platform.adb @@ -4,8 +4,6 @@ with GNAT.OS_Lib; with Alire.Utils; with Alire.OS_Lib; use Alire.OS_Lib; with Alire.OS_Lib.Subprocess; -with Alire.Origins; -with Alire.Origins.Deployers; package body Alire.Platform is diff --git a/src/alr/alr-commands-init.adb b/src/alr/alr-commands-init.adb index ecc9cd87..82290f52 100644 --- a/src/alr/alr-commands-init.adb +++ b/src/alr/alr-commands-init.adb @@ -4,12 +4,8 @@ with Ada.Directories; with Ada.Text_IO; with Alire.Config; -with Alire.Dependencies; with Alire.Lockfiles; -with Alire.Milestones; with Alire.Paths; -with Alire.Releases; -with Alire.Roots.Optional; with Alire.Solutions; with Alire.Utils.TTY; with Alire.Utils.User_Input.Query_Config; diff --git a/src/alr/alr-commands-withing.adb b/src/alr/alr-commands-withing.adb index a107621f..e5bd3365 100644 --- a/src/alr/alr-commands-withing.adb +++ b/src/alr/alr-commands-withing.adb @@ -7,7 +7,6 @@ with Alire.Conditional; with Alire.Dependencies.Diffs; with Alire.Index; with Alire.Manifest; -with Alire.Milestones; with Alire.Releases; with Alire.Roots.Optional; with Alire.Solutions; diff --git a/src/alr/os_windows/alr-platforms-windows.adb b/src/alr/os_windows/alr-platforms-windows.adb index fb12a9a0..0d243ac1 100644 --- a/src/alr/os_windows/alr-platforms-windows.adb +++ b/src/alr/os_windows/alr-platforms-windows.adb @@ -3,7 +3,6 @@ with Ada.Directories; with GNAT.OS_Lib; with Alire; -with Alire.Origins.Deployers; with Alire.Platform; with Alire.OS_Lib; with Alire.OS_Lib.Subprocess; diff --git a/src/alr/os_windows/alr-platforms-windows.ads b/src/alr/os_windows/alr-platforms-windows.ads index b4b58e06..f830726c 100644 --- a/src/alr/os_windows/alr-platforms-windows.ads +++ b/src/alr/os_windows/alr-platforms-windows.ads @@ -1,5 +1,3 @@ -with Alire.Origins; - package Alr.Platforms.Windows is type Linux_Variant is new Supported with null record; -- 2.39.5