Skip to content

Commit 6bb90af

Browse files
SONARRUBY-24 Clean up Gradle tasks to use non-deprecated APIs
1 parent e8eff48 commit 6bb90af

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

sonar-ruby-plugin/build.gradle

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ ext {
3636
}
3737

3838
processResources.duplicatesStrategy = DuplicatesStrategy.INCLUDE
39-
processResources.from("src/main/resources", "${buildDir}/dependency_gems/gems")
39+
processResources.from("src/main/resources", "${getLayout().getBuildDirectory()}/dependency_gems/gems")
4040

4141
dependencies {
4242
compileOnly libs.sonar.plugin.api
@@ -53,9 +53,9 @@ dependencies {
5353
// http://rubygems-proxy.torquebox.org/releases/rubygems/racc/1.5.2/racc-1.5.2-java.pom
5454
// But "rubygems-proxy.torquebox.org" server does not exist anymore.
5555
// The bellow function "downloadFromRubygems" is a workaround to this problem
56-
gems files("${buildDir}/rubygems_downloads/racc-${rubygemsRaccVersion}.gem")
57-
gems files("${buildDir}/rubygems_downloads/ast-${rubygemsAstVersion}.gem")
58-
gems files("${buildDir}/rubygems_downloads/parser-${rubygemsParserVersion}.gem")
56+
gems files("${getLayout().getBuildDirectory()}/rubygems_downloads/racc-${rubygemsRaccVersion}.gem")
57+
gems files("${getLayout().getBuildDirectory()}/rubygems_downloads/ast-${rubygemsAstVersion}.gem")
58+
gems files("${getLayout().getBuildDirectory()}/rubygems_downloads/parser-${rubygemsParserVersion}.gem")
5959

6060
testImplementation testLibs.slang.antlr
6161
testImplementation testLibs.assertj.core
@@ -68,7 +68,7 @@ dependencies {
6868
testRuntimeOnly testLibs.junit.jupiter.engine
6969
}
7070

71-
task downloadFromRubygems(type: Task) {
71+
tasks.register("downloadFromRubygems", Task) {
7272
doLast {
7373
configurations.gems
7474
.findAll { !it.exists() }
@@ -84,14 +84,14 @@ task downloadFromRubygems(type: Task) {
8484
}
8585
}
8686

87-
task unpackDependencyGems(type: JRubyPrepare) {
88-
outputDir "${buildDir}/dependency_gems"
87+
tasks.register("unpackDependencyGems", JRubyPrepare) {
88+
outputDir "${getLayout().getBuildDirectory()}/dependency_gems"
8989
dependencies configurations.gems
9090
}
91-
task copyGemsJarsFromDirectoryToShadowBugWorkaroundJar(type: Jar) {
92-
from "${buildDir}/dependency_gems/gems"
91+
tasks.register("copyGemsJarsFromDirectoryToShadowBugWorkaroundJar", Jar) {
92+
from "${getLayout().getBuildDirectory()}/dependency_gems/gems"
9393
includes = ['**/*.jar']
94-
destinationDirectory = file("${buildDir}/tmp")
94+
destinationDirectory = file("${getLayout().getBuildDirectory()}/tmp")
9595
archiveFileName = "shadowBugWorkaround.jar"
9696
}
9797

@@ -175,7 +175,7 @@ shadowJar {
175175
// shadowJar can not embed jar files, it always extract them.
176176
// https://imperceptiblethoughts.com/shadow/configuration/dependencies/#embedding-jar-files-inside-your-shadow-jar
177177
// the workaround used here, is to put jar in jar
178-
from file("${buildDir}/tmp/shadowBugWorkaround.jar")
178+
from file("${getLayout().getBuildDirectory()}/tmp/shadowBugWorkaround.jar")
179179
exclude 'com/headius/racc/**' // from shadowBugWorkaround.jar
180180

181181
exclude 'javax/**' // com.google.code.findbugs:jsr305

0 commit comments

Comments
 (0)