Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ buildscript {
classpath 'org.revapi:gradle-revapi:1.8.0'
classpath 'com.gorylenko.gradle-git-properties:gradle-git-properties:2.5.7'
classpath 'com.palantir.gradle.gitversion:gradle-git-version:4.3.0'
classpath 'org.openapitools:openapi-generator-gradle-plugin:7.21.0'
classpath 'org.openapitools:openapi-generator-gradle-plugin:7.22.0'
}
}

Expand Down Expand Up @@ -581,7 +581,7 @@ project(':iceberg-aws') {
}

// TODO delete once s3-signer-open-api.yaml is removed
def s3SignerSpec = "$projectDir/src/main/resources/s3-signer-open-api.yaml"
def s3SignerSpec = layout.projectDirectory.file("src/main/resources/s3-signer-open-api.yaml")

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

didn;t fully understood the difference between them

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In 7.21.0,

// Property declared on the task:
Property<String> inputSpec       // a string slot

// So .set(...) accepts a String:
inputSpec.set("$projectDir/...")  // This works

In 7.22.0

// Property declared on the task:
RegularFileProperty inputSpec    // a file slot

inputSpec.set("$projectDir/...")                                  // doesn't work
inputSpec.set(layout.projectDirectory.file("..."))                // works

tasks.register('validateS3SignerSpec', org.openapitools.generator.gradle.plugin.tasks.ValidateTask) {
inputSpec.set(s3SignerSpec)
recommend.set(true)
Expand Down Expand Up @@ -1140,7 +1140,7 @@ project(':iceberg-open-api') {
.collectEntries { k, v -> { [(k):v, (k.replaceFirst("rck.", "")):v] }} // strip prefix
}

def restCatalogSpec = "$projectDir/rest-catalog-open-api.yaml"
def restCatalogSpec = layout.projectDirectory.file("rest-catalog-open-api.yaml")
tasks.register('validateRESTCatalogSpec', org.openapitools.generator.gradle.plugin.tasks.ValidateTask) {
inputSpec.set(restCatalogSpec)
recommend.set(true)
Expand Down
Loading