Skip to content

Commit

Permalink
chore(deps): Bump io.gitlab.arturbosch.detekt from 1.22.0 to 1.23.0 (#…
Browse files Browse the repository at this point in the history
…935)

* chore(deps): Bump io.gitlab.arturbosch.detekt from 1.22.0 to 1.23.0

Bumps [io.gitlab.arturbosch.detekt](https://github.com/detekt/detekt) from 1.22.0 to 1.23.0.
- [Release notes](https://github.com/detekt/detekt/releases)
- [Commits](detekt/detekt@v1.22.0...v1.23.0)

---
updated-dependencies:
- dependency-name: io.gitlab.arturbosch.detekt
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* chore(deps): Bump io.gitlab.arturbosch.detekt:detekt-formatting

Bumps [io.gitlab.arturbosch.detekt:detekt-formatting](https://github.com/detekt/detekt) from 1.22.0 to 1.23.0.
- [Release notes](https://github.com/detekt/detekt/releases)
- [Commits](detekt/detekt@v1.22.0...v1.23.0)

---
updated-dependencies:
- dependency-name: io.gitlab.arturbosch.detekt:detekt-formatting
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* chore: remove ktlint / align last Detekt version

* chore: downgrade sonarqube to previous version

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Benoit Orihuela <[email protected]>
  • Loading branch information
dependabot[bot] and bobeal authored May 27, 2023
1 parent 750ad74 commit c092959
Show file tree
Hide file tree
Showing 14 changed files with 1,012 additions and 100 deletions.
9 changes: 4 additions & 5 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
[*.{kt,kts}]
indent_size=4
insert_final_newline=true
max_line_length=120
ktlint_standard_no-wildcard-imports=false
ktlint_standard_multiline-if-else=false
indent_size = 4
indent_style = space
insert_final_newline = true
max_line_length = 120
1 change: 0 additions & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@ pipeline {
archiveArtifacts artifacts: '**/build/reports/**', allowEmptyArchive: true

junit allowEmptyResults: true, keepLongStdio: true, testResults: '**/build/test-results/test/*.xml'
recordIssues enabledForFailure: true, tool: checkStyle(pattern: '**/build/reports/ktlint/ktlint*.xml')
recordIssues enabledForFailure: true, tool: detekt(pattern: '**/build/reports/detekt/detekt.xml')
}
success {
Expand Down
14 changes: 3 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ To build all the services, you can just launch:
./gradlew build
```

It will compile the source code, check the code formatting (thanks to [ktLint](https://ktlint.github.io/)) and run the test
It will compile the source code, check the code quality (thanks to [detekt](https://detekt.dev/)) and run the test
suite for all the services.

For each service, a self executable jar is produced in the `build/libs` directory of the service.
Expand All @@ -129,17 +129,9 @@ If you want to build only one of the services, you can launch:

### Code quality

Code formatting and standard code quality checks are performed by [ktLint](https://ktlint.github.io/) and
[Detekt](https://detekt.github.io/detekt/index.html).
Code formatting and standard code quality checks are performed by [Detekt](https://detekt.github.io/detekt/index.html).

ktLint and Detekt checks are automatically performed as part of the build and fail the build if any error is encountered.

If you use IntelliJ:
* You can generate the corresponding ktLint settings with the following command:

```shell script
./gradlew ktlintApplyToIdea
```
Detekt checks are automatically performed as part of the build and fail the build if any error is encountered.

* You may consider using a plugin like [Save Actions](https://plugins.jetbrains.com/plugin/7642-save-actions)
that applies changed code refactoring and optimized imports on a save.
Expand Down
2 changes: 1 addition & 1 deletion api-gateway/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ plugins {
dependencies {
implementation("org.springframework.cloud:spring-cloud-starter-gateway")

detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.22.0")
detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.23.0")
}

springBoot {
Expand Down
16 changes: 3 additions & 13 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@

import com.google.cloud.tools.jib.gradle.PlatformParameters
import io.gitlab.arturbosch.detekt.Detekt
import io.gitlab.arturbosch.detekt.DetektCreateBaselineTask
import io.spring.gradle.dependencymanagement.dsl.DependencyManagementExtension
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import org.jlleitschuh.gradle.ktlint.reporter.ReporterType

buildscript {
dependencies {
Expand All @@ -24,10 +24,9 @@ plugins {
id("org.graalvm.buildtools.native") version "0.9.22"
kotlin("jvm") version "1.8.21" apply false
kotlin("plugin.spring") version "1.8.21" apply false
id("org.jlleitschuh.gradle.ktlint") version "11.3.2"
id("com.google.cloud.tools.jib") version "3.3.2" apply false
id("io.gitlab.arturbosch.detekt") version "1.22.0" apply false
id("org.sonarqube") version "4.1.0.3113"
id("io.gitlab.arturbosch.detekt") version "1.23.0" apply false
id("org.sonarqube") version "4.0.0.2929"
jacoco
}

Expand All @@ -40,7 +39,6 @@ subprojects {
apply(plugin = "io.spring.dependency-management")
apply(plugin = "org.jetbrains.kotlin.jvm")
apply(plugin = "org.jetbrains.kotlin.plugin.spring")
apply(plugin = "org.jlleitschuh.gradle.ktlint")
apply(plugin = "io.gitlab.arturbosch.detekt")
apply(plugin = "jacoco")

Expand Down Expand Up @@ -101,14 +99,6 @@ subprojects {
}
}

ktlint {
disabledRules.set(setOf("multiline-if-else", "no-wildcard-imports"))
reporters {
reporter(ReporterType.CHECKSTYLE)
reporter(ReporterType.PLAIN)
}
}

tasks.withType<Detekt>().configureEach {
config.setFrom(files("$rootDir/config/detekt/detekt.yml"))
buildUponDefaultConfig = true
Expand Down
Loading

0 comments on commit c092959

Please sign in to comment.