Upgrade to Gradle 8.5 (#181)

build.gradle.kts

@@ -38,33 +38,28 @@ dependencies {
     testImplementation(libs.truth)
 }
 
-configure<JavaPluginExtension> {
-    sourceCompatibility = targetJavaVersion
-    targetCompatibility = targetJavaVersion
-}
-
 gradlePlugin {
+    website.set(ProjectInfo.URL)
+    vcsUrl.set(ProjectInfo.URL)
     plugins {
         create("buf") {
             id = "build.buf"
             implementationClass = "build.buf.gradle.BufPlugin"
             displayName = ProjectInfo.NAME
             description = ProjectInfo.DESCRIPTION
+            tags.set(listOf("protobuf", "kotlin", "buf"))
         }
     }
 }
 
-pluginBundle {
-    website = ProjectInfo.URL
-    vcsUrl = ProjectInfo.URL
-    description = ProjectInfo.DESCRIPTION
-    tags = listOf("protobuf", "kotlin", "buf")
-}
-
 ext[GRADLE_PUBLISH_KEY] = System.getenv("GRADLE_PORTAL_PUBLISH_KEY")
 ext[GRADLE_PUBLISH_SECRET] = System.getenv("GRADLE_PORTAL_PUBLISH_SECRET")
 
-val targetJavaVersion = JavaVersion.VERSION_1_8
+kotlin {
+    jvmToolchain {
+        languageVersion.set(JavaLanguageVersion.of(11))
+    }
+}
 
 tasks {
     named("publishPlugins") {
@@ -78,7 +73,6 @@ tasks {
     withType<KotlinCompile> {
         kotlinOptions {
             allWarningsAsErrors = true
-            jvmTarget = targetJavaVersion.toString()
         }
     }
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-milestone-1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 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
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 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
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+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

settings.gradle.kts

@@ -2,6 +2,7 @@ buildscript { repositories { gradlePluginPortal() } }
 
 plugins {
     id("io.alcide.gradle-semantic-build-versioning") version "4.2.2"
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
 }
 
 rootProject.name = "buf-gradle-plugin"

src/main/kotlin/build/buf/gradle/BufSupport.kt

@@ -21,7 +21,7 @@ import java.nio.charset.StandardCharsets
 const val BUF_BINARY_CONFIGURATION_NAME = "bufTool"
 
 internal fun Project.configureBufDependency() {
-    val os = System.getProperty("os.name").toLowerCase()
+    val os = System.getProperty("os.name").lowercase()
     val osPart =
         when {
             os.startsWith("windows") -> "windows"
@@ -31,7 +31,7 @@ internal fun Project.configureBufDependency() {
         }
 
     val archPart =
-        when (val arch = System.getProperty("os.arch").toLowerCase()) {
+        when (val arch = System.getProperty("os.arch").lowercase()) {
             in setOf("x86_64", "amd64") -> "x86_64"
             in setOf("arm64", "aarch64") -> "aarch_64"
             else -> error("unsupported arch: $arch")

src/main/kotlin/build/buf/gradle/OutputSupport.kt

@@ -16,12 +16,11 @@ package build.buf.gradle
 
 import org.gradle.api.Project
 import org.gradle.api.Task
-import java.io.File
 
 const val BUF_BUILD_DIR = "bufbuild"
 
 internal val Project.bufbuildDir
-    get() = File(buildDir, BUF_BUILD_DIR)
+    get() = layout.buildDirectory.dir(BUF_BUILD_DIR).get().asFile
 
 internal val Task.bufbuildDir
     get() = project.bufbuildDir

src/test/kotlin/build/buf/gradle/AbstractBufIntegrationTest.kt

@@ -45,7 +45,7 @@ abstract class AbstractBufIntegrationTest : IntegrationTest {
                 .replace("--", "")
                 .replace(" ", "_")
                 .replace("-", "_")
-                .toLowerCase(Locale.US)
+                .lowercase(Locale.US)
         val fixture = File("src/test/resources/${testInfo.testClass.get().simpleName}/$testName")
         assertWithMessage("Directory ${fixture.path} does not exist").that(fixture.exists()).isTrue()
         assertWithMessage("Failed to copy test fixture files").that(fixture.copyRecursively(projectDir)).isTrue()