Merge pull request #140 from mhalbritter/mh/fix-139

Fix "Could not get unknown property 'metadataRoot' for root project"
oracle · Dec 5, 2022 · e0ab4f6 · e0ab4f6
2 parents 6e97602 + a8d9e23
commit e0ab4f6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/tests/tck-build-logic/src/main/groovy/org.graalvm.internal.tck-base.gradle b/tests/tck-build-logic/src/main/groovy/org.graalvm.internal.tck-base.gradle
@@ -1,3 +1,3 @@
 import org.graalvm.internal.tck.harness.TckExtension
 
-def testUtils = project.extensions.create("tck", TckExtension, project)
+TckExtension testUtils = project.extensions.create("tck", TckExtension, project)
diff --git a/tests/tck-build-logic/src/main/groovy/org.graalvm.internal.tck.gradle b/tests/tck-build-logic/src/main/groovy/org.graalvm.internal.tck.gradle
@@ -31,14 +31,14 @@ tasks.register("checkstyle") {
     dependsOn tasks.withType(Checkstyle)
 }
 
-def metadataPath = Objects.requireNonNullElse(
-        System.getenv("GVM_TCK_MD"),
-        providers.gradleProperty('metadata.dir').get()
+String metadataPath = Objects.requireNonNullElse(
+		System.getenv("GVM_TCK_MD"),
+		providers.gradleProperty('metadata.dir').get()
 )
 
 File metadataFile
 if (!metadataPath.startsWith("/")) {
-    metadataFile = metadataRoot.resolve(metadataPath).toFile()
+	metadataFile = file(tck.metadataRoot).toPath().resolve(metadataPath).toFile()
 } else {
     metadataFile = file(metadataPath)
 }