From 04b24eeb9963939b64abdd505d665cf892b1bd5d Mon Sep 17 00:00:00 2001
From: Eugen Wissner <belka@caraus.de>
Date: Thu, 18 May 2023 21:40:59 +0200
Subject: [PATCH] Fix dmd calls to SlackBuilder module functions

---
 Rakefile               |  6 +++---
 rakelib/dmd_tools.rake | 18 ++++++++++--------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/Rakefile b/Rakefile
index 6b0cba8..bce85c6 100644
--- a/Rakefile
+++ b/Rakefile
@@ -14,9 +14,9 @@ require_relative 'lib/download'
 task :dmd, [:version] do |_, arguments|
   raise 'Version is not specified.' unless arguments.key? :version
 
-  dub_version = '1.30.0'
-  dscanner_version = '0.12.2'
-  dcd_version = '0.13.6'
+  dub_version = '1.32.1'
+  dscanner_version = '0.14.0'
+  dcd_version = '0.15.2'
 
   SlackBuilder::DmdTools.update_dmd arguments[:version]
   SlackBuilder::DmdTools.update_tools arguments[:version], dub_version, dscanner_version, dcd_version
diff --git a/rakelib/dmd_tools.rake b/rakelib/dmd_tools.rake
index 843e9fb..d0d54a3 100644
--- a/rakelib/dmd_tools.rake
+++ b/rakelib/dmd_tools.rake
@@ -44,10 +44,12 @@ module SlackBuilder
     private_class_method def self.write_tools_info(package, dub_version, dscanner_version, dcd_version, checksum)
       write_info package,
         downloads: [
-          Download.new(hosted_sources("/d-tools/dub-#{dub_version}.tar.gz"), checksum[:dub]),
-          Download.new(hosted_sources("/d-tools/tools-#{package.version}.tar.gz"), checksum[:tools]),
-          Download.new(hosted_sources("/d-tools/D-Scanner-#{dscanner_version}.tar.xz"), checksum[:dscanner]),
-          Download.new(hosted_sources("/d-tools/DCD-#{dcd_version}.tar.xz"), checksum[:dcd])
+          Download.new(SlackBuilder.hosted_sources("/d-tools/dub-#{dub_version}.tar.gz"), checksum[:dub]),
+          Download.new(SlackBuilder.hosted_sources("/d-tools/tools-#{package.version}.tar.gz"), checksum[:tools]),
+          Download.new(
+            SlackBuilder.hosted_sources("/d-tools/D-Scanner-#{dscanner_version}.tar.xz"), checksum[:dscanner]
+          ),
+          Download.new(SlackBuilder.hosted_sources("/d-tools/DCD-#{dcd_version}.tar.xz"), checksum[:dcd])
         ]
     end
 
@@ -55,14 +57,14 @@ module SlackBuilder
       checksum = {}
 
       uri = URI "https://codeload.github.com/dlang/tools/tar.gz/v#{version}"
-      checksum[:tools] = download_and_deploy uri, "development/d-tools/tools-#{version}.tar.gz"
+      checksum[:tools] = SlackBuilder.download_and_deploy uri, "development/d-tools/tools-#{version}.tar.gz"
 
       uri = URI "https://codeload.github.com/dlang/dub/tar.gz/v#{dub_version}"
-      checksum[:dub] = download_and_deploy uri, "development/d-tools/dub-#{dub_version}.tar.gz"
+      checksum[:dub] = SlackBuilder.download_and_deploy uri, "development/d-tools/dub-#{dub_version}.tar.gz"
 
-      checksum[:dscanner] = clone 'https://github.com/dlang-community/D-Scanner.git',
+      checksum[:dscanner] = SlackBuilder.clone 'https://github.com/dlang-community/D-Scanner.git',
         "development/d-tools/D-Scanner-#{dscanner_version}.tar.xz"
-      checksum[:dcd] = clone 'https://github.com/dlang-community/DCD.git',
+      checksum[:dcd] = SlackBuilder.clone 'https://github.com/dlang-community/DCD.git',
         "development/d-tools/DCD-#{dcd_version}.tar.xz"
 
       checksum