chore: bump Gradle to 8.1.1

buildSrc/build.gradle.kts

@@ -38,11 +38,6 @@ allprojects {
 fun Project.applyKotlinProjectConventions() {
     apply(plugin = "org.gradle.kotlin.kotlin-dsl")
 
-    tasks.withType<KotlinCompile> {
-        kotlinOptions {
-            jvmTarget = "1.8"
-        }
-    }
     apply(plugin = "com.github.autostyle")
     autostyle {
         kotlin {

buildSrc/checksum.xml

@@ -45,9 +45,15 @@
     <dependency group='org.gradle.kotlin' module='gradle-kotlin-dsl-plugins' version='2.4.1'>
       <sha512>438E982D2C40426C18E4953AFA3A88A6A5BB69D37D11A60CFF03F28E8ACABD1009B5F10D07D99F61470DDDE194F489EA01425BB4D3AF798B10A2954E6D0ED095</sha512>
     </dependency>
+    <dependency group='org.gradle.kotlin' module='gradle-kotlin-dsl-plugins' version='4.0.7'>
+      <sha512>2304C8B72245837B42332431311970083BF0E03CA13128808AD8B4739ECDCDC43BF089256F6ED29BFD31FE859DA76BBA3FB61737EF0B8A380C75AA67AF7A8382</sha512>
+    </dependency>
     <dependency group='org.jetbrains.kotlin' module='kotlin-gradle-plugin' version='1.7.10'>
       <sha512>CB887D0053A5C1656260BC77003BCAE612CAA018933CB7A752EC2A87AB571EA0CD683905436771ED1982A8DDE15299F861C513CC73A83E1C0F31F1154095D11D</sha512>
     </dependency>
+    <dependency group='org.jetbrains.kotlin' module='kotlin-gradle-plugin' version='1.8.10'>
+      <sha512>5BA8B33D023D112BCF170B49CF66610A1A3EB3DEBF0D028065E89AE40B23C55380D329B354E1698B44912FA78935294B9F7584AFA6FCE995F12CE1D1D0A329FC</sha512>
+    </dependency>
     <dependency group='org.jetbrains.kotlin' module='kotlin-sam-with-receiver' version='1.7.10'>
       <sha512>5A1FF4989B370946633B6BB2BE9E42729AE8CA323D59444F149EAB1AFC199AEED8ADC35199C672DB153AAA7D8E670C2FD9A9B78A36EC02130A342999943EB4B9</sha512>
     </dependency>

gradle/wrapper/gradle-wrapper.properties

@@ -17,8 +17,8 @@
 
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=7ba68c54029790ab444b39d7e293d3236b2632631fb5f2e012bb28b4ff669e4b
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionSha256Sum=e111cb9948407e26351227dabce49822fb88c37ee72f1d1582a69c68af2e702f
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle.kts

@@ -155,6 +155,8 @@ val expectedSha512 = mapOf(
         to "gradle-enterprise-gradle-plugin-3.8.1.jar",
     "B795B889E3E2EC6D3E3DEB7429345A62B3FCCB4E51B88014AA77FBC3F61D3BC4307E023C83B08FEDA49BF2EAC6B99A48D2995CB9425E5C3E76BBE25D4170BDC8"
         to "gradle-enterprise-gradle-plugin-3.11.4.jar",
+    "AFC0F3E5B78359131E2BF6C24A128F1CE76F2D128F38DFA8C01F7CF74D1695527C8E953E4B6E7C3ACD925CC03A50845A53B84359AC2B0F5C1F233355E45186D1"
+        to "gradle-enterprise-gradle-plugin-3.12.6.jar",
     "4E240B7811EF90C090E83A181DACE41DA487555E4136221861B0060F9AF6D8B316F2DD0472F747ADB98CA5372F46055456EF04BDC0C3992188AB13302922FCE9"
         to "bcpg-jdk15on-1.70.jar",
     "7DCCFC636EE4DF1487615818CFA99C69941081DF95E8EF1EAF4BCA165594DFF9547E3774FD70DE3418ABACE77D2C45889F70BCD2E6823F8539F359E68EAF36D1"

src/dist-check/build.gradle.kts

@@ -119,7 +119,7 @@ inline fun <reified T : BatchTest> createBatchTask(
 ) =
     tasks.register(
         "batch" + (if (T::class == BatchTestServer::class) "Server" else "") +
-            name.capitalize() + suffix.capitalize(),
+            name.replaceFirstChar { it.titlecaseChar() } + suffix.replaceFirstChar { it.titlecaseChar() },
         T::class
     ) {
         group = when {

src/dist/build.gradle.kts

@@ -202,7 +202,7 @@ val verifyReleaseDependencies by tasks.registering {
             sb.append("\n  ${expected.size} => ${libs.size} files")
             sb.append(" (${if (libs.size > expected.size) "+" else "-"}${(libs.size - expected.size).absoluteValue})")
         }
-        sb.appendln()
+        sb.appendLine()
         for (dep in (libs.keys + expected.keys).sortedWith(caseInsensitive)) {
             val old = expected[dep]
             val new = libs[dep]
@@ -270,6 +270,9 @@ val copyBinLibs by tasks.registering(Copy::class) {
     // Can't use $rootDir since Gradle somehow reports .gradle/caches/ as "always modified"
     rootSpec.into("$rootDir/bin")
     with(binLibs)
+    // :src:config:jar conflicts with copyBinLibs on bin, bin/templates, bin/report-template folders
+    // so we add explicit ordering
+    mustRunAfter(":src:config:jar")
 }
 
 val createDist by tasks.registering {
@@ -320,9 +323,9 @@ fun createAnakiaTask(
                 parentFile.run { isDirectory || mkdirs() } || throw IllegalStateException("Unable to create directory $parentFile")
 
                 writer().use {
-                    it.appendln("# Auto-generated from $velocityProperties to pass absolute path to Velocity")
+                    it.appendLine("# Auto-generated from $velocityProperties to pass absolute path to Velocity")
                     for (line in lines) {
-                        it.appendln(line)
+                        it.appendLine(line)
                     }
                 }
             }
@@ -563,7 +566,7 @@ for (type in listOf("binary", "source")) {
         break
     }
     for (archive in listOf(Zip::class, Tar::class)) {
-        val taskName = "dist${archive.simpleName}${type.replace("binary", "").capitalize()}"
+        val taskName = "dist${archive.simpleName}${type.replace("binary", "").replaceFirstChar { it.titlecaseChar() }}"
         val archiveTask = tasks.register(taskName, archive) {
             val eol = if (archive == Tar::class) LineEndings.LF else LineEndings.CRLF
             group = distributionGroup
@@ -610,7 +613,7 @@ val runGui by tasks.registering(JavaExec::class) {
     dependsOn(createDist)
 
     workingDir = File(project.rootDir, "bin")
-    main = "org.apache.jmeter.NewDriver"
+    mainClass.set("org.apache.jmeter.NewDriver")
     classpath("$rootDir/bin/ApacheJMeter.jar")
     jvmArgs("-Xss256k")
     jvmArgs("-XX:MaxMetaspaceSize=256m")

xdocs/changes.xml

@@ -115,7 +115,7 @@ Summary
   <li><pr>5725</pr>Update JSoup to 1.15.3 (from 1.15.1)</li>
   <li><pr>5725</pr>Update Apache commons-net to 3.9.0 (from 3.8.0)</li>
   <li><pr>5725</pr>Update XStream to 1.4.20 (from 1.4.19)</li>
-  <li><pr>5763</pr>Updated Gradle to 7.3 (from 7.2)</li>
+  <li><pr>5763</pr>Updated Gradle to 8.1.1 (from 7.2)</li>
 </ul>
 
  <!-- =================== Bug fixes =================== -->