Removed detekt/ktlint integration

This commit is contained in:
Jakub Chrzanowski 2021-07-23 21:27:22 +02:00 committed by Jakub Chrzanowski
parent 8ef79e2791
commit 423c1654d8
7 changed files with 9 additions and 44 deletions

View File

@ -69,9 +69,9 @@ jobs:
path: ~/.gradle/wrapper path: ~/.gradle/wrapper
key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }} key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
# Run detekt, ktlint and tests # Run tests
- name: Run Linters and Test - name: Run Tests
run: ./gradlew check run: ./gradlew test
# Run verifyPlugin Gradle task # Run verifyPlugin Gradle task
- name: Verify Plugin - name: Verify Plugin

View File

@ -62,9 +62,6 @@ jobs:
CODE_OF_CONDUCT.md \ CODE_OF_CONDUCT.md \
LICENSE LICENSE
# Run ktlint formatting
./gradlew ktlintFormat
# Commit modified files # Commit modified files
- name: Commit files - name: Commit files
run: | run: |

View File

@ -11,7 +11,7 @@
</option> </option>
<option name="taskNames"> <option name="taskNames">
<list> <list>
<option value="check" /> <option value="test" />
</list> </list>
</option> </option>
<option name="vmOptions" value="" /> <option name="vmOptions" value="" />
@ -21,4 +21,4 @@
<DebugAllEnabled>false</DebugAllEnabled> <DebugAllEnabled>false</DebugAllEnabled>
<method v="2" /> <method v="2" />
</configuration> </configuration>
</component> </component>

View File

@ -9,6 +9,9 @@
- Use Gradle `wrapper` task to handle Gradle updates - Use Gradle `wrapper` task to handle Gradle updates
- JVM compatibility version extracted to `gradle.properties` file - JVM compatibility version extracted to `gradle.properties` file
### Removed
- Removed `detekt`/`ktlint` integration
### Changed ### Changed
- GitHub Actions: Use Java 11 - GitHub Actions: Use Java 11
- Update `pluginVerifierIdeVersions` to `2020.3.4, 2021.1.3` - Update `pluginVerifierIdeVersions` to `2020.3.4, 2021.1.3`

View File

@ -69,7 +69,6 @@ The most significant parts of the current configuration are:
- Support for Kotlin and Java implementation. - Support for Kotlin and Java implementation.
- Integration with the [gradle-changelog-plugin][gh:gradle-changelog-plugin], which automatically patches the change notes and description based on the `CHANGELOG.md` and `README.md` files. - Integration with the [gradle-changelog-plugin][gh:gradle-changelog-plugin], which automatically patches the change notes and description based on the `CHANGELOG.md` and `README.md` files.
- Integration with the [gradle-intellij-plugin][gh:gradle-intellij-plugin] for smoother development. - Integration with the [gradle-intellij-plugin][gh:gradle-intellij-plugin] for smoother development.
- Code linting with [detekt][detekt].
- [Plugin publishing][docs:publishing] using the token. - [Plugin publishing][docs:publishing] using the token.
The project-specific configuration file [gradle.properties][file:gradle.properties] contains: The project-specific configuration file [gradle.properties][file:gradle.properties] contains:
@ -103,7 +102,6 @@ A generated IntelliJ Platform Plugin Template repository contains the following
├── README.md README ├── README.md README
├── build/ Output build directory ├── build/ Output build directory
├── build.gradle.kts Gradle configuration ├── build.gradle.kts Gradle configuration
├── detekt-config.yml Detekt configuration
├── gradle ├── gradle
│ └── wrapper/ Gradle Wrapper │ └── wrapper/ Gradle Wrapper
├── gradle.properties Gradle configuration properties ├── gradle.properties Gradle configuration properties
@ -175,7 +173,7 @@ Within the default project structure, there is a `.run` directory provided conta
| Configuration name | Description | | Configuration name | Description |
| ------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | ------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| Run Plugin | Runs [`:runIde`][gh:gradle-intellij-plugin-running-dsl] Gradle IntelliJ Plugin task. Use the *Debug* icon for plugin debugging. | | Run Plugin | Runs [`:runIde`][gh:gradle-intellij-plugin-running-dsl] Gradle IntelliJ Plugin task. Use the *Debug* icon for plugin debugging. |
| Run Tests | Runs [`:check`][gradle-lifecycle-tasks] Gradle task that invokes `:test` and `detekt`/`ktlint` code inspections. | | Run Tests | Runs [`:test`][gradle-lifecycle-tasks] Gradle task. |
| Run Verifications | Runs [`:runPluginVerifier`][gh:gradle-intellij-plugin-verifier-dsl] Gradle IntelliJ Plugin task to check the plugin compatibility against the specified IntelliJ IDEs. | | Run Verifications | Runs [`:runPluginVerifier`][gh:gradle-intellij-plugin-verifier-dsl] Gradle IntelliJ Plugin task to check the plugin compatibility against the specified IntelliJ IDEs. |
@ -332,7 +330,6 @@ If the message contains one of the following strings: `[skip ci]`, `[ci skip]`,
[jb:ui-guidelines]: https://jetbrains.github.io/ui [jb:ui-guidelines]: https://jetbrains.github.io/ui
[keep-a-changelog]: https://keepachangelog.com [keep-a-changelog]: https://keepachangelog.com
[detekt]: https://detekt.github.io/detekt
[github-actions-skip-ci]: https://github.blog/changelog/2021-02-08-github-actions-skip-pull-request-and-push-workflows-with-skip-ci/ [github-actions-skip-ci]: https://github.blog/changelog/2021-02-08-github-actions-skip-pull-request-and-push-workflows-with-skip-ci/
[gradle]: https://gradle.org [gradle]: https://gradle.org
[gradle-releases]: https://gradle.org/releases [gradle-releases]: https://gradle.org/releases

View File

@ -1,4 +1,3 @@
import io.gitlab.arturbosch.detekt.Detekt
import org.jetbrains.changelog.markdownToHTML import org.jetbrains.changelog.markdownToHTML
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
@ -13,10 +12,6 @@ plugins {
id("org.jetbrains.intellij") version "1.1.4" id("org.jetbrains.intellij") version "1.1.4"
// gradle-changelog-plugin - read more: https://github.com/JetBrains/gradle-changelog-plugin // gradle-changelog-plugin - read more: https://github.com/JetBrains/gradle-changelog-plugin
id("org.jetbrains.changelog") version "1.2.1" id("org.jetbrains.changelog") version "1.2.1"
// detekt linter - read more: https://detekt.github.io/detekt/gradle.html
id("io.gitlab.arturbosch.detekt") version "1.17.1"
// ktlint linter - read more: https://github.com/JLLeitschuh/ktlint-gradle
id("org.jlleitschuh.gradle.ktlint") version "10.0.0"
} }
group = properties("pluginGroup") group = properties("pluginGroup")
@ -26,9 +21,6 @@ version = properties("pluginVersion")
repositories { repositories {
mavenCentral() mavenCentral()
} }
dependencies {
detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.17.1")
}
// Configure gradle-intellij-plugin plugin. // Configure gradle-intellij-plugin plugin.
// Read more: https://github.com/JetBrains/gradle-intellij-plugin // Read more: https://github.com/JetBrains/gradle-intellij-plugin
@ -50,19 +42,6 @@ changelog {
groups.set(emptyList()) groups.set(emptyList())
} }
// Configure detekt plugin.
// Read more: https://detekt.github.io/detekt/kotlindsl.html
detekt {
config = files("./detekt-config.yml")
buildUponDefaultConfig = true
reports {
html.enabled = false
xml.enabled = false
txt.enabled = false
}
}
// Configure UI tests plugin // Configure UI tests plugin
// Read more: https://github.com/JetBrains/intellij-ui-test-robot // Read more: https://github.com/JetBrains/intellij-ui-test-robot
tasks { tasks {
@ -75,9 +54,6 @@ tasks {
withType<KotlinCompile> { withType<KotlinCompile> {
kotlinOptions.jvmTarget = it kotlinOptions.jvmTarget = it
} }
withType<Detekt> {
jvmTarget = it
}
} }
wrapper { wrapper {

View File

@ -1,8 +0,0 @@
# Default detekt configuration:
# https://github.com/detekt/detekt/blob/master/detekt-core/src/main/resources/default-detekt-config.yml
formatting:
Indentation:
continuationIndentSize: 8
ParameterListWrapping:
indentSize: 8