Skip to content

Commit 1125b1e

Browse files
authored
Merge pull request #560 from liutikas/upgradle-fixup
Upgrade to Gradle 8.8 and fix up deprecations
2 parents 2ac0986 + 123a6ba commit 1125b1e

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

build.gradle.kts

+3-3
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ tasks.test {
107107
.getOrElse(JavaVersion.current().majorVersion)
108108
languageVersion.set(JavaLanguageVersion.of(javaVersion))
109109
providers.gradleProperty("testJavaVendor").map {
110-
when (it.toLowerCase()) {
110+
when (it.lowercase()) {
111111
"oracle" -> vendor.set(JvmVendorSpec.ORACLE)
112112
"openjdk" -> vendor.set(JvmVendorSpec.ADOPTIUM)
113113
}
@@ -151,7 +151,7 @@ testReports.forEach { taskName, fileName ->
151151
inputs.files(tasks.processResources)
152152

153153
from("src/main/resources/org/gradle/profiler/report")
154-
into("$buildDir/test-html-report")
154+
into(layout.buildDirectory.dir("test-html-report"))
155155
rename("report-template.html", "test-report-${fileName}.html")
156156
filter { line ->
157157
if (line == "@@BENCHMARK_RESULT_JSON@@") dataFile.readText()
@@ -237,7 +237,7 @@ tasks.register("releaseToSdkMan") {
237237
val versionString = project.version.toString()
238238

239239
// We don't publish snapshots and alphas at all to SDKman.
240-
val isSnapshotOrAlphaRelease = versionString.toLowerCase(Locale.US).run { contains("snapshot") || contains("alpha") }
240+
val isSnapshotOrAlphaRelease = versionString.lowercase(Locale.US).run { contains("snapshot") || contains("alpha") }
241241
if (!isSnapshotOrAlphaRelease) {
242242
dependsOn(tasks.withType<SdkReleaseVersionTask>())
243243

buildSrc/src/main/kotlin/profiler.android-studio-setup.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ val unpackAndroidStudio = tasks.register<Copy>("unpackAndroidStudio") {
5757
relativePath = RelativePath(true, *relativePath.segments.drop(1).toTypedArray())
5858
}
5959
}
60-
into("$buildDir/android-studio")
60+
into(layout.buildDirectory.dir("android-studio"))
6161
}
6262

6363
val installAndroidSdk = tasks.register<InstallAndroidSdkTask>("installAndroidSdk") {

gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)