Upgrade gradle 8.4

- Other than gradle itself, some changes are taken
  from main to support building samples with native.
- Fixes #1001

buildSrc/build.gradle

@@ -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 {

buildSrc/src/main/java/org/springframework/shell/gradle/SamplePlugin.java

@@ -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;
+	}
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,10 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# This is normally unused
-
+# shellcheck disable=SC2034
-APP_NAME="Gradle"
 APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
@@ -143,12 +143,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -205,6 +209,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+set EXIT_CODE=%ERRORLEVEL%
-exit /b 1
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

spring-shell-samples/spring-shell-samples.gradle

@@ -1,7 +1,5 @@
 plugins {
 	id 'org.springframework.shell.sample'
-	id 'org.springframework.boot'
-	id 'org.graalvm.buildtools.native'
 }
 
 description = 'Spring Shell Samples'
@@ -14,26 +12,3 @@ dependencies {
 	testImplementation 'org.awaitility:awaitility'
 }
 
-springBoot {
-	buildInfo()
-}
-
-if (project.hasProperty('springShellSampleE2E') && springShellSampleE2E.toBoolean()) {
-	bootJar {
-	   	archiveName = "$baseName.$extension"
-	}
-}
-
-graalvmNative {
-	metadataRepository {
-		enabled = true
-	}
-	binaries {
-		main {
-			if (project.hasProperty('springShellSampleMusl') && springShellSampleMusl.toBoolean()) {
-				buildArgs.add('--static')
-				buildArgs.add('--libc=musl')
-			}
-		}
-	}
-}