diff --git a/build.gradle.kts b/build.gradle.kts
index 4f441073..9285b3e8 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -107,7 +107,7 @@ tasks.test {
             .getOrElse(JavaVersion.current().majorVersion)
         languageVersion.set(JavaLanguageVersion.of(javaVersion))
         providers.gradleProperty("testJavaVendor").map {
-            when (it.toLowerCase()) {
+            when (it.lowercase()) {
                 "oracle" -> vendor.set(JvmVendorSpec.ORACLE)
                 "openjdk" -> vendor.set(JvmVendorSpec.ADOPTIUM)
             }
@@ -151,7 +151,7 @@ testReports.forEach { taskName, fileName ->
         inputs.files(tasks.processResources)
 
         from("src/main/resources/org/gradle/profiler/report")
-        into("$buildDir/test-html-report")
+        into(layout.buildDirectory.dir("test-html-report"))
         rename("report-template.html", "test-report-${fileName}.html")
         filter { line ->
             if (line == "@@BENCHMARK_RESULT_JSON@@") dataFile.readText()
@@ -237,7 +237,7 @@ tasks.register("releaseToSdkMan") {
     val versionString = project.version.toString()
 
     // We don't publish snapshots and alphas at all to SDKman.
-    val isSnapshotOrAlphaRelease = versionString.toLowerCase(Locale.US).run { contains("snapshot") || contains("alpha") }
+    val isSnapshotOrAlphaRelease = versionString.lowercase(Locale.US).run { contains("snapshot") || contains("alpha") }
     if (!isSnapshotOrAlphaRelease) {
         dependsOn(tasks.withType<SdkReleaseVersionTask>())
 
diff --git a/buildSrc/src/main/kotlin/profiler.android-studio-setup.gradle.kts b/buildSrc/src/main/kotlin/profiler.android-studio-setup.gradle.kts
index c12b2eb4..b0153fe8 100644
--- a/buildSrc/src/main/kotlin/profiler.android-studio-setup.gradle.kts
+++ b/buildSrc/src/main/kotlin/profiler.android-studio-setup.gradle.kts
@@ -57,7 +57,7 @@ val unpackAndroidStudio = tasks.register<Copy>("unpackAndroidStudio") {
             relativePath = RelativePath(true, *relativePath.segments.drop(1).toTypedArray())
         }
     }
-    into("$buildDir/android-studio")
+    into(layout.buildDirectory.dir("android-studio"))
 }
 
 val installAndroidSdk = tasks.register<InstallAndroidSdkTask>("installAndroidSdk") {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index b82aa23a..a4413138 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME