Skip to content

Commit 814c86c

Browse files
wilkinsonawilkinsona
committed
Raise the minimum supported version of Gradle to 7.3
Closes gh-28100
1 parent 4e884b2 commit 814c86c

File tree

50 files changed

+271
-552
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+271
-552
lines changed

Diff for: ‎buildSrc/src/main/java/org/springframework/boot/build/DeployedPlugin.java

+1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ public class DeployedPlugin implements Plugin<Project> {
3838
public static final String GENERATE_POM_TASK_NAME = "generatePomFileForMavenPublication";
3939

4040
@Override
41+
@SuppressWarnings("deprecation")
4142
public void apply(Project project) {
4243
project.getPlugins().apply(MavenPublishPlugin.class);
4344
project.getPlugins().apply(MavenRepositoryPlugin.class);

Diff for: ‎buildSrc/src/main/java/org/springframework/boot/build/MavenPublishingConventions.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import org.gradle.api.component.AdhocComponentWithVariants;
2323
import org.gradle.api.component.ConfigurationVariantDetails;
2424
import org.gradle.api.plugins.JavaPlugin;
25-
import org.gradle.api.plugins.JavaPluginConvention;
2625
import org.gradle.api.plugins.JavaPluginExtension;
2726
import org.gradle.api.publish.PublishingExtension;
2827
import org.gradle.api.publish.VariantVersionMappingStrategy;
@@ -115,9 +114,8 @@ private void customizeJavaMavenPublication(MavenPublication publication, Project
115114
*/
116115
private void addMavenOptionalFeature(Project project) {
117116
JavaPluginExtension extension = project.getExtensions().getByType(JavaPluginExtension.class);
118-
JavaPluginConvention convention = project.getConvention().getPlugin(JavaPluginConvention.class);
119117
extension.registerFeature("mavenOptional",
120-
(feature) -> feature.usingSourceSet(convention.getSourceSets().getByName("main")));
118+
(feature) -> feature.usingSourceSet(extension.getSourceSets().getByName("main")));
121119
AdhocComponentWithVariants javaComponent = (AdhocComponentWithVariants) project.getComponents()
122120
.findByName("java");
123121
javaComponent.addVariantsFromConfiguration(

Diff for: ‎buildSrc/src/main/java/org/springframework/boot/build/autoconfigure/AutoConfigurationPlugin.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import org.gradle.api.Project;
2525
import org.gradle.api.artifacts.Configuration;
2626
import org.gradle.api.plugins.JavaPlugin;
27-
import org.gradle.api.plugins.JavaPluginConvention;
27+
import org.gradle.api.plugins.JavaPluginExtension;
2828
import org.gradle.api.tasks.SourceSet;
2929

3030
import org.springframework.boot.build.DeployedPlugin;
@@ -66,7 +66,7 @@ public void apply(Project project) {
6666
.add(project.getDependencies().project(Collections.singletonMap("path",
6767
":spring-boot-project:spring-boot-tools:spring-boot-configuration-processor")));
6868
project.getTasks().create("autoConfigurationMetadata", AutoConfigurationMetadata.class, (task) -> {
69-
SourceSet main = project.getConvention().getPlugin(JavaPluginConvention.class).getSourceSets()
69+
SourceSet main = project.getExtensions().getByType(JavaPluginExtension.class).getSourceSets()
7070
.getByName(SourceSet.MAIN_SOURCE_SET_NAME);
7171
task.setSourceSet(main);
7272
task.dependsOn(main.getClassesTaskName());

Diff for: ‎buildSrc/src/main/java/org/springframework/boot/build/bom/BomPlugin.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
import java.util.Set;
2222
import java.util.stream.Collectors;
2323

24+
import groovy.namespace.QName;
2425
import groovy.util.Node;
25-
import groovy.xml.QName;
2626
import org.gradle.api.Plugin;
2727
import org.gradle.api.Project;
2828
import org.gradle.api.artifacts.Configuration;

Diff for: ‎buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/UpgradeBom.java

+1
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ public String getMilestone() {
8484
}
8585

8686
@TaskAction
87+
@SuppressWarnings("deprecation")
8788
void upgradeDependencies() {
8889
GitHubRepository repository = createGitHub().getRepository(this.bom.getUpgrade().getGitHub().getOrganization(),
8990
this.bom.getUpgrade().getGitHub().getRepository());

Diff for: ‎buildSrc/src/main/java/org/springframework/boot/build/context/properties/ConfigurationPropertiesPlugin.java

+4-7
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,15 @@
1616

1717
package org.springframework.boot.build.context.properties;
1818

19-
import java.io.File;
2019
import java.util.Collections;
21-
import java.util.concurrent.Callable;
2220
import java.util.stream.Collectors;
2321

2422
import org.gradle.api.Plugin;
2523
import org.gradle.api.Project;
2624
import org.gradle.api.Task;
2725
import org.gradle.api.artifacts.Configuration;
2826
import org.gradle.api.plugins.JavaPlugin;
29-
import org.gradle.api.plugins.JavaPluginConvention;
27+
import org.gradle.api.plugins.JavaPluginExtension;
3028
import org.gradle.api.tasks.PathSensitivity;
3129
import org.gradle.api.tasks.SourceSet;
3230
import org.gradle.api.tasks.compile.JavaCompile;
@@ -74,13 +72,12 @@ private void addConfigurationProcessorDependency(Project project) {
7472
}
7573

7674
private void addMetadataArtifact(Project project) {
77-
SourceSet mainSourceSet = project.getConvention().getPlugin(JavaPluginConvention.class).getSourceSets()
75+
SourceSet mainSourceSet = project.getExtensions().getByType(JavaPluginExtension.class).getSourceSets()
7876
.getByName(SourceSet.MAIN_SOURCE_SET_NAME);
7977
project.getConfigurations().maybeCreate(CONFIGURATION_PROPERTIES_METADATA_CONFIGURATION_NAME);
8078
project.afterEvaluate((evaluatedProject) -> evaluatedProject.getArtifacts().add(
8179
CONFIGURATION_PROPERTIES_METADATA_CONFIGURATION_NAME,
82-
evaluatedProject.provider((Callable<File>) () -> new File(mainSourceSet.getJava().getOutputDir(),
83-
"META-INF/spring-configuration-metadata.json")),
80+
mainSourceSet.getJava().getDestinationDirectory().dir("META-INF/spring-configuration-metadata.json"),
8481
(artifact) -> artifact
8582
.builtBy(evaluatedProject.getTasks().getByName(mainSourceSet.getClassesTaskName()))));
8683
}
@@ -90,7 +87,7 @@ private void configureAdditionalMetadataLocationsCompilerArgument(Project projec
9087
.getByName(JavaPlugin.COMPILE_JAVA_TASK_NAME);
9188
((Task) compileJava).getInputs().files(project.getTasks().getByName(JavaPlugin.PROCESS_RESOURCES_TASK_NAME))
9289
.withPathSensitivity(PathSensitivity.RELATIVE).withPropertyName("processed resources");
93-
SourceSet mainSourceSet = project.getConvention().getPlugin(JavaPluginConvention.class).getSourceSets()
90+
SourceSet mainSourceSet = project.getExtensions().getByType(JavaPluginExtension.class).getSourceSets()
9491
.getByName(SourceSet.MAIN_SOURCE_SET_NAME);
9592
compileJava.getOptions().getCompilerArgs()
9693
.add("-Aorg.springframework.boot.configurationprocessor.additionalMetadataLocations=" + StringUtils

Diff for: ‎buildSrc/src/main/java/org/springframework/boot/build/log4j2/ReproducibleLog4j2PluginsDatAction.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public class ReproducibleLog4j2PluginsDatAction implements Action<JavaCompile> {
4141

4242
@Override
4343
public void execute(JavaCompile javaCompile) {
44-
File datFile = new File(javaCompile.getDestinationDir(),
44+
File datFile = new File(javaCompile.getDestinationDirectory().getAsFile().get(),
4545
"META-INF/org/apache/logging/log4j/core/config/plugins/Log4j2Plugins.dat");
4646
try {
4747
postProcess(datFile);

Diff for: ‎buildSrc/src/main/java/org/springframework/boot/build/mavenplugin/MavenExec.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public class MavenExec extends JavaExec {
4646
public MavenExec() throws IOException {
4747
setClasspath(mavenConfiguration(getProject()));
4848
args("--batch-mode");
49-
setMain("org.apache.maven.cli.MavenCli");
49+
getMainClass().set("org.apache.maven.cli.MavenCli");
5050
}
5151

5252
public void setProjectDir(File projectDir) {

Diff for: ‎buildSrc/src/main/java/org/springframework/boot/build/mavenplugin/MavenPluginPlugin.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
import org.gradle.api.model.ObjectFactory;
4343
import org.gradle.api.plugins.JavaLibraryPlugin;
4444
import org.gradle.api.plugins.JavaPlugin;
45-
import org.gradle.api.plugins.JavaPluginConvention;
45+
import org.gradle.api.plugins.JavaPluginExtension;
4646
import org.gradle.api.publish.PublishingExtension;
4747
import org.gradle.api.publish.maven.MavenPublication;
4848
import org.gradle.api.publish.maven.plugins.MavenPublishPlugin;
@@ -180,7 +180,7 @@ private MavenExec addGeneratePluginDescriptorTask(Project project, Jar jarTask,
180180
}
181181

182182
private SourceSet getMainSourceSet(Project project) {
183-
SourceSetContainer sourceSets = project.getConvention().getPlugin(JavaPluginConvention.class).getSourceSets();
183+
SourceSetContainer sourceSets = project.getExtensions().getByType(JavaPluginExtension.class).getSourceSets();
184184
return sourceSets.getByName(SourceSet.MAIN_SOURCE_SET_NAME);
185185
}
186186

Diff for: ‎buildSrc/src/main/java/org/springframework/boot/build/optional/OptionalDependenciesPlugin.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import org.gradle.api.Project;
2121
import org.gradle.api.artifacts.Configuration;
2222
import org.gradle.api.plugins.JavaPlugin;
23-
import org.gradle.api.plugins.JavaPluginConvention;
23+
import org.gradle.api.plugins.JavaPluginExtension;
2424
import org.gradle.api.tasks.SourceSetContainer;
2525

2626
/**
@@ -44,7 +44,7 @@ public void apply(Project project) {
4444
optional.setCanBeConsumed(false);
4545
optional.setCanBeResolved(false);
4646
project.getPlugins().withType(JavaPlugin.class, (javaPlugin) -> {
47-
SourceSetContainer sourceSets = project.getConvention().getPlugin(JavaPluginConvention.class)
47+
SourceSetContainer sourceSets = project.getExtensions().getByType(JavaPluginExtension.class)
4848
.getSourceSets();
4949
sourceSets.all((sourceSet) -> {
5050
project.getConfigurations().getByName(sourceSet.getCompileClasspathConfigurationName())

Diff for: ‎buildSrc/src/main/java/org/springframework/boot/build/test/IntegrationTestPlugin.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import org.gradle.api.Plugin;
2020
import org.gradle.api.Project;
2121
import org.gradle.api.plugins.JavaPlugin;
22-
import org.gradle.api.plugins.JavaPluginConvention;
22+
import org.gradle.api.plugins.JavaPluginExtension;
2323
import org.gradle.api.tasks.SourceSet;
2424
import org.gradle.api.tasks.SourceSetContainer;
2525
import org.gradle.api.tasks.testing.Test;
@@ -61,7 +61,7 @@ private void configureIntegrationTesting(Project project) {
6161
}
6262

6363
private SourceSet createSourceSet(Project project) {
64-
SourceSetContainer sourceSets = project.getConvention().getPlugin(JavaPluginConvention.class).getSourceSets();
64+
SourceSetContainer sourceSets = project.getExtensions().getByType(JavaPluginExtension.class).getSourceSets();
6565
SourceSet intTestSourceSet = sourceSets.create(INT_TEST_SOURCE_SET_NAME);
6666
SourceSet main = sourceSets.getByName(SourceSet.MAIN_SOURCE_SET_NAME);
6767
intTestSourceSet.setCompileClasspath(intTestSourceSet.getCompileClasspath().plus(main.getOutput()));

Diff for: ‎buildSrc/src/main/java/org/springframework/boot/build/test/SystemTestPlugin.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import org.gradle.api.Plugin;
2020
import org.gradle.api.Project;
2121
import org.gradle.api.plugins.JavaPlugin;
22-
import org.gradle.api.plugins.JavaPluginConvention;
22+
import org.gradle.api.plugins.JavaPluginExtension;
2323
import org.gradle.api.tasks.SourceSet;
2424
import org.gradle.api.tasks.SourceSetContainer;
2525
import org.gradle.api.tasks.testing.Test;
@@ -61,7 +61,7 @@ private void configureSystemTesting(Project project) {
6161
}
6262

6363
private SourceSet createSourceSet(Project project) {
64-
SourceSetContainer sourceSets = project.getConvention().getPlugin(JavaPluginConvention.class).getSourceSets();
64+
SourceSetContainer sourceSets = project.getExtensions().getByType(JavaPluginExtension.class).getSourceSets();
6565
SourceSet systemTestSourceSet = sourceSets.create(SYSTEM_TEST_SOURCE_SET_NAME);
6666
SourceSet mainSourceSet = sourceSets.getByName(SourceSet.MAIN_SOURCE_SET_NAME);
6767
systemTestSourceSet

Diff for: ‎gradle/wrapper/gradle-wrapper.jar

333 Bytes
Binary file not shown.

Diff for: ‎gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)