Skip to content

Commit a4a8f3f

Browse files
eygraberevant
authored andcommitted
Update Gradle to 8.4
1 parent 2df0892 commit a4a8f3f

6 files changed

Lines changed: 24 additions & 18 deletions

File tree

.circleci/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
version: 2.1
22
orbs:
3-
gradle: circleci/gradle@1.0.10
3+
gradle: circleci/gradle@3.0.0
44
win: circleci/windows@5.0
55
_defaults: &defaults
66
working_directory: ~/code
@@ -18,7 +18,7 @@ _gradle_checksum_windows: &gradle_checksum_windows
1818
jobs:
1919
build-linux:
2020
docker:
21-
- image: cimg/openjdk:16.0.2-browsers
21+
- image: cimg/openjdk:17.0.9@sha256:a36da58bce6d1b6c43984970acec45546e746e628969b1261d6700367aa6e8dc
2222
resource_class: xlarge
2323
<<: *defaults
2424
steps:

assertk/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ plugins {
1010

1111
val compileTemplates by tasks.registering(TemplateTask::class) {
1212
inputDir.set(file("src/template"))
13-
outputDir.set(file("$buildDir/generated/template"))
13+
outputDir.set(layout.buildDirectory.dir("generated/template"))
1414
}
1515

1616
val compileTestTemplates by tasks.registering(TemplateTask::class) {
1717
inputDir.set(file("src/testTemplate"))
18-
outputDir.set(file("$buildDir/generated/testTemplate"))
18+
outputDir.set(layout.buildDirectory.dir("generated/testTemplate"))
1919
}
2020

2121
kotlin {

buildSrc/src/main/kotlin/assertk.publish.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ tasks.withType<DokkaTask>().configureEach {
2626
}
2727

2828
val dokkaCommon by tasks.registering(DokkaTask::class) {
29-
outputDirectory.set(file("$buildDir/javadoc/common"))
29+
outputDirectory.set(layout.buildDirectory.dir("javadoc/common"))
3030
dokkaSourceSets {
3131
@Suppress("UNUSED_VARIABLE")
3232
val commonMain by getting

gradle/wrapper/gradle-wrapper.jar

2.06 KB
Binary file not shown.
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
44
networkTimeout=10000
5+
validateDistributionUrl=true
56
zipStoreBase=GRADLE_USER_HOME
67
zipStorePath=wrapper/dists

gradlew

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

0 commit comments

Comments
 (0)