Skip to content

Commit

Permalink
#318 WIP Use Groovy version from Gradle
Browse files Browse the repository at this point in the history
This should work for the Plugin and
result in compatibility for Spock
  • Loading branch information
ascheman committed Aug 21, 2024
1 parent ba6d701 commit 2c0c1e5
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 4 deletions.
3 changes: 1 addition & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ ext.urls = [
]

// tag::mavenBuildRepo[]
File baseBuildDir = file("${project.rootDir}/build")
File baseBuildDir = file("${project.rootDir}/${Project.DEFAULT_BUILD_DIR_NAME}")
File mavenBuildRepo = new File(baseBuildDir, "maven-repo")
// end::mavenBuildRepo[]

Expand Down Expand Up @@ -145,7 +145,6 @@ configure(subprojects) {
description "${rootProject.description} - Module ${project.name}"

dependencies {
implementation platform(libs.groovy.bom)
implementation platform(libs.slf4j.bom)

testImplementation platform(libs.spock)
Expand Down
1 change: 0 additions & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ slf4j-version = '2.0.16'
[libraries]
commons-validator = 'commons-validator:commons-validator:1.9.0'
# Use latest 3.x Groovy Version to use Spock for Groovy 3 as long as Gradle uses Groovy 3
groovy-bom = 'org.codehaus.groovy:groovy-bom:3.0.22'
jsoup = 'org.jsoup:jsoup:1.18.1'
junit-vintage = { module = 'org.junit.vintage:junit-vintage-engine', version.ref = 'junit5-version' }
lombok = 'org.projectlombok:lombok:1.18.34'
Expand Down
1 change: 1 addition & 0 deletions htmlSanityCheck-cli/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ dependencies {
implementation libs.picocli.impl
annotationProcessor libs.picocli.annotationprocessor

implementation platform("org.codehaus.groovy:groovy-bom:${GroovySystem.version}")
implementation 'org.codehaus.groovy:groovy'
implementation 'org.slf4j:slf4j-api'
implementation 'org.slf4j:slf4j-simple'
Expand Down
1 change: 0 additions & 1 deletion htmlSanityCheck-core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ dependencies {

gitProperties {
// specify the location of the generated file
// gitPropertiesResourceDir = file("${project.projectDir}/build/resources/main")

// specify the properties to include
keys = ['git.branch',
Expand Down

0 comments on commit 2c0c1e5

Please sign in to comment.