root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Polish Aggregate Javadoc task 

Closes gh-31173
This commit is contained in:
Brian Clozel 2023-09-07 15:29:25 +02:00
parent 7b5effecf3
commit 3686c457bb
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build.gradle
View File

@ -1,5 +1,5 @@
plugins {
id 'io.freefair.aspectj' version '8.2.2' apply false
id 'io.freefair.aspectj' version '8.3' apply false
// kotlinVersion is managed in gradle.properties
id 'org.jetbrains.kotlin.plugin.serialization' version "${kotlinVersion}" apply false
id 'org.jetbrains.dokka' version '1.8.20'
@ -18,6 +18,7 @@ ext {
configure(allprojects) { project ->
apply plugin: "org.springframework.build.localdev"
group = "org.springframework"
repositories {
mavenCentral()
maven {
@ -57,8 +58,6 @@ configure(allprojects - project(":framework-platform")) {
}
configure([rootProject] + javaProjects) { project ->
group = "org.springframework"
apply plugin: "java"
apply plugin: "java-test-fixtures"
apply plugin: 'org.springframework.build.conventions'

5
buildSrc/src/main/java/org/springframework/build/optional/OptionalDependenciesPlugin.java
View File

@ -19,6 +19,7 @@ package org.springframework.build.optional;
import org.gradle.api.Plugin;
import org.gradle.api.Project;
import org.gradle.api.artifacts.Configuration;
import org.gradle.api.plugins.JavaBasePlugin;
import org.gradle.api.plugins.JavaPlugin;
import org.gradle.api.plugins.JavaPluginExtension;
import org.gradle.api.tasks.SourceSetContainer;
@ -40,10 +41,10 @@ public class OptionalDependenciesPlugin implements Plugin<Project> {
@Override
public void apply(Project project) {
Configuration optional = project.getConfigurations().create("optional");
Configuration optional = project.getConfigurations().create(OPTIONAL_CONFIGURATION_NAME);
optional.setCanBeConsumed(false);
optional.setCanBeResolved(false);
project.getPlugins().withType(JavaPlugin.class, (javaPlugin) -> {
project.getPlugins().withType(JavaBasePlugin.class, (javaBasePlugin) -> {
SourceSetContainer sourceSets = project.getExtensions().getByType(JavaPluginExtension.class)
.getSourceSets();
sourceSets.all((sourceSet) -> {

6
framework-api/framework-api.gradle
View File

@ -1,6 +1,6 @@
plugins {
id 'java-platform'
id 'io.freefair.aggregate-javadoc' version '8.2.2'
id 'io.freefair.aggregate-javadoc' version '8.3'
}
description = "Spring Framework API Docs"
@ -14,7 +14,7 @@ repositories {
}
dependencies {
rootProject.subprojects.findAll { it.name.startsWith("spring-") }.each { moduleProject ->
moduleProjects.each { moduleProject ->
javadoc moduleProject
}
}
@ -34,12 +34,12 @@ javadoc {
addBooleanOption('Werror', true) // fail build on Javadoc warnings
}
maxMemory = "1024m"
destinationDir = file("$buildDir/docs/javadoc")
doFirst {
classpath += files(
// ensure the javadoc process can resolve types compiled from .aj sources
project(":spring-aspects").sourceSets.main.output
)
classpath += files(moduleProjects.collect { it.sourceSets.main.compileClasspath })
}
}