Skip to content

Commit

Permalink
Don't use deprecated buildDir.
Browse files Browse the repository at this point in the history
  • Loading branch information
netdpb committed Dec 7, 2023
1 parent 7f41155 commit a06d5b3
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,7 @@ tasks.register('jspecifySamplesTest', Test) {
tasks.register('unzipConformanceTestAssertions', Copy) {
dependsOn configurations.conformanceTestAssertions
from zipTree(configurations.conformanceTestAssertions.singleFile)
exclude 'META-INF/'
into "${buildDir}/conformanceTests"
into layout.buildDirectory.dir("conformanceTests")
}

tasks.register('conformanceTests', Test) {
Expand All @@ -145,10 +144,11 @@ tasks.register('conformanceTests', Test) {
include '**/ConformanceTest.class'

// Conformance tests
inputs.dir("${buildDir}/conformanceTests")
def conformanceTestsDir = tasks.named('unzipConformanceTestAssertions', Copy).get().destinationDir
inputs.dir(conformanceTestsDir)
inputs.files("tests/ConformanceTest-report.txt")
inputs.files(configurations.conformanceTestDeps)
systemProperty("JSpecifyConformanceTest.inputs", "${buildDir}/conformanceTests/org/jspecify/conformance/tests")
systemProperty("JSpecifyConformanceTest.inputs", "$conformanceTestsDir/org/jspecify/conformance/tests")
systemProperty("JSpecifyConformanceTest.report", "tests/ConformanceTest-report.txt")
systemProperty("JSpecifyConformanceTest.deps", configurations.conformanceTestDeps.join(":"))

Expand Down

0 comments on commit a06d5b3

Please sign in to comment.