Skip to content

Commit fa93fad

Browse files
Update Gradle [8.2.1 -> 8.7], compatible with Kotlin 2.0 #215
- Replace deprecated buildDir - Also use task references for more explicit task ordering.
1 parent 21b65c6 commit fa93fad

8 files changed

Lines changed: 39 additions & 39 deletions

File tree

gradle/wrapper/gradle-wrapper.jar

-19.5 KB
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-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 9 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

objectbox-java/build.gradle.kts

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ tasks.withType<JavaCompile> {
1414
options.release.set(8)
1515
}
1616

17-
val javadocForWebDir = "$buildDir/docs/web-api-docs"
17+
val javadocForWebDir = layout.buildDirectory.dir("docs/web-api-docs")
1818
val essentialsVersion: String by rootProject.extra
1919

2020
dependencies {
@@ -63,7 +63,7 @@ tasks.javadoc {
6363
}
6464

6565
// Note: use packageJavadocForWeb to get as ZIP.
66-
tasks.register<Javadoc>("javadocForWeb") {
66+
val javadocForWeb by tasks.registering(Javadoc::class) {
6767
group = "documentation"
6868
description = "Builds Javadoc incl. objectbox-java-api classes with web tweaks."
6969

@@ -100,7 +100,7 @@ tasks.register<Javadoc>("javadocForWeb") {
100100
source = filteredSources + fileTree(srcApi)
101101

102102
classpath = sourceSets.main.get().output + sourceSets.main.get().compileClasspath
103-
setDestinationDir(file(javadocForWebDir))
103+
setDestinationDir(javadocForWebDir.get().asFile)
104104

105105
title = "ObjectBox Java ${project.version} API"
106106
(options as StandardJavadocDocletOptions).apply {
@@ -141,22 +141,23 @@ tasks.register<Javadoc>("javadocForWeb") {
141141
}
142142

143143
tasks.register<Zip>("packageJavadocForWeb") {
144-
dependsOn("javadocForWeb")
144+
dependsOn(javadocForWeb)
145145
group = "documentation"
146146
description = "Packages Javadoc incl. objectbox-java-api classes with web tweaks as ZIP."
147147

148148
archiveFileName.set("objectbox-java-web-api-docs.zip")
149-
destinationDirectory.set(file("$buildDir/dist"))
149+
val distDir = layout.buildDirectory.dir("dist")
150+
destinationDirectory.set(distDir)
150151

151152
from(file(javadocForWebDir))
152153

153154
doLast {
154-
println("Javadoc for web packaged to ${file("$buildDir/dist/objectbox-java-web-api-docs.zip")}")
155+
println("Javadoc for web packaged to ${distDir.get().file("objectbox-java-web-api-docs.zip")}")
155156
}
156157
}
157158

158159
val javadocJar by tasks.registering(Jar::class) {
159-
dependsOn("javadoc")
160+
dependsOn(tasks.javadoc)
160161
archiveClassifier.set("javadoc")
161162
from("build/docs/javadoc")
162163
}

objectbox-kotlin/build.gradle.kts

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ import org.jetbrains.dokka.gradle.DokkaTask
22
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
33
import java.net.URL
44

5-
val javadocDir = file("$buildDir/docs/javadoc")
6-
75
plugins {
86
kotlin("jvm")
97
id("org.jetbrains.dokka")
@@ -30,8 +28,9 @@ tasks.withType<KotlinCompile> {
3028
}
3129
}
3230

33-
tasks.named<DokkaTask>("dokkaHtml") {
34-
outputDirectory.set(javadocDir)
31+
val dokkaHtml = tasks.named<DokkaTask>("dokkaHtml")
32+
dokkaHtml.configure {
33+
outputDirectory.set(layout.buildDirectory.dir("docs/javadoc"))
3534

3635
dokkaSourceSets.configureEach {
3736
// Fix "Can't find node by signature": have to manually point to dependencies.
@@ -46,10 +45,10 @@ tasks.named<DokkaTask>("dokkaHtml") {
4645
}
4746

4847
val javadocJar by tasks.registering(Jar::class) {
49-
dependsOn(tasks.named("dokkaHtml"))
48+
dependsOn(dokkaHtml)
5049
group = "build"
5150
archiveClassifier.set("javadoc")
52-
from(javadocDir)
51+
from(dokkaHtml.get().outputDirectory)
5352
}
5453

5554
val sourcesJar by tasks.registering(Jar::class) {

objectbox-rxjava/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ dependencies {
2121
}
2222

2323
val javadocJar by tasks.registering(Jar::class) {
24-
dependsOn(tasks.named("javadoc"))
24+
dependsOn(tasks.javadoc)
2525
archiveClassifier.set("javadoc")
2626
from("build/docs/javadoc")
2727
}

objectbox-rxjava3/build.gradle.kts

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ import org.jetbrains.dokka.gradle.DokkaTask
22
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
33
import java.net.URL
44

5-
val javadocDir = file("$buildDir/docs/javadoc")
6-
75
plugins {
86
id("java-library")
97
kotlin("jvm")
@@ -24,8 +22,9 @@ tasks.withType<KotlinCompile> {
2422
}
2523
}
2624

27-
tasks.named<DokkaTask>("dokkaHtml") {
28-
outputDirectory.set(javadocDir)
25+
val dokkaHtml = tasks.named<DokkaTask>("dokkaHtml")
26+
dokkaHtml.configure {
27+
outputDirectory.set(layout.buildDirectory.dir("docs/javadoc"))
2928

3029
dokkaSourceSets.configureEach {
3130
// Fix "Can't find node by signature": have to manually point to dependencies.
@@ -54,10 +53,10 @@ dependencies {
5453
}
5554

5655
val javadocJar by tasks.registering(Jar::class) {
57-
dependsOn(tasks.named("dokkaHtml"))
56+
dependsOn(dokkaHtml)
5857
group = "build"
5958
archiveClassifier.set("javadoc")
60-
from(javadocDir)
59+
from(dokkaHtml.get().outputDirectory)
6160
}
6261

6362
val sourcesJar by tasks.registering(Jar::class) {

0 commit comments

Comments
 (0)