From 63113d3298a2aced141db899b5328ae55e45841d Mon Sep 17 00:00:00 2001 From: Reingold Shekhtel Date: Thu, 19 Dec 2024 14:02:28 +0100 Subject: [PATCH 1/2] Refactor build.gradle to improve releaseMode handling and update scriptsUrl logic --- build.gradle | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 2c03002..a39ed9a 100644 --- a/build.gradle +++ b/build.gradle @@ -5,13 +5,13 @@ plugins { } project.ext { - releaseMode = project.hasProperty("releaseMode") + releaseMode = project.hasProperty("releaseMode") ? project.releaseMode.toBoolean() : false publishRepo = "https://maven.pkg.github.com/reportportal/plugin-api" dependencyRepos = ["commons-model", "commons-rules", "commons-dao", "commons-bom"] + scriptVersion = project.hasProperty("scripts.version") ? project.scripts.version : "develop" } -def scriptsUrl = 'https://raw.githubusercontent.com/reportportal/gradle-scripts/' + - (releaseMode ? getProperty('scripts.version') : 'develop') +def scriptsUrl = 'https://raw.githubusercontent.com/reportportal/gradle-scripts/' + scriptVersion apply from: scriptsUrl + '/release-commons.gradle' apply from: scriptsUrl + '/signing.gradle' @@ -50,7 +50,6 @@ dependencies { testImplementation 'junit:junit' } - -wrapper { - gradleVersion = '8.10' -} +//wrapper { +// gradleVersion = '8.10' +//} From ed20181d4e987fb52cf1bb480e042f1ae3dd7dc9 Mon Sep 17 00:00:00 2001 From: Reingold Shekhtel Date: Thu, 19 Dec 2024 14:20:49 +0100 Subject: [PATCH 2/2] Update commons dependency version in build.gradle --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index a39ed9a..222bd54 100644 --- a/build.gradle +++ b/build.gradle @@ -42,7 +42,7 @@ dependencies { api 'com.epam.reportportal:commons' } else { implementation 'com.github.reportportal:commons-dao:adbb40e' - api 'com.github.reportportal:commons:6e23763' + api 'com.github.reportportal:commons:3dfb9d8' } api 'org.pf4j:pf4j:3.10.0' api 'org.pf4j:pf4j-update:2.3.0'