From ae21781ea16a7f3bdea4d9019d1d4b584e12bc9d Mon Sep 17 00:00:00 2001 From: Ghais Zaher Date: Thu, 27 Apr 2023 12:04:12 +0200 Subject: [PATCH] Revert "fix: migrate to 0.49.0 (#40)" This reverts commit cc99a1f133e89a3a9b321f6d962c4a54bd51a9de. --- entrypoint.sh | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/entrypoint.sh b/entrypoint.sh index 2f87b6d..8e9be04 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -27,6 +27,10 @@ if [ ! -z "$INPUT_BASELINE" ]; then export BASELINE="--baseline=${INPUT_BASELINE}" fi +if [ "$INPUT_ANDROID" = true ]; then + export ANDROID=--android +fi + if [ "$INPUT_CUSTOM_RULE_PATH" ]; then export CUSTOM_RULE_PATH="--ruleset=${INPUT_CUSTOM_RULE_PATH}" fi @@ -37,20 +41,7 @@ git config --global --add safe.directory $GITHUB_WORKSPACE export REVIEWDOG_GITHUB_API_TOKEN="${INPUT_GITHUB_TOKEN}" -ktlint_version=$(ktlint --version) -echo "ktlint version: $ktlint_version" - -if [ "$(printf '%s\n' "0.49.0" "$ktlint_version" | sort -V | head -n1)" = "0.49.0" ]; then - if [ "$INPUT_ANDROID" = true ]; then - export ANDROID="--code-style=android_studio" - else - export ANDROID="--code-style=intellij_idea" - fi -else - if [ "$INPUT_ANDROID" = true ]; then - export ANDROID=--android - fi -fi +echo ktlint version: "$(ktlint --version)" ktlint --reporter=checkstyle $CUSTOM_RULE_PATH $RELATIVE $ANDROID $BASELINE $INPUT_FILE_GLOB | reviewdog -f=checkstyle \ @@ -59,4 +50,3 @@ ktlint --reporter=checkstyle $CUSTOM_RULE_PATH $RELATIVE $ANDROID $BASELINE $INP -level="${INPUT_LEVEL}" \ -filter-mode="${INPUT_FILTER_MODE}" \ -fail-on-error="${INPUT_FAIL_ON_ERROR}" -