Upgrade gradle 8.4

- Other than gradle itself, some changes are taken
  from main to support building samples with native.
- Fixes #1001
This commit is contained in:
Janne Valkealahti
2024-02-13 15:10:08 +00:00
parent ee17aa2a93
commit c73efa3ceb
7 changed files with 83 additions and 37 deletions

View File

@@ -19,14 +19,17 @@ ext {
def properties = new Properties()
properties.load(it)
set("springBootVersion", properties["springBootVersion"])
set("nativeBuildToolsVersion", properties["nativeBuildToolsVersion"])
}
}
dependencies {
implementation(platform("org.springframework.boot:spring-boot-dependencies:${springBootVersion}"))
implementation "org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}"
implementation("org.springframework:spring-core")
implementation 'org.asciidoctor:asciidoctor-gradle-jvm:3.3.2'
implementation 'org.jfrog.buildinfo:build-info-extractor-gradle:4.29.0'
implementation "org.graalvm.buildtools:native-gradle-plugin:${nativeBuildToolsVersion}"
}
gradlePlugin {

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2022 the original author or authors.
* Copyright 2022-2023 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.
@@ -15,21 +15,75 @@
*/
package org.springframework.shell.gradle;
import org.graalvm.buildtools.gradle.NativeImagePlugin;
import org.graalvm.buildtools.gradle.dsl.GraalVMExtension;
import org.gradle.api.Plugin;
import org.gradle.api.Project;
import org.gradle.api.plugins.JavaPlugin;
import org.gradle.api.plugins.PluginManager;
import org.springframework.boot.gradle.dsl.SpringBootExtension;
import org.springframework.boot.gradle.plugin.SpringBootPlugin;
import org.springframework.boot.gradle.tasks.bundling.BootJar;
/**
* @author Janne Valkealahti
*/
class SamplePlugin implements Plugin<Project> {
private static final String NATIVE = "springShellSampleNative";
private static final String E2E = "springShellSampleE2E";
private static final String MUSL = "springShellSampleMusl";
@Override
public void apply(Project project) {
PluginManager pluginManager = project.getPluginManager();
pluginManager.apply(JavaPlugin.class);
pluginManager.apply(ManagementConfigurationPlugin.class);
pluginManager.apply(SpringBootPlugin.class);
if (isEnabled(project, NATIVE)) {
pluginManager.apply(NativeImagePlugin.class);
customizeNative(project);
}
configureBootJar(project);
configureBootBuildInfo(project);
new JavaConventions().apply(project);
}
private void configureBootJar(Project project) {
if (isEnabled(project, E2E)) {
project.getTasks().withType(BootJar.class, (bootJar) -> {
String name = String.format("%s.%s", bootJar.getArchiveBaseName().get(),
bootJar.getArchiveExtension().get());
bootJar.getArchiveFileName().set(name);
});
}
}
private void configureBootBuildInfo(Project project) {
SpringBootExtension extension = project.getExtensions().getByType(SpringBootExtension.class);
extension.buildInfo(buildInfo -> {
buildInfo.getExcludes().add("time");
});
}
private void customizeNative(Project project) {
project.getPlugins().withType(NativeImagePlugin.class).all(nativePlugin -> {
configureGraalVmExtension(project);
});
}
private void configureGraalVmExtension(Project project) {
GraalVMExtension extension = project.getExtensions().getByType(GraalVMExtension.class);
if (isEnabled(project, MUSL)) {
extension.getBinaries().getByName(NativeImagePlugin.NATIVE_MAIN_EXTENSION).buildArgs("--static",
"--libc=musl");
}
}
private boolean isEnabled(Project project, String property) {
if (project.hasProperty(property)) {
return Boolean.valueOf(String.valueOf(project.findProperty(property)));
}
return false;
}
}