Skip to content

Commit e0ab4f6

Browse files
authored
Merge pull request #140 from mhalbritter/mh/fix-139
Fix "Could not get unknown property 'metadataRoot' for root project"
2 parents 6e97602 + a8d9e23 commit e0ab4f6

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
import org.graalvm.internal.tck.harness.TckExtension
22

3-
def testUtils = project.extensions.create("tck", TckExtension, project)
3+
TckExtension testUtils = project.extensions.create("tck", TckExtension, project)

tests/tck-build-logic/src/main/groovy/org.graalvm.internal.tck.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@ tasks.register("checkstyle") {
3131
dependsOn tasks.withType(Checkstyle)
3232
}
3333

34-
def metadataPath = Objects.requireNonNullElse(
35-
System.getenv("GVM_TCK_MD"),
36-
providers.gradleProperty('metadata.dir').get()
34+
String metadataPath = Objects.requireNonNullElse(
35+
System.getenv("GVM_TCK_MD"),
36+
providers.gradleProperty('metadata.dir').get()
3737
)
3838

3939
File metadataFile
4040
if (!metadataPath.startsWith("/")) {
41-
metadataFile = metadataRoot.resolve(metadataPath).toFile()
41+
metadataFile = file(tck.metadataRoot).toPath().resolve(metadataPath).toFile()
4242
} else {
4343
metadataFile = file(metadataPath)
4444
}

0 commit comments

Comments
 (0)