Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove groovy 4 substitutions which are no longer needed #897

Merged
merged 1 commit into from
Sep 24, 2024
Merged

Remove groovy 4 substitutions which are no longer needed #897

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 0 additions & 27 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,11 @@ buildscript {
}
dependencies {
classpath "io.github.gradle-nexus:publish-plugin:$gradleNexusPublishPluginVersion"
classpath "io.github.groovylang.groovydoc:groovydoc-gradle-plugin:$groovydocGradlePluginVersion"
classpath "org.grails:grails-gradle-plugin:$grailsGradlePluginVersion"
classpath "org.grails.plugins:views-gradle:$viewsGradleVersion"
classpath "org.asciidoctor:asciidoctor-gradle-jvm:$asciidoctorGradleVersion"
classpath "com.github.erdi:webdriver-binaries-gradle-plugin:$webdriverBinariesPluginVersion"
}

configurations.configureEach {
resolutionStrategy.eachDependency { DependencyResolveDetails details ->
if ((details.requested.group == 'org.codehaus.groovy' || details.requested.group == 'org.apache.groovy') && details.requested.name != 'groovy-bom') {
details.useTarget(group: 'org.apache.groovy', name: details.requested.name, version: groovyVersion)
details.because "The dependency coordinates are changed in Apache Groovy 4, plus ensure version"
}
}
}
}

group "org.grails"
Expand Down Expand Up @@ -80,23 +70,6 @@ allprojects {
}
}
}

configurations.all {
resolutionStrategy.dependencySubstitution {
substitute module("org.codehaus.groovy:groovy-all") using module("org.apache.groovy:groovy:$groovyVersion")
}

resolutionStrategy.eachDependency { DependencyResolveDetails details ->
if ((details.requested.group == 'org.codehaus.groovy' || details.requested.group == 'org.apache.groovy') && details.requested.name != 'groovy-bom') {
details.useTarget(group: 'org.apache.groovy', name: details.requested.name, version: "$groovyVersion")
details.because "The dependency coordinates are changed in Apache Groovy 4, plus ensure version"
}

if (details.requested.group == "io.micronaut" && details.requested.name == "micronaut-inject-groovy") {
details.useVersion("4.6.1")
}
}
}
}

subprojects { Project subproject ->
Expand Down
1 change: 1 addition & 0 deletions examples/grails3-hibernate5/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ dependencies {

testImplementation("org.grails.plugins:geb") {
exclude group: 'org.gebish', module: 'geb-spock'
exclude group: 'org.codehaus.groovy'
}
testImplementation "org.gebish:geb-spock:$gebVersion"
testRuntimeOnly "org.seleniumhq.selenium:selenium-chrome-driver:$seleniumVersion"
Expand Down
7 changes: 1 addition & 6 deletions examples/grails3-multiple-datasources/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
group "examples"

configurations.all {
resolutionStrategy.dependencySubstitution {
substitute(module("org.codehaus.groovy:groovy-bom:3.0.8")).using(module("org.apache.groovy:groovy-bom:$groovyVersion"))
}
}

dependencies {
implementation "org.springframework.boot:spring-boot-starter-logging"
implementation "org.springframework.boot:spring-boot-autoconfigure"
Expand All @@ -31,6 +25,7 @@ dependencies {
testImplementation "org.grails:grails-gorm-testing-support:$testingSupportVersion"
testImplementation("org.grails.plugins:geb") {
exclude group: 'org.gebish', module: 'geb-spock'
exclude group: 'org.codehaus.groovy'
}
testImplementation "org.gebish:geb-spock:$gebVersion"
testRuntimeOnly "org.seleniumhq.selenium:selenium-chrome-driver:$seleniumVersion"
Expand Down
13 changes: 3 additions & 10 deletions examples/grails3-schema-per-tenant/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@ dependencies {
runtimeOnly "org.grails.plugins:scaffolding:$scaffoldingVersion"

testImplementation "org.grails:grails-gorm-testing-support:$testingSupportVersion"
testImplementation "org.grails.plugins:geb:$gebPluginVersion"
testImplementation "org.grails.plugins:geb:$gebPluginVersion", {
exclude group: 'org.codehaus.groovy'
}
testRuntimeOnly "org.seleniumhq.selenium:selenium-chrome-driver:$seleniumVersion"
testRuntimeOnly "org.seleniumhq.selenium:selenium-firefox-driver:$seleniumVersion"
testRuntimeOnly "org.seleniumhq.selenium:selenium-safari-driver:$seleniumSafariDriverVersion"
Expand All @@ -33,15 +35,6 @@ dependencies {
testImplementation "org.seleniumhq.selenium:selenium-support:$seleniumVersion"
}

configurations.all {
resolutionStrategy.eachDependency { DependencyResolveDetails details ->
if ((details.requested.group == 'org.codehaus.groovy')) {
details.useTarget(group: 'org.apache.groovy', name: details.requested.name, version: "$groovyVersion")
details.because "The dependency coordinates are changed in Apache Groovy 4, plus ensure version"
}
}
}

tasks.withType(Test) {
systemProperty "geb.env", System.getProperty('geb.env')
systemProperty "geb.build.reportsDir", reporting.file("geb/integrationTest")
Expand Down
Loading