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

Commit 21456f1

Browse files
authored
Update for github workflow publish (#881)
1 parent cf7adb3 commit 21456f1

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

build.gradle

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,6 @@ allprojects {
7777
substitute module("org.codehaus.groovy:groovy-all") using module("org.apache.groovy:groovy:$groovyVersion")
7878
}
7979

80-
resolutionStrategy.dependencySubstitution {
81-
substitute(module("org.codehaus.groovy:groovy-bom:3.0.8")).using(module("org.apache.groovy:groovy-bom:4.0.22"))
82-
}
83-
8480
resolutionStrategy.eachDependency { DependencyResolveDetails details ->
8581
if ((details.requested.group == 'org.codehaus.groovy' || details.requested.group == 'org.apache.groovy') && details.requested.name != 'groovy-bom') {
8682
details.useTarget(group: 'org.apache.groovy', name: details.requested.name, version: "$groovyVersion")
@@ -330,7 +326,7 @@ subprojects { Project subproject ->
330326

331327
afterEvaluate {
332328
if(isGrails3PluginProject) {
333-
artifact source:"${sourceSets.main.groovy.destinationDirectory}/META-INF/grails-plugin.xml",
329+
artifact source:"${sourceSets.main.groovy.getClassesDirectory().get().getAsFile()}/META-INF/grails-plugin.xml",
334330
classifier:"plugin",
335331
extension:'xml'
336332
}

examples/grails3-schema-per-tenant/build.gradle

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,15 @@ dependencies {
3333
testImplementation "org.seleniumhq.selenium:selenium-support:$seleniumVersion"
3434
}
3535

36+
configurations.all {
37+
resolutionStrategy.eachDependency { DependencyResolveDetails details ->
38+
if ((details.requested.group == 'org.codehaus.groovy')) {
39+
details.useTarget(group: 'org.apache.groovy', name: details.requested.name, version: "$groovyVersion")
40+
details.because "The dependency coordinates are changed in Apache Groovy 4, plus ensure version"
41+
}
42+
}
43+
}
44+
3645
tasks.withType(Test) {
3746
systemProperty "geb.env", System.getProperty('geb.env')
3847
systemProperty "geb.build.reportsDir", reporting.file("geb/integrationTest")

0 commit comments

Comments
 (0)