From 9c050a886131e4a30d86ce68634545f3bc01dfd2 Mon Sep 17 00:00:00 2001 From: Paul Harrison Date: Wed, 7 Feb 2024 16:20:17 +0000 Subject: [PATCH] try to make work with windows output root needs to be url too --- tools/gradletooling/gradle-plugin/build.gradle.kts | 2 +- .../main/kotlin/net/ivoa/vodml/gradle/plugin/VodmlJavaTask.kt | 2 +- .../main/kotlin/net/ivoa/vodml/gradle/plugin/VodmlPythonTask.kt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/gradletooling/gradle-plugin/build.gradle.kts b/tools/gradletooling/gradle-plugin/build.gradle.kts index 4a0ca384..7ae8033a 100644 --- a/tools/gradletooling/gradle-plugin/build.gradle.kts +++ b/tools/gradletooling/gradle-plugin/build.gradle.kts @@ -31,7 +31,7 @@ dependencies { implementation("net.sf.saxon:Saxon-HE:10.8") // for xslt 3.0 implementation("name.dmaus.schxslt:java:3.1.1") // for modern schematron - implementation("org.xmlresolver:xmlresolver:4.5.2") // for xml catalogues - note that the apache xml-commons resolver is out of date + implementation("org.xmlresolver:xmlresolver:5.2.3") // for xml catalogues - note that the apache xml-commons resolver is out of date implementation("org.javastro.vodsl:vodslparser:0.4.6") //standalone vodsl parser implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.14.2") diff --git a/tools/gradletooling/gradle-plugin/src/main/kotlin/net/ivoa/vodml/gradle/plugin/VodmlJavaTask.kt b/tools/gradletooling/gradle-plugin/src/main/kotlin/net/ivoa/vodml/gradle/plugin/VodmlJavaTask.kt index 8eacc771..9f19dfa5 100644 --- a/tools/gradletooling/gradle-plugin/src/main/kotlin/net/ivoa/vodml/gradle/plugin/VodmlJavaTask.kt +++ b/tools/gradletooling/gradle-plugin/src/main/kotlin/net/ivoa/vodml/gradle/plugin/VodmlJavaTask.kt @@ -39,7 +39,7 @@ import javax.inject.Inject Vodml2Java.doTransform( v.absoluteFile, mapOf( "binding" to allBinding.joinToString(separator = ",") { it.toURI().toURL().toString() }, - "output_root" to javaGenDir.get().asFile.absolutePath, + "output_root" to javaGenDir.get().asFile.toURI().toURL().toString(), "isMain" to (if (index++ == 0) "True" else "False") // first is the Main ), actualCatalog, outfile.get().asFile diff --git a/tools/gradletooling/gradle-plugin/src/main/kotlin/net/ivoa/vodml/gradle/plugin/VodmlPythonTask.kt b/tools/gradletooling/gradle-plugin/src/main/kotlin/net/ivoa/vodml/gradle/plugin/VodmlPythonTask.kt index 78c327a5..82805f24 100644 --- a/tools/gradletooling/gradle-plugin/src/main/kotlin/net/ivoa/vodml/gradle/plugin/VodmlPythonTask.kt +++ b/tools/gradletooling/gradle-plugin/src/main/kotlin/net/ivoa/vodml/gradle/plugin/VodmlPythonTask.kt @@ -40,7 +40,7 @@ import javax.inject.Inject Vodml2Python.doTransform( v.absoluteFile, mapOf( "binding" to allBinding.joinToString(separator = ",") { it.toURI().toURL().toString() }, - "output_root" to pythonGenDir.get().asFile.absolutePath, + "output_root" to pythonGenDir.get().asFile.toURI().toURL().toString(), "isMain" to (if (index++ == 0) "True" else "False") // first is the Main ), actualCatalog, outfile.get().asFile