Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade build to Gradle 8.10

Browse Source 
Closes gh-41980
This commit is contained in:
Andy Wilkinson
2024-08-21 12:51:23 +01:00
parent 275d366bec
commit d756bf4e86
24 changed files with 99 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
buildSrc/src/main/java/org/springframework/boot/build/KotlinConventions.java
View File

@@ -51,7 +51,7 @@ class KotlinConventions {
void apply(Project project) {
project.getPlugins().withId("org.jetbrains.kotlin.jvm", (plugin) -> {
project.getTasks().withType(KotlinCompile.class, this::configure);
configureDokkatoo(project);
project.getPlugins().withType(DokkatooHtmlPlugin.class, (dokkatooPlugin) -> configureDokkatoo(project));
});
}
@@ -67,7 +67,6 @@ class KotlinConventions {
}
private void configureDokkatoo(Project project) {
project.getPlugins().apply(DokkatooHtmlPlugin.class);
DokkatooExtension dokkatoo = project.getExtensions().getByType(DokkatooExtension.class);
dokkatoo.getDokkatooSourceSets().named(SourceSet.MAIN_SOURCE_SET_NAME).configure((sourceSet) -> {
sourceSet.getSourceRoots().setFrom(project.file("src/main/kotlin"));

20
buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/InteractiveUpgradeResolver.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2023 the original author or authors.
* Copyright 2012-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
package org.springframework.boot.build.bom.bomr;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
@@ -58,12 +59,17 @@ public final class InteractiveUpgradeResolver implements UpgradeResolver {
if (libraryWithVersionOptions.getVersionOptions().isEmpty()) {
return null;
}
VersionOption current = new VersionOption(libraryWithVersionOptions.getLibrary().getVersion().getVersion());
VersionOption selected = this.userInputHandler.selectOption(
libraryWithVersionOptions.getLibrary().getName() + " "
+ libraryWithVersionOptions.getLibrary().getVersion().getVersion(),
libraryWithVersionOptions.getVersionOptions(), current);
return (selected.equals(current)) ? null
VersionOption defaultOption = new VersionOption(
libraryWithVersionOptions.getLibrary().getVersion().getVersion());
VersionOption selected = this.userInputHandler.askUser((questions) -> {
String question = libraryWithVersionOptions.getLibrary().getName() + " "
+ libraryWithVersionOptions.getLibrary().getVersion().getVersion();
List<VersionOption> options = new ArrayList<>();
options.add(defaultOption);
options.addAll(libraryWithVersionOptions.getVersionOptions());
return questions.selectOption(question, options, defaultOption);
}).get();
return (selected.equals(defaultOption)) ? null
: new Upgrade(libraryWithVersionOptions.getLibrary(), selected.getVersion());
}

2
buildSrc/src/main/java/org/springframework/boot/build/test/DockerTestPlugin.java
View File

@@ -71,6 +71,8 @@ public class DockerTestPlugin implements Plugin<Project> {
.add(project.getConfigurations()
.getByName(dockerTestSourceSet.getRuntimeClasspathConfigurationName())));
});
project.getDependencies()
.add(dockerTestSourceSet.getRuntimeOnlyConfigurationName(), "org.junit.platform:junit-platform-launcher");
}
private SourceSet createSourceSet(Project project) {

4
buildSrc/src/main/java/org/springframework/boot/build/test/IntegrationTestPlugin.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2023 the original author or authors.
* Copyright 2012-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -58,6 +58,8 @@ public class IntegrationTestPlugin implements Plugin<Project> {
eclipse.classpath((classpath) -> classpath.getPlusConfigurations()
.add(project.getConfigurations().getByName(intTestSourceSet.getRuntimeClasspathConfigurationName())));
});
project.getDependencies()
.add(intTestSourceSet.getRuntimeOnlyConfigurationName(), "org.junit.platform:junit-platform-launcher");
}
private SourceSet createSourceSet(Project project) {