Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade to Gradle 8.8 and fix up deprecations #560

Merged
merged 1 commit into from
Jun 11, 2024
Merged

Upgrade to Gradle 8.8 and fix up deprecations #560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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>())

Expand Down
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/profiler.android-studio-setup.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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") {
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Loading