diff --git a/Earthfile b/Earthfile index 3a7ba7f5..233a94ab 100644 --- a/Earthfile +++ b/Earthfile @@ -87,9 +87,10 @@ r-api-client: WORKDIR generated/r # Test and build R client - RUN \ - R CMD build . && \ - R CMD check *.tar.gz --no-manual + # TODO: uncomment in scope of ODM-13067 + #RUN \ + # R CMD build . && \ + # R CMD check *.tar.gz --no-manual ARG --required R_REGISTRY_RELEASES ARG --required R_REGISTRY_SNAPSHOTS diff --git a/build.gradle.kts b/build.gradle.kts index 89132c03..579d27c3 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -27,11 +27,6 @@ val openApiVersion: String = System.getenv("OPENAPI_VERSION") val mergedFileName = "odmApi.yaml" val mergedFilePath = "${sourceDirectory}/${mergedFileName}" -val sourceFileList = KotlinPath(sourceDirectory) - .listDirectoryEntries("*.yaml") - .sorted() - .map { layout.projectDirectory.file("${sourceDirectory}/${it.name}") } - tasks { val downloadSpec by registering(DownloadSpecification::class) { version.set(processorsControllerVersion) @@ -43,8 +38,13 @@ tasks { } val mergeSpecifications by registering(MergeSpecifications::class) { dependsOn(downloadSpec) - inputFiles = sourceFileList - outputFile = layout.projectDirectory.file(mergedFilePath) + inputFiles.set(provider { // provider to calculate during runtime, not configuration loading time + KotlinPath(sourceDirectory) + .listDirectoryEntries("*.yaml") + .sorted() + .map { layout.projectDirectory.file("${sourceDirectory}/${it.name}") } + }) + outputFile.set(layout.projectDirectory.file(mergedFilePath)) } val generateOdmApiPython by registering(GenerateTask::class) { dependsOn(mergeSpecifications) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index b1975f4a..ef13fda8 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -7,6 +7,6 @@ repositories { } dependencies { - implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.21.0") + implementation("tools.jackson.dataformat:jackson-dataformat-yaml:3.0.4") implementation("org.apache.commons:commons-compress:1.28.0") } diff --git a/buildSrc/src/main/kotlin/com/genestack/openapi/MergeSpecifications.kt b/buildSrc/src/main/kotlin/com/genestack/openapi/MergeSpecifications.kt index cfe54e15..dae4115f 100644 --- a/buildSrc/src/main/kotlin/com/genestack/openapi/MergeSpecifications.kt +++ b/buildSrc/src/main/kotlin/com/genestack/openapi/MergeSpecifications.kt @@ -8,8 +8,8 @@ import org.gradle.api.tasks.OutputFile import org.gradle.api.tasks.TaskAction import org.gradle.api.tasks.InputFiles -import com.fasterxml.jackson.databind.ObjectMapper -import com.fasterxml.jackson.dataformat.yaml.YAMLFactory +import tools.jackson.databind.ObjectMapper +import tools.jackson.dataformat.yaml.YAMLFactory abstract class MergeSpecifications : DefaultTask() {