Skip to content

Commit

Permalink
Removed detekt/ktlint integration
Browse files Browse the repository at this point in the history
  • Loading branch information
hsz committed Jul 23, 2021
1 parent 57fe254 commit a8ab416
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 44 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,9 @@ jobs:
path: ~/.gradle/wrapper
key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}

# Run detekt, ktlint and tests
- name: Run Linters and Test
run: ./gradlew check
# Run tests
- name: Run Tests
run: ./gradlew test

# Run verifyPlugin Gradle task
- name: Verify Plugin
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/template-cleanup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,6 @@ jobs:
CODE_OF_CONDUCT.md \
LICENSE
# Run ktlint formatting
./gradlew ktlintFormat
# Commit modified files
- name: Commit files
run: |
Expand Down
4 changes: 2 additions & 2 deletions .run/Run Plugin Tests.run.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</option>
<option name="taskNames">
<list>
<option value="check" />
<option value="test" />
</list>
</option>
<option name="vmOptions" value="" />
Expand All @@ -21,4 +21,4 @@
<DebugAllEnabled>false</DebugAllEnabled>
<method v="2" />
</configuration>
</component>
</component>
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
- Use Gradle `wrapper` task to handle Gradle updates
- JVM compatibility version extracted to `gradle.properties` file

### Removed
- Removed `detekt`/`ktlint` integration

### Changed
- GitHub Actions: Use Java 11
- Update `pluginVerifierIdeVersions` to `2020.3.4, 2021.1.3`
Expand Down
5 changes: 1 addition & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ The most significant parts of the current configuration are:
- 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-intellij-plugin][gh:gradle-intellij-plugin] for smoother development.
- Code linting with [detekt][detekt].
- [Plugin publishing][docs:publishing] using the token.

The project-specific configuration file [gradle.properties][file:gradle.properties] contains:
Expand Down Expand Up @@ -103,7 +102,6 @@ A generated IntelliJ Platform Plugin Template repository contains the following
├── README.md README
├── build/ Output build directory
├── build.gradle.kts Gradle configuration
├── detekt-config.yml Detekt configuration
├── gradle
│ └── wrapper/ Gradle Wrapper
├── gradle.properties Gradle configuration properties
Expand Down Expand Up @@ -175,7 +173,7 @@ Within the default project structure, there is a `.run` directory provided conta
| 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 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. |


Expand Down Expand Up @@ -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
[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/
[gradle]: https://gradle.org
[gradle-releases]: https://gradle.org/releases
Expand Down
24 changes: 0 additions & 24 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import io.gitlab.arturbosch.detekt.Detekt
import org.jetbrains.changelog.markdownToHTML
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

Expand All @@ -13,10 +12,6 @@ plugins {
id("org.jetbrains.intellij") version "1.1.4"
// gradle-changelog-plugin - read more: https://github.com/JetBrains/gradle-changelog-plugin
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")
Expand All @@ -26,9 +21,6 @@ version = properties("pluginVersion")
repositories {
mavenCentral()
}
dependencies {
detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.17.1")
}

// Configure gradle-intellij-plugin plugin.
// Read more: https://github.com/JetBrains/gradle-intellij-plugin
Expand All @@ -50,19 +42,6 @@ changelog {
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
// Read more: https://github.com/JetBrains/intellij-ui-test-robot
tasks {
Expand All @@ -75,9 +54,6 @@ tasks {
withType<KotlinCompile> {
kotlinOptions.jvmTarget = it
}
withType<Detekt> {
jvmTarget = it
}
}

wrapper {
Expand Down
8 changes: 0 additions & 8 deletions detekt-config.yml

This file was deleted.

0 comments on commit a8ab416

Please sign in to comment.