Skip to content

Commit d58aebd

Browse files
authored
update Gradle to 8.3-rc-3 (#5149)
1 parent 71c4772 commit d58aebd

File tree

7 files changed

+13
-11
lines changed

7 files changed

+13
-11
lines changed

build-logic/src/main/kotlin/JapiCmp.kt

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
import okhttp3.OkHttpClient
23
import okhttp3.Request
34
import org.gradle.api.DefaultTask
@@ -43,7 +44,8 @@ object JapiCmp {
4344
}
4445

4546
this.artifact = artifact
46-
output.set(File(buildDir, "japicmp/cache/$artifact"))
47+
48+
output.set(File(layout.buildDirectory.asFile.get(), "japicmp/cache/$artifact"))
4749
}
4850

4951
// TODO: Make this lazy
@@ -62,8 +64,8 @@ object JapiCmp {
6264
packageExcludes = listOf("*.internal*")
6365
onlyModified = true
6466
failOnSourceIncompatibility = false
65-
htmlOutputFile = file("$buildDir/reports/japicmp.html")
66-
txtOutputFile = file("$buildDir/reports/japicmp.txt")
67+
htmlOutputFile = file("${layout.buildDirectory.asFile.get()}/reports/japicmp.html")
68+
txtOutputFile = file("${layout.buildDirectory.asFile.get()}/reports/japicmp.txt")
6769
}
6870
tasks.register("checkJapicmp", me.champeau.gradle.japicmp.JapicmpTask::class.java) {
6971
dependsOn(downloadBaselineJarTaskProvider)
@@ -73,8 +75,8 @@ object JapiCmp {
7375
packageExcludes = listOf("*.internal*")
7476
onlyModified = true
7577
failOnSourceIncompatibility = true
76-
htmlOutputFile = file("$buildDir/reports/japicmp.html")
77-
txtOutputFile = file("$buildDir/reports/japicmp.txt")
78+
htmlOutputFile = file("${layout.buildDirectory.asFile.get()}/reports/japicmp.html")
79+
txtOutputFile = file("${layout.buildDirectory.asFile.get()}/reports/japicmp.txt")
7880
}
7981
}
8082
}

build.gradle.kts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import JapiCmp.configureJapiCmp
2-
import java.util.Locale
32

43
plugins {
54
id("apollo.library") apply false
@@ -102,7 +101,7 @@ tasks.register("ciBuild") {
102101
rootProject.configureDokka()
103102
tasks.named("dokkaHtmlMultiModule").configure {
104103
this as org.jetbrains.dokka.gradle.DokkaMultiModuleTask
105-
outputDirectory.set(buildDir.resolve("dokkaHtml/kdoc"))
104+
outputDirectory.set(layout.buildDirectory.asFile.get().resolve("dokkaHtml/kdoc"))
106105
}
107106

108107
tasks.named("dependencyUpdates").configure {

gradle/wrapper/gradle-wrapper.jar

346 Bytes
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
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.2.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-rc-3-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,8 @@ done
8383
# This is normally unused
8484
# shellcheck disable=SC2034
8585
APP_BASE_NAME=${0##*/}
86-
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
86+
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
87+
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
8788

8889
# Use the maximum available, or set MAX_FD != -1 to use that value.
8990
MAX_FD=maximum

intellij-plugin/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ tasks {
137137
}
138138
}
139139

140-
val mockJdkRoot = buildDir.resolve("mockJDK")
140+
val mockJdkRoot = layout.buildDirectory.asFile.get().resolve("mockJDK")
141141

142142
// Setup fake JDK for maven dependencies to work
143143
// See https://jetbrains-platform.slack.com/archives/CPL5291JP/p1664105522154139 and https://youtrack.jetbrains.com/issue/IJSDK-321

libraries/apollo-gradle-plugin/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ tasks.register("cleanStaleTestProjects") {
117117
/**
118118
* Remove stale testProject directories
119119
*/
120-
val buildFiles = buildDir.listFiles()
120+
val buildFiles = layout.buildDirectory.asFile.get().listFiles()
121121
doFirst {
122122
buildFiles?.forEach {
123123
if (it.isDirectory && it.name.startsWith("testProject")) {

0 commit comments

Comments
 (0)