Skip to content
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.

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

add ktlint.gradle file #411

Merged
merged 1 commit into from
Jul 30, 2024
Merged
Show file tree
Hide file tree
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
8 changes: 0 additions & 8 deletions generators/kotlin/templates/gradle/kotlin.gradle.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,6 @@ allOpen {
}
}

ktlint {
//See more options: https://github.com/JLLeitschuh/ktlint-gradle#configuration
ignoreFailures = true
}

if (OperatingSystem.current().isWindows()) {
bootRun {
doFirst {
Expand All @@ -74,9 +69,6 @@ if (OperatingSystem.current().isWindows()) {
}
}

// Reformat code before compilation
compileKotlin.dependsOn ktlintFormat

jacocoTestReport {
// Add Kotlin sources to Jacoco source dirs
sourceDirectories.from += sourceSets.main.kotlin.srcDirs
Expand Down
8 changes: 8 additions & 0 deletions generators/ktlint/__snapshots__/generator.spec.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@ exports[`SubGenerator kotlin of kotlin JHipster blueprint > gradle > should matc
},
],
],
"applyFromGradle": [
{
"script": "gradle/ktlint.gradle",
},
],
}
`;

Expand All @@ -20,6 +25,9 @@ exports[`SubGenerator kotlin of kotlin JHipster blueprint > gradle > should succ
".yo-rc.json": {
"stateCleared": "modified",
},
"gradle/ktlint.gradle": {
"stateCleared": "modified",
},
"package.json": {
"stateCleared": "modified",
},
Expand Down
7 changes: 6 additions & 1 deletion generators/ktlint/generator.js
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,10 @@ export default class extends BaseApplicationGenerator {
return this.asWritingTaskGroup({
async writing({ application }) {
await this.writeFiles({
blocks: [{ templates: ['.gitignore.jhi.ktlint'] }],
blocks: [
{ templates: ['.gitignore.jhi.ktlint'] },
{ condition: ctx => ctx.buildToolGradle, templates: ['gradle/ktlint.gradle'] },
],
context: application,
});
},
Expand All @@ -122,6 +125,8 @@ export default class extends BaseApplicationGenerator {
},
addDependencies({ application, source }) {
if (application.buildToolGradle) {
source.applyFromGradle({ script: 'gradle/ktlint.gradle' });

source.addGradleDependencyCatalogPlugins([
{
pluginName: 'ktlint',
Expand Down
25 changes: 25 additions & 0 deletions generators/ktlint/templates/gradle/ktlint.gradle.ejs
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<%#
Copyright 2013-2024 the original author or authors from the JHipster project.

This file is part of the JHipster project, see https://www.jhipster.tech/
for more information.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-%>
ktlint {
//See more options: https://github.com/JLLeitschuh/ktlint-gradle#configuration
ignoreFailures = true
}

// Reformat code before compilation
compileKotlin.dependsOn ktlintFormat
Loading