Skip to content

Gradle tweaks #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
snazy merged 3 commits into from
Aug 5, 2024
Merged

Gradle tweaks #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7d841bf
Gradle tweaks
snazy Jul 29, 2024
6aff710
clarify `options.release` / source/targetCompatibility
snazy Aug 5, 2024
2f4151b
`.configure`
snazy Aug 5, 2024
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
17 changes: 5 additions & 12 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,17 +51,12 @@ subprojects {
apply plugin: "jacoco-report-aggregation"
apply plugin: "groovy"

tasks.withType(JavaCompile) {
tasks.withType(JavaCompile).configureEach {
options.compilerArgs << "-Xlint:unchecked"
options.compilerArgs << "-Xlint:deprecation"
}

project(":polaris-service") {
apply plugin: "application"
Copy link
Member

@RussellSpitzer RussellSpitzer Aug 5, 2024

Choose a reason for hiding this comment

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

For my own reference, Plugin specification is moved into project specific build files.

}

project(":polaris-core") {
apply plugin: "java-library"
// TODO Disabled until the code is only Java 11/17, see #76
// options.release = 17
}

project(":polaris-eclipselink") {
Expand All @@ -84,11 +79,9 @@ subprojects {
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
}

task format {
dependsOn "spotlessApply"
}
tasks.register("format").configure {dependsOn("spotlessApply") }

test {
tasks.named("test", Test).configure {
useJUnitPlatform()
jvmArgs += [ '-Duser.language=en' ]
}
Expand Down
19 changes: 10 additions & 9 deletions polaris-core/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,6 @@ plugins {
id("java-test-fixtures")
}

compileJava {
sourceCompatibility = 11
targetCompatibility = 11
}

dependencies {
implementation(platform(libs.iceberg.bom))
implementation("org.apache.iceberg:iceberg-api")
Expand Down Expand Up @@ -125,10 +120,15 @@ openApiValidate {
inputSpec = "$rootDir/spec/polaris-management-service.yml"
}

task generatePolarisService(type: org.openapitools.generator.gradle.plugin.tasks.GenerateTask) {
tasks.withType(JavaCompile).configureEach {
// TODO Disabled until the code is only Java 11, see #76
// options.release = 11
}

tasks.register("generatePolarisService", org.openapitools.generator.gradle.plugin.tasks.GenerateTask).configure {
inputSpec = "$rootDir/spec/polaris-management-service.yml"
generatorName = "jaxrs-resteasy"
outputDir = "$buildDir/generated"
outputDir = "$projectDir/build/generated"
modelPackage = "io.polaris.core.admin.model"
ignoreFileOverride = "$rootDir/.openapi-generator-ignore"
removeOperationIdPrefix = true
Expand All @@ -150,5 +150,6 @@ task generatePolarisService(type: org.openapitools.generator.gradle.plugin.tasks
serverVariables = [basePath: "api/v1"]
}

compileJava.dependsOn tasks.generatePolarisService
sourceSets.main.java.srcDirs += ["$buildDir/generated/src/main/java"]
tasks.named("compileJava").configure {dependsOn("generatePolarisService") }

sourceSets.main.java.srcDirs += [ project.layout.buildDirectory.dir("generated/src/main/java") ]
23 changes: 13 additions & 10 deletions polaris-service/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,12 @@
* limitations under the License.
*/

import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar

plugins {
alias(libs.plugins.shadow)
alias(libs.plugins.openapi.generator)
id("application")
}

dependencies {
Expand Down Expand Up @@ -93,7 +96,7 @@ dependencies {
openApiGenerate {
inputSpec = "$rootDir/spec/rest-catalog-open-api.yaml"
generatorName = "jaxrs-resteasy"
outputDir = "$buildDir/generated"
outputDir = "$projectDir/build/generated"
apiPackage = "io.polaris.service.catalog.api"
ignoreFileOverride = "$rootDir/.openapi-generator-ignore"
removeOperationIdPrefix = true
Expand Down Expand Up @@ -149,10 +152,10 @@ openApiGenerate {
]
}

task generatePolarisService(type: org.openapitools.generator.gradle.plugin.tasks.GenerateTask) {
tasks.register("generatePolarisService", org.openapitools.generator.gradle.plugin.tasks.GenerateTask).configure {
inputSpec = "$rootDir/spec/polaris-management-service.yml"
generatorName = "jaxrs-resteasy"
outputDir = "$buildDir/generated"
outputDir = "$projectDir/build/generated"
apiPackage = "io.polaris.service.admin.api"
modelPackage = "io.polaris.core.admin.model"
ignoreFileOverride = "$rootDir/.openapi-generator-ignore"
Expand All @@ -176,9 +179,9 @@ task generatePolarisService(type: org.openapitools.generator.gradle.plugin.tasks
}

compileJava.dependsOn tasks.openApiGenerate, tasks.generatePolarisService
sourceSets.main.java.srcDirs += ["$buildDir/generated/src/main/java"]
sourceSets.main.java.srcDirs += ["$projectDir/build/generated/src/main/java"]

test {
tasks.named("test", Test).configure {
if (System.getenv("AWS_REGION") == null) {
environment "AWS_REGION", "us-west-2"
}
Expand All @@ -187,29 +190,29 @@ test {
maxParallelForks = 4
}

task runApp(type: JavaExec) {
tasks.register("runApp", JavaExec).configure {
if (System.getenv("AWS_REGION") == null) {
environment "AWS_REGION", "us-west-2"
}
classpath = sourceSets.main.runtimeClasspath
mainClass = "io.polaris.service.PolarisApplication"
args "server", "$rootDir/polaris-server.yml"
args = ["server", "$rootDir/polaris-server.yml"]
}

application {
mainClass = "io.polaris.service.PolarisApplication"
}

jar {
tasks.named("jar", Jar).configure {
manifest {
attributes "Main-Class": "io.polaris.service.PolarisApplication"
}
}

shadowJar {
tasks.named("shadowJar", ShadowJar).configure {
mainClassName = "io.polaris.service.PolarisApplication"
mergeServiceFiles()
zip64 true
}

build.dependsOn(shadowJar)
tasks.named("build").configure { dependsOn("shadowJar") }