Skip to content

Commit 50b9278

Browse files
committed
Parent Build Tasks cleaning
Change depreacated usage in Detekt gradle task Remove AbstractCompile task Remove check on project name starting with cosmotech-api-common
1 parent b68f2d5 commit 50b9278

File tree

1 file changed

+10
-16
lines changed

1 file changed

+10
-16
lines changed

build.gradle.kts

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -93,15 +93,11 @@ allprojects {
9393
subprojects {
9494
apply(plugin = "org.jetbrains.kotlin.plugin.spring")
9595
apply(plugin = "org.springframework.boot")
96+
apply(plugin = "org.openapi.generator")
97+
apply(plugin = "com.google.cloud.tools.jib")
9698

9799
version = rootProject.scmVersion.version ?: error("Root project did not configure scmVersion!")
98100

99-
// Apply some plugins to all projects except 'common'
100-
if (!name.startsWith("cosmotech-api-common")) {
101-
apply(plugin = "org.openapi.generator")
102-
apply(plugin = "com.google.cloud.tools.jib")
103-
}
104-
105101
java { toolchain { languageVersion.set(JavaLanguageVersion.of(kotlinJvmTarget)) } }
106102

107103
val projectDirName = projectDir.relativeTo(rootDir).name
@@ -141,24 +137,24 @@ subprojects {
141137
reports {
142138
html {
143139
// observe findings in your browser with structure and code snippets
144-
enabled = true
145-
destination = file("$buildDir/reports/detekt/${project.name}-detekt.html")
140+
required.set(true)
141+
outputLocation.set(file("$buildDir/reports/detekt/${project.name}-detekt.html"))
146142
}
147143
xml {
148144
// checkstyle like format mainly for integrations like Jenkins
149-
enabled = false
150-
destination = file("$buildDir/reports/detekt/${project.name}-detekt.xml")
145+
required.set(false)
146+
outputLocation.set(file("$buildDir/reports/detekt/${project.name}-detekt.xml"))
151147
}
152148
txt {
153149
// similar to the console output, contains issue signature to manually edit baseline files
154-
enabled = true
155-
destination = file("$buildDir/reports/detekt/${project.name}-detekt.txt")
150+
required.set(true)
151+
outputLocation.set(file("$buildDir/reports/detekt/${project.name}-detekt.txt"))
156152
}
157153
sarif {
158154
// standardized SARIF format (https://sarifweb.azurewebsites.net/) to support integrations
159155
// with Github Code Scanning
160-
enabled = true
161-
destination = file("$buildDir/reports/detekt/${project.name}-detekt.sarif")
156+
required.set(true)
157+
outputLocation.set(file("$buildDir/reports/detekt/${project.name}-detekt.sarif"))
162158
}
163159
}
164160
}
@@ -221,8 +217,6 @@ subprojects {
221217
api("com.github.Cosmo-Tech:cosmotech-api-azure:$cosmotechApiAzureVersion")
222218
}
223219

224-
tasks.withType<AbstractCompile> { dependsOn("openApiGenerate") }
225-
226220
tasks.withType<KotlinCompile> {
227221
dependsOn("openApiGenerate")
228222

0 commit comments

Comments
 (0)