proper relative paths for gradle caching

apache · Aug 5, 2024 · 85bb9d1 · 85bb9d1
1 parent 2f4151b
commit 85bb9d1
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 14 deletions.
diff --git a/polaris-core/build.gradle b/polaris-core/build.gradle
@@ -116,8 +116,11 @@ dependencies {
  compileOnly(libs.jakarta.persistence.api)
 }
 
+def rootDirRelative = projectDir.relativePath(rootDir)
+def buildDirRelative = projectDir.relativePath(project.layout.buildDirectory.get().asFile)
+
 openApiValidate {
- inputSpec = "$rootDir/spec/polaris-management-service.yml"
+ inputSpec = "$rootDirRelative/spec/polaris-management-service.yml"
 }
 
 tasks.withType(JavaCompile).configureEach {
@@ -126,13 +129,13 @@ tasks.withType(JavaCompile).configureEach {
 }
 
 tasks.register("generatePolarisService", org.openapitools.generator.gradle.plugin.tasks.GenerateTask).configure {
- inputSpec = "$rootDir/spec/polaris-management-service.yml"
+ inputSpec = "$rootDirRelative/spec/polaris-management-service.yml"
  generatorName = "jaxrs-resteasy"
- outputDir = "$projectDir/build/generated"
+ outputDir = "$buildDirRelative/generated"
  modelPackage = "io.polaris.core.admin.model"
  ignoreFileOverride = "$rootDir/.openapi-generator-ignore"
  removeOperationIdPrefix = true
- templateDir = "$rootDir/server-templates"
+ templateDir = "$rootDirRelative/server-templates"
  globalProperties = [
  apis : "false",
  models : "",

diff --git a/polaris-service/build.gradle b/polaris-service/build.gradle
@@ -93,14 +93,17 @@ dependencies {
  testImplementation("software.amazon.awssdk:dynamodb")
 }
 
+def rootDirRelative = projectDir.relativePath(rootDir)
+def buildDirRelative = projectDir.relativePath(project.layout.buildDirectory.get().asFile)
+
 openApiGenerate {
- inputSpec = "$rootDir/spec/rest-catalog-open-api.yaml"
+ inputSpec = "$rootDirRelative/spec/rest-catalog-open-api.yaml"
  generatorName = "jaxrs-resteasy"
- outputDir = "$projectDir/build/generated"
+ outputDir = "$buildDirRelative/generated"
  apiPackage = "io.polaris.service.catalog.api"
- ignoreFileOverride = "$rootDir/.openapi-generator-ignore"
+ ignoreFileOverride = "$rootDirRelative/.openapi-generator-ignore"
  removeOperationIdPrefix = true
- templateDir = "$rootDir/server-templates"
+ templateDir = "$rootDirRelative/server-templates"
  globalProperties = [
  apis : "",
  models : "false",
@@ -153,14 +156,14 @@ openApiGenerate {
 }
 
 tasks.register("generatePolarisService", org.openapitools.generator.gradle.plugin.tasks.GenerateTask).configure {
- inputSpec = "$rootDir/spec/polaris-management-service.yml"
+ inputSpec = "$rootDirRelative/spec/polaris-management-service.yml"
  generatorName = "jaxrs-resteasy"
- outputDir = "$projectDir/build/generated"
+ outputDir = "$buildDirRelative/generated"
  apiPackage = "io.polaris.service.admin.api"
  modelPackage = "io.polaris.core.admin.model"
- ignoreFileOverride = "$rootDir/.openapi-generator-ignore"
+ ignoreFileOverride = "$rootDirRelative/.openapi-generator-ignore"
  removeOperationIdPrefix = true
- templateDir = "$rootDir/server-templates"
+ templateDir = "$rootDirRelative/server-templates"
  globalProperties = [
  apis : "",
  models : "false",
@@ -179,7 +182,7 @@ tasks.register("generatePolarisService", org.openapitools.generator.gradle.plugi
 }
 
 compileJava.dependsOn tasks.openApiGenerate, tasks.generatePolarisService
-sourceSets.main.java.srcDirs += ["$projectDir/build/generated/src/main/java"]
+sourceSets.main.java.srcDirs += ["$buildDirRelative/generated/src/main/java"]
 
 tasks.named("test", Test).configure {
  if (System.getenv("AWS_REGION") == null) {
@@ -196,7 +199,7 @@ tasks.register("runApp", JavaExec).configure {
  }
  classpath = sourceSets.main.runtimeClasspath
  mainClass = "io.polaris.service.PolarisApplication"
- args = ["server", "$rootDir/polaris-server.yml"]
+ args = ["server", "$rootDirRelative/polaris-server.yml"]
 }
 
 application {