Upgrade to gradle 8.6

build-logic/basics/build.gradle.kts

@@ -1,3 +1,7 @@
 plugins {
     `kotlin-dsl`
 }
+
+tasks.withType<JavaCompile>().configureEach {
+    options.release.set((project.property("targetJavaVersion") as String).toInt())
+}

build-logic/code-quality/build.gradle.kts

@@ -10,11 +10,21 @@ repositories {
 
 dependencies {
     implementation("org.sonarqube:org.sonarqube.gradle.plugin:4.4.1.3373")
-    implementation("com.github.autostyle:autostyle-plugin-gradle:3.2")
+    implementation("com.github.autostyle:autostyle-plugin-gradle:4.0")
+}
+
+kotlin {
+    jvmToolchain {
+        languageVersion.set(JavaLanguageVersion.of(project.property("jdkBuildVersion") as String))
+    }
+}
+
+tasks.withType<JavaCompile>().configureEach {
+    options.release.set((project.property("targetJavaVersion") as String).toInt())
 }
 
 tasks.withType<KotlinCompile>().configureEach {
     kotlinOptions {
-        jvmTarget = "11"
+        jvmTarget = project.property("targetJavaVersion") as String
     }
 }

build-logic/jvm/build.gradle.kts

@@ -15,8 +15,18 @@ dependencies {
     implementation("org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.6.21")
 }
 
+kotlin {
+    jvmToolchain {
+        languageVersion.set(JavaLanguageVersion.of(project.property("jdkBuildVersion") as String))
+    }
+}
+
+tasks.withType<JavaCompile>().configureEach {
+    options.release.set((project.property("targetJavaVersion") as String).toInt())
+}
+
 tasks.withType<KotlinCompile>().configureEach {
     kotlinOptions {
-        jvmTarget = "11"
+        jvmTarget = project.property("targetJavaVersion") as String
     }
 }

build-logic/jvm/src/main/kotlin/testng.java.gradle.kts

@@ -9,11 +9,13 @@ plugins {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(project.property("jdkBuildVersion") as String))
+    }
 }
 
 tasks.withType<JavaCompile>().configureEach {
+    options.release.set((project.property("targetJavaVersion") as String).toInt())
     inputs.property("java.version", System.getProperty("java.version"))
     inputs.property("java.vendor", System.getProperty("java.vendor"))
     inputs.property("java.vm.version", System.getProperty("java.vm.version"))

build-logic/jvm/src/main/kotlin/testng.kotlin-library.gradle.kts

@@ -10,8 +10,12 @@ dependencies {
     testImplementation("org.jetbrains.kotlin:kotlin-stdlib")
 }
 
+tasks.withType<JavaCompile>().configureEach {
+    options.release.set((project.property("targetJavaVersion") as String).toInt())
+}
+
 tasks.withType<KotlinCompile>().configureEach {
     kotlinOptions {
-        jvmTarget = "11"
+        jvmTarget = project.property("targetJavaVersion") as String
     }
 }

build-logic/publishing/build.gradle.kts

@@ -15,8 +15,18 @@ dependencies {
     implementation("org.jetbrains.kotlin:kotlin-gradle-plugin")
 }
 
+kotlin {
+    jvmToolchain {
+        languageVersion.set(JavaLanguageVersion.of(project.property("jdkBuildVersion") as String))
+    }
+}
+
+tasks.withType<JavaCompile>().configureEach {
+    options.release.set((project.property("targetJavaVersion") as String).toInt())
+}
+
 tasks.withType<KotlinCompile>().configureEach {
     kotlinOptions {
-        jvmTarget = "11"
+        jvmTarget = project.property("targetJavaVersion") as String
     }
 }

build-logic/publishing/src/main/kotlin/buildlogic/FirstLayerDependencies.kt

@@ -9,6 +9,7 @@ import org.gradle.api.artifacts.result.UnresolvedDependencyResult
 import org.gradle.api.plugins.ExtensionAware
 import org.gradle.api.plugins.JavaPluginExtension
 import org.gradle.kotlin.dsl.the
+import java.util.*
 
 /**
  * Walks over the dependency tree and selects the first non-shaded dependencies.
@@ -57,7 +58,8 @@ fun Project.firstLayerDependencies(
     vararg rest: Configuration,
 ): Configuration {
     val optionalFeatures = (the<JavaPluginExtension>() as ExtensionAware).the<OptionalFeaturesExtension>()
-    val usageKind = usage.removePrefix("java-").capitalize()
+    val usageKind = usage.removePrefix("java-")
+        .replaceFirstChar { if (it.isLowerCase()) it.titlecase(Locale.getDefault()) else it.toString() }
 
     val allDependencies = configurations.create(conf.name + "${usageKind}AllDependencies") {
         description = "Resolves the list of all dependencies for $usage in ${conf.name}"

gradle.properties

@@ -1,11 +1,12 @@
 org.gradle.parallel=true
-systemProp.org.gradle.kotlin.dsl.precompiled.accessors.strict=true
 kotlin.code.style=official
 # See https://kotlinlang.org/docs/gradle.html#dependency-on-the-standard-library
 # Note: testng.kotlin-library.gradle.kts adds kotlin-stdlib for testImplementation
 kotlin.stdlib.default.dependency=false
 
 testng.version=7.10.0
+systemProp.org.gradle.project.targetJavaVersion=11
+systemProp.org.gradle.project.jdkBuildVersion=17
 
 group=org.testng
 
@@ -21,3 +22,7 @@ scm.url=https\://github.com/testng-team/testng.git
 nexus.profile=org.testng
 github.organization=testng-team
 github.repository=testng
+
+# Fix Gradle warning with sonarqube plugin v4.x
+# See https://community.sonarsource.com/t/sonarscanner-for-gradle-you-can-now-decide-when-to-compile/102069
+systemProp.sonar.gradle.skipCompile=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,4 +1,7 @@
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists