Skip to content

Commit a62699c

Browse files
committed
Further Gradle deprecation fixes
Closes gh-36132
1 parent dd6faf6 commit a62699c

File tree

3 files changed

+13
-8
lines changed

3 files changed

+13
-8
lines changed

buildSrc/src/main/java/org/springframework/build/shadow/ShadowSource.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public void relocate(String pattern, String destination) {
7878
}
7979

8080
@OutputDirectory
81-
DirectoryProperty getOutputDirectory() {
81+
public DirectoryProperty getOutputDirectory() {
8282
return this.outputDirectory;
8383
}
8484

framework-api/framework-api.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ dependencies {
2020
}
2121
}
2222

23+
def springAspectsOutput = project(":spring-aspects").sourceSets.main.output
2324
javadoc {
2425
javadocTool.set(javaToolchains.javadocToolFor({
2526
languageVersion = JavaLanguageVersion.of(25)
@@ -49,7 +50,7 @@ javadoc {
4950
doFirst {
5051
classpath += files(
5152
// ensure the javadoc process can resolve types compiled from .aj sources
52-
project(":spring-aspects").sourceSets.main.output
53+
springAspectsOutput
5354
)
5455
classpath += files(moduleProjects.collect { it.sourceSets.main.compileClasspath })
5556
}

spring-core/spring-core.gradle

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,19 @@ configurations {
2626
graalvm
2727
}
2828

29+
def javaPoetConfig = configurations.javapoet
2930
tasks.register('javapoetRepackJar', ShadowJar) {
3031
archiveBaseName = 'spring-javapoet-repack'
3132
archiveVersion = javapoetVersion
32-
configurations = [project.configurations.javapoet]
33+
configurations = [javaPoetConfig]
3334
relocate('com.palantir.javapoet', 'org.springframework.javapoet')
3435
}
3536

37+
def javaPoetDir = project.file("build/shadow-source/javapoet")
3638
tasks.register('javapoetSource', ShadowSource) {
37-
configurations = [project.configurations.javapoet]
39+
configurations = [javaPoetConfig]
3840
relocate('com.palantir.javapoet', 'org.springframework.javapoet')
39-
outputDirectory = file("build/shadow-source/javapoet")
41+
outputDirectory = javaPoetDir
4042
}
4143

4244
tasks.register('javapoetSourceJar', Jar) {
@@ -46,17 +48,19 @@ tasks.register('javapoetSourceJar', Jar) {
4648
from javapoetSource
4749
}
4850

51+
def objenesisConfig = configurations.objenesis
4952
tasks.register('objenesisRepackJar', ShadowJar) {
5053
archiveBaseName = 'spring-objenesis-repack'
5154
archiveVersion = objenesisVersion
52-
configurations = [project.configurations.objenesis]
55+
configurations = [objenesisConfig]
5356
relocate('org.objenesis', 'org.springframework.objenesis')
5457
}
5558

59+
def objenesisDir = project.file("build/shadow-source/objenesis")
5660
tasks.register('objenesisSource', ShadowSource) {
57-
configurations = [project.configurations.objenesis]
61+
configurations = [objenesisConfig]
5862
relocate('org.objenesis', 'org.springframework.objenesis')
59-
outputDirectory = file("build/shadow-source/objenesis")
63+
outputDirectory = objenesisDir
6064
}
6165

6266
tasks.register('objenesisSourceJar', Jar) {

0 commit comments

Comments
 (0)