Skip to content

Commit

Permalink
Merge pull request #1 from amitdash291/fix-4753
Browse files Browse the repository at this point in the history
Handle corner case of multiple inheritance in UnnecessaryAbstractClass rule
  • Loading branch information
gouri-panda committed Jul 10, 2022
2 parents 1a9aa3c + 69b3fd3 commit 2eabac7
Show file tree
Hide file tree
Showing 175 changed files with 3,465 additions and 1,519 deletions.
2 changes: 1 addition & 1 deletion .github/CONTRIBUTING.md
Expand Up @@ -64,7 +64,7 @@ Rules annotated with `@ActiveByDefault` will be marked as active in the `default
Generally, this will not be the case for new rules.

A rule that requires type resolution must be marked with `@RequiresTypeResolution`.
See [the type resolution wiki page](../docs/pages/gettingstarted/type-resolution.md) for
See [the type resolution wiki page](../website/docs/gettingstarted/type-resolution.md) for
more detail on this topic.

The rule defined above will translate to a rule entry in the `default-detekt-config.yml`:
Expand Down
11 changes: 7 additions & 4 deletions .github/workflows/codecoverage.yaml
Expand Up @@ -8,6 +8,9 @@ on:
branches:
- '**'

env:
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}

permissions:
contents: read

Expand All @@ -17,19 +20,19 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Repo
uses: actions/checkout@v3
uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # tag=v3

- name: Setup Java
uses: actions/setup-java@v3
uses: actions/setup-java@16cca5479d7c6b6843f6a6515640ba33c6501543 # tag=v3
with:
java-version: 17
distribution: 'temurin'

- name: Generate Coverage Report
uses: gradle/gradle-build-action@v2
uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1 # tag=v2
with:
arguments: jacocoMergedReport

- name: Publish Coverage
if: success()
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@81cd2dc8148241f03f5839d295e000b8f761e378 # tag=v3
11 changes: 7 additions & 4 deletions .github/workflows/deploy-snapshot.yaml
Expand Up @@ -5,6 +5,9 @@ on:
branches:
- main

env:
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}

permissions:
contents: read

Expand All @@ -14,21 +17,21 @@ jobs:
if: github.repository == 'detekt/detekt' && !contains(github.event.head_commit.message, 'ci skip')
steps:
- name: Checkout Repo
uses: actions/checkout@v3
uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # tag=v3

- name: Setup Java
uses: actions/setup-java@v3
uses: actions/setup-java@16cca5479d7c6b6843f6a6515640ba33c6501543 # tag=v3
with:
java-version: 17
distribution: 'temurin'

- name: Build detekt
uses: gradle/gradle-build-action@v2
uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1 # tag=v2
with:
arguments: build

- name: Deploy Snapshot
uses: gradle/gradle-build-action@v2
uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1 # tag=v2
env:
ORG_GRADLE_PROJECT_SIGNING_KEY: ${{ secrets.ORG_GRADLE_PROJECT_SIGNING_KEY }}
ORG_GRADLE_PROJECT_SIGNING_PWD: ${{ secrets.ORG_GRADLE_PROJECT_SIGNING_PWD }}
Expand Down
16 changes: 9 additions & 7 deletions .github/workflows/detekt-with-type-resolution.yaml
Expand Up @@ -10,6 +10,8 @@ on:

env:
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
GRADLE_CACHE_USERNAME: ${{ secrets.GRADLE_CACHE_USERNAME }}
GRADLE_CACHE_PASSWORD: ${{ secrets.GRADLE_CACHE_PASSWORD }}

permissions:
contents: read
Expand All @@ -23,21 +25,21 @@ jobs:
if: ${{ !contains(github.event.head_commit.message, 'ci skip') }}
steps:
- name: Checkout Repo
uses: actions/checkout@v3
uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # tag=v3

- name: Setup Java
uses: actions/setup-java@v3
uses: actions/setup-java@16cca5479d7c6b6843f6a6515640ba33c6501543 # tag=v3
with:
java-version: 17
distribution: 'temurin'

- name: Run detekt-cli with argsfile
uses: gradle/gradle-build-action@v2
uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1 # tag=v2
with:
arguments: :detekt-cli:runWithArgsFile

- name: Upload SARIF to Github using the upload-sarif action
uses: github/codeql-action/upload-sarif@v2
uses: github/codeql-action/upload-sarif@3f62b754e23e0dd60f91b744033e1dc1654c0ec6 # tag=v2
if: ${{ always() }}
with:
sarif_file: build/detekt-report.sarif
Expand All @@ -48,14 +50,14 @@ jobs:
if: ${{ !contains(github.event.head_commit.message, 'ci skip') }}
steps:
- name: Checkout Repo
uses: actions/checkout@v3
uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # tag=v3

- name: Setup Java
uses: actions/setup-java@v3
uses: actions/setup-java@16cca5479d7c6b6843f6a6515640ba33c6501543 # tag=v3
with:
java-version: 17
distribution: 'temurin'
- name: Run analysis
uses: gradle/gradle-build-action@v2
uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1 # tag=v2
with:
arguments: detektMain detektTest
4 changes: 2 additions & 2 deletions .github/workflows/fossascan.yaml
Expand Up @@ -14,9 +14,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Repo
uses: actions/checkout@v3
uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # tag=v3

- name: Run FOSSA Scan
uses: fossas/fossa-action@v1
uses: fossas/fossa-action@30055fd3dbc35d6ca57da934b5d8ac213a7871b4 # tag=v1
with:
api-key: ${{ secrets.FOSSA_API_KEY }}
4 changes: 2 additions & 2 deletions .github/workflows/gradle-wrapper-validation.yml
Expand Up @@ -16,6 +16,6 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout latest code
uses: actions/checkout@v3
uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # tag=v3
- name: Validate Gradle Wrapper
uses: gradle/wrapper-validation-action@v1
uses: gradle/wrapper-validation-action@e6e38bacfdf1a337459f332974bb2327a31aaf4b # tag=v1
2 changes: 1 addition & 1 deletion .github/workflows/labeler.yml
Expand Up @@ -9,6 +9,6 @@ jobs:
pull-requests: write
runs-on: ubuntu-latest
steps:
- uses: actions/labeler@v4
- uses: actions/labeler@9fd24f1f9d6ceb64ba34d181b329ee72f99978a0 # tag=v4
with:
repo-token: "${{ secrets.GITHUB_TOKEN }}"
44 changes: 31 additions & 13 deletions .github/workflows/pre-merge.yaml
Expand Up @@ -10,6 +10,8 @@ on:

env:
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
GRADLE_CACHE_USERNAME: ${{ secrets.GRADLE_CACHE_USERNAME }}
GRADLE_CACHE_PASSWORD: ${{ secrets.GRADLE_CACHE_PASSWORD }}

permissions:
contents: read
Expand All @@ -28,31 +30,31 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- name: Checkout Repo
uses: actions/checkout@v3
uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # tag=v3
- name: Setup Java
uses: actions/setup-java@v3
uses: actions/setup-java@16cca5479d7c6b6843f6a6515640ba33c6501543 # tag=v3
with:
java-version: ${{ matrix.jdk }}
distribution: 'temurin'
- name: Build detekt
uses: gradle/gradle-build-action@v2
uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1 # tag=v2
with:
arguments: build -x detekt
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # tag=v3
with:
name: heap-dump
path: '**.hprof'
if-no-files-found: ignore
- name: Run detekt-cli --help
uses: gradle/gradle-build-action@v2
uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1 # tag=v2
with:
arguments: :detekt-cli:runWithHelpFlag
- name: Run detekt-cli with argsfile
uses: gradle/gradle-build-action@v2
uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1 # tag=v2
with:
arguments: :detekt-cli:runWithArgsFile
- name: Try to publish to Maven Local
uses: gradle/gradle-build-action@v2
uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1 # tag=v2
with:
arguments: publishToMavenLocal

Expand All @@ -61,14 +63,14 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Repo
uses: actions/checkout@v3
uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # tag=v3
- name: Setup Java
uses: actions/setup-java@v3
uses: actions/setup-java@16cca5479d7c6b6843f6a6515640ba33c6501543 # tag=v3
with:
java-version: 17
distribution: 'temurin'
- name: Verify Generated Detekt Config File
uses: gradle/gradle-build-action@v2
uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1 # tag=v2
with:
arguments: verifyGeneratorOutput

Expand All @@ -77,13 +79,29 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Repo
uses: actions/checkout@v3
uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # tag=v3
- name: Setup Java
uses: actions/setup-java@v3
uses: actions/setup-java@16cca5479d7c6b6843f6a6515640ba33c6501543 # tag=v3
with:
java-version: 17
distribution: 'temurin'
- name: Build and compile test snippets
uses: gradle/gradle-build-action@v2
uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1 # tag=v2
with:
arguments: test -Pcompile-test-snippets=true

warnings-as-errors:
if: ${{ !contains(github.event.head_commit.message, 'ci skip') }}
runs-on: ubuntu-latest
steps:
- name: Checkout Repo
uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # tag=v3
- name: Setup Java
uses: actions/setup-java@16cca5479d7c6b6843f6a6515640ba33c6501543 # tag=v3
with:
java-version: 17
distribution: 'temurin'
- name: Run with allWarningsAsErrors
uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1 # tag=v2
with:
arguments: build -x detekt -PwarningsAsErrors=true
2 changes: 1 addition & 1 deletion .github/workflows/stale.yaml
Expand Up @@ -10,7 +10,7 @@ jobs:
issues: write
pull-requests: write
steps:
- uses: actions/stale@v5
- uses: actions/stale@3cc123766321e9f15a6676375c154ccffb12a358 # tag=v5
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
days-before-stale: 90
Expand Down
13 changes: 8 additions & 5 deletions .github/workflows/website.yaml
Expand Up @@ -8,6 +8,9 @@ on:
branches:
- '**'

env:
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}

permissions:
contents: write # for JamesIves/github-pages-deploy-action to push changes in repo

Expand All @@ -17,23 +20,23 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Repo
uses: actions/checkout@v3
uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # tag=v3

- name: Setup Java
uses: actions/setup-java@v3
uses: actions/setup-java@16cca5479d7c6b6843f6a6515640ba33c6501543 # tag=v3
with:
java-version: 17
distribution: 'temurin'

- name: Setup Node
uses: actions/setup-node@v3
uses: actions/setup-node@eeb10cff27034e7acf239c5d29f62154018672fd # tag=v3
with:
node-version: '16'
cache: 'yarn'
cache-dependency-path: 'website/yarn.lock'

- name: Build Detekt Documentation
uses: gradle/gradle-build-action@v2
uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1 # tag=v2
with:
arguments: :detekt-generator:generateDocumentation

Expand All @@ -46,7 +49,7 @@ jobs:
run: yarn build

- name: Deploy Github Pages (only on main)
uses: JamesIves/github-pages-deploy-action@v4
uses: JamesIves/github-pages-deploy-action@e6d003d0839927f5a4b998bfd92ed8e448fde37a # tag=v4
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
with:
branch: gh-pages
Expand Down

0 comments on commit 2eabac7

Please sign in to comment.