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

Update deprecated Gradle task creation #34617

Closed
wants to merge 1 commit into from
Closed

Update deprecated Gradle task creation #34617

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
4 changes: 2 additions & 2 deletions gradle/ide.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ if (project.name == "spring-oxm") {
}

// Include project specific settings
task eclipseSettings(type: Copy) {
tasks.register('eclipseSettings', Copy) {
from rootProject.files(
'src/eclipse/org.eclipse.core.resources.prefs',
'src/eclipse/org.eclipse.jdt.core.prefs',
Expand All @@ -107,7 +107,7 @@ task eclipseSettings(type: Copy) {
outputs.upToDateWhen { false }
}

task cleanEclipseSettings(type: Delete) {
tasks.register('cleanEclipseSettings', Delete) {
delete project.file('.settings/org.eclipse.core.resources.prefs')
delete project.file('.settings/org.eclipse.jdt.core.prefs')
delete project.file('.settings/org.eclipse.jdt.ui.prefs')
Expand Down
5 changes: 3 additions & 2 deletions gradle/spring-module.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,14 +87,15 @@ javadoc {
logging.captureStandardOutput LogLevel.INFO // suppress "## warnings" message
}

task sourcesJar(type: Jar, dependsOn: classes) {
tasks.register('sourcesJar', Jar) {
dependsOn classes
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
archiveClassifier.set("sources")
from sourceSets.main.allSource
// Don't include or exclude anything explicitly by default. See SPR-12085.
}

task javadocJar(type: Jar) {
tasks.register('javadocJar', Jar) {
archiveClassifier.set("javadoc")
from javadoc
}
Expand Down
12 changes: 6 additions & 6 deletions spring-core/spring-core.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,40 +25,40 @@ configurations {
graalvm
}

task javapoetRepackJar(type: ShadowJar) {
tasks.register('javapoetRepackJar', ShadowJar) {
archiveBaseName = 'spring-javapoet-repack'
archiveVersion = javapoetVersion
configurations = [project.configurations.javapoet]
relocate('com.squareup.javapoet', 'org.springframework.javapoet')
}

task javapoetSource(type: ShadowSource) {
tasks.register('javapoetSource', ShadowSource) {
configurations = [project.configurations.javapoet]
relocate('com.squareup.javapoet', 'org.springframework.javapoet')
outputDirectory = file("build/shadow-source/javapoet")
}

task javapoetSourceJar(type: Jar) {
tasks.register('javapoetSourceJar', Jar) {
archiveBaseName = 'spring-javapoet-repack'
archiveVersion = javapoetVersion
archiveClassifier = 'sources'
from javapoetSource
}

task objenesisRepackJar(type: ShadowJar) {
tasks.register('objenesisRepackJar', ShadowJar) {
archiveBaseName = 'spring-objenesis-repack'
archiveVersion = objenesisVersion
configurations = [project.configurations.objenesis]
relocate('org.objenesis', 'org.springframework.objenesis')
}

task objenesisSource(type: ShadowSource) {
tasks.register('objenesisSource', ShadowSource) {
configurations = [project.configurations.objenesis]
relocate('org.objenesis', 'org.springframework.objenesis')
outputDirectory = file("build/shadow-source/objenesis")
}

task objenesisSourceJar(type: Jar) {
tasks.register('objenesisSourceJar', Jar) {
archiveBaseName = 'spring-objenesis-repack'
archiveVersion = objenesisVersion
archiveClassifier = 'sources'
Expand Down