Skip to content
This repository was archived by the owner on Mar 13, 2025. It is now read-only.

Update for github workflow publish #881

Merged
merged 2 commits into from
Aug 28, 2024
Merged

Update for github workflow publish #881

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3082aac
Update for github workflow publish
jamesfredley Aug 28, 2024
d98b026
Update for github workflow publish
jamesfredley Aug 28, 2024
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
6 changes: 1 addition & 5 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,6 @@ allprojects {
substitute module("org.codehaus.groovy:groovy-all") using module("org.apache.groovy:groovy:$groovyVersion")
}

resolutionStrategy.dependencySubstitution {
substitute(module("org.codehaus.groovy:groovy-bom:3.0.8")).using(module("org.apache.groovy:groovy-bom:4.0.22"))
}

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")
Expand Down Expand Up @@ -330,7 +326,7 @@ subprojects { Project subproject ->

afterEvaluate {
if(isGrails3PluginProject) {
artifact source:"${sourceSets.main.groovy.destinationDirectory}/META-INF/grails-plugin.xml",
artifact source:"${sourceSets.main.groovy.getClassesDirectory().get().getAsFile()}/META-INF/grails-plugin.xml",
classifier:"plugin",
extension:'xml'
}
Expand Down
9 changes: 9 additions & 0 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 @@ -33,6 +33,15 @@ 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