diff --git a/.gitignore b/.gitignore index 1648e69a..120a8343 100644 --- a/.gitignore +++ b/.gitignore @@ -106,5 +106,5 @@ ENV/ .vscode/ -detekt/ -ktlint/ +detekt*.jar +ktlint diff --git a/Makefile b/Makefile index 44c0f1c3..5487127f 100644 --- a/Makefile +++ b/Makefile @@ -72,15 +72,6 @@ install: clean ## install the package to the active Python's site-packages python setup.py install install-kotlin-linters: ## install ktlint and detekt for linting Kotlin output - mkdir ktlint - ( \ - cd ktlint && \ - curl -sSLO https://github.com/shyiko/ktlint/releases/download/0.29.0/ktlint && \ - chmod a+x ktlint \ - ) - git clone https://github.com/arturbosch/detekt - ( \ - cd detekt && \ - git checkout 1.1.1 && \ - ./gradlew build detekt-cli:shadowJar \ - ) + curl -sSLO https://github.com/shyiko/ktlint/releases/download/0.29.0/ktlint + chmod a+x ktlint + curl -sSL --output "detekt-cli-1.1.1-all.jar" https://bintray.com/arturbosch/code-analysis/download_file?file_path=io%2Fgitlab%2Farturbosch%2Fdetekt%2Fdetekt-cli%2F1.1.1%2Fdetekt-cli-1.1.1-all.jar diff --git a/tests/test_kotlin.py b/tests/test_kotlin.py index 41f35d82..d3b078cf 100644 --- a/tests/test_kotlin.py +++ b/tests/test_kotlin.py @@ -23,10 +23,6 @@ DETEKT_VERSION = "1.1.1" def run_detekt(files): detekt_exec = ( ROOT.parent - / "detekt" - / "detekt-cli" - / "build" - / "libs" / f"detekt-cli-{DETEKT_VERSION}-all.jar" ) if detekt_exec.is_file(): @@ -45,7 +41,7 @@ def run_detekt(files): def run_ktlint(files): - ktlint_exec = ROOT.parent / "ktlint" / "ktlint" + ktlint_exec = ROOT.parent / "ktlint" if ktlint_exec.is_file(): subprocess.check_call([ktlint_exec] + files)