From 4a7452b4d5321235032540eed96dcdc05cf918ba Mon Sep 17 00:00:00 2001 From: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> Date: Thu, 1 Aug 2024 11:06:09 +0100 Subject: [PATCH 1/3] Add support for Gradle 8 Signed-off-by: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> --- dependency-download/build.gradle | 34 +++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/dependency-download/build.gradle b/dependency-download/build.gradle index a2785b9..2760510 100644 --- a/dependency-download/build.gradle +++ b/dependency-download/build.gradle @@ -20,8 +20,8 @@ repositories { } dependencies { - runtime group: 'dev.galasa', name: 'dev.galasa.managers.manifest', version: version, ext: "yaml" - runtime group: 'dev.galasa', name: 'dev.galasa.framework.manifest', version: version, ext: "yaml" + runtimeOnly group: 'dev.galasa', name: 'dev.galasa.managers.manifest', version: version, ext: "yaml" + runtimeOnly group: 'dev.galasa', name: 'dev.galasa.framework.manifest', version: version, ext: "yaml" } // Download all the files we depend upon. @@ -31,19 +31,29 @@ task downloadAllDependencies(type: Copy) { } // Gets the manager dependency and renames it to remove the version number. -task getManagerDependency(type: Copy) { - from 'build/dependencies' - include "dev.galasa.managers.manifest-${version}.yaml" - destinationDir file('build/dependencies/') - rename "dev.galasa.managers.manifest-${version}.yaml", "dev.galasa.managers.manifest.yaml" +task getManagerDependency { + dependsOn downloadAllDependencies + doFirst { + copyDependency("dev.galasa.managers.manifest-${version}.yaml", "dev.galasa.managers.manifest.yaml") + } } // Gets the framework dependency and renames it to remove the version number. -task getFrameworkDependency(type: Copy) { - from 'build/dependencies' - include "dev.galasa.framework.manifest-${version}.yaml" - destinationDir file('build/dependencies/') - rename "dev.galasa.framework.manifest-${version}.yaml", "dev.galasa.framework.manifest.yaml" +task getFrameworkDependency { + dependsOn downloadAllDependencies + doFirst { + copyDependency("dev.galasa.framework.manifest-${version}.yaml", "dev.galasa.framework.manifest.yaml") + } +} + +// Creates a copy of a dependency matching the given pattern and renames it with the given name +def copyDependency(dependencyPattern, desiredFileName) { + copy { + from 'build/dependencies' + include dependencyPattern + into file('build/dependencies/') + rename dependencyPattern, desiredFileName + } } // Gets all the dependencies From bff08640c783dcf3f49ddbfa65bbacb19858e922 Mon Sep 17 00:00:00 2001 From: Savvas Kyriacou Date: Thu, 1 Aug 2024 15:42:47 +0100 Subject: [PATCH 2/3] Empty Commit to trigger build. Signed-off-by: Savvas Kyriacou From 6e84b2375e544a17cb65800c725972d286e9e068 Mon Sep 17 00:00:00 2001 From: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> Date: Thu, 1 Aug 2024 15:56:25 +0100 Subject: [PATCH 3/3] Empty commit to kick off build Signed-off-by: Eamonn Mansour <47121388+eamansour@users.noreply.github.com>