From 0093767d239981a3f11c5a98896788dafd6d7d45 Mon Sep 17 00:00:00 2001 From: Peter Trifanov Date: Fri, 4 Jun 2021 10:58:38 +0300 Subject: [PATCH] improve compatibility of gradle plugin ### What's done: * Exclude all transitive dependencies * Disable IR * Update log4j.properties --- diktat-common/src/main/resources/log4j.properties | 2 +- diktat-gradle-plugin/build.gradle.kts | 4 ++-- diktat-gradle-plugin/pom.xml | 14 +++----------- diktat-rules/src/main/resources/log4j.properties | 2 +- .../src/main/resources/log4j.properties | 2 +- 5 files changed, 8 insertions(+), 16 deletions(-) diff --git a/diktat-common/src/main/resources/log4j.properties b/diktat-common/src/main/resources/log4j.properties index 0298290c3d..4f6ddb5e3d 100644 --- a/diktat-common/src/main/resources/log4j.properties +++ b/diktat-common/src/main/resources/log4j.properties @@ -1,4 +1,4 @@ -log4j.rootLogger = INFO,stdout,D,E +log4j.rootLogger = INFO,stdout log4j.appender.stdout = org.apache.log4j.ConsoleAppender log4j.appender.stdout.Target = System.out diff --git a/diktat-gradle-plugin/build.gradle.kts b/diktat-gradle-plugin/build.gradle.kts index 7bee2e520b..033e2713f0 100644 --- a/diktat-gradle-plugin/build.gradle.kts +++ b/diktat-gradle-plugin/build.gradle.kts @@ -64,9 +64,9 @@ tasks.withType { languageVersion = "1.3" apiVersion = "1.3" jvmTarget = "1.8" - useIR = true + useIR = false // for compatibility with older gradle allWarningsAsErrors = true - } + } dependsOn.add(generateVersionsFile) } diff --git a/diktat-gradle-plugin/pom.xml b/diktat-gradle-plugin/pom.xml index 234b7ffe72..82ec29c993 100644 --- a/diktat-gradle-plugin/pom.xml +++ b/diktat-gradle-plugin/pom.xml @@ -28,22 +28,14 @@ org.cqfn.diktat diktat-rules ${project.version} - - - com.pinterest.ktlint - ktlint-core - com.pinterest.ktlint - ktlint-ruleset-standard + + * + * - - com.pinterest.ktlint - ktlint-reporter-plain - ${ktlint.version} - diff --git a/diktat-rules/src/main/resources/log4j.properties b/diktat-rules/src/main/resources/log4j.properties index 0298290c3d..4f6ddb5e3d 100644 --- a/diktat-rules/src/main/resources/log4j.properties +++ b/diktat-rules/src/main/resources/log4j.properties @@ -1,4 +1,4 @@ -log4j.rootLogger = INFO,stdout,D,E +log4j.rootLogger = INFO,stdout log4j.appender.stdout = org.apache.log4j.ConsoleAppender log4j.appender.stdout.Target = System.out diff --git a/diktat-test-framework/src/main/resources/log4j.properties b/diktat-test-framework/src/main/resources/log4j.properties index 0298290c3d..4f6ddb5e3d 100644 --- a/diktat-test-framework/src/main/resources/log4j.properties +++ b/diktat-test-framework/src/main/resources/log4j.properties @@ -1,4 +1,4 @@ -log4j.rootLogger = INFO,stdout,D,E +log4j.rootLogger = INFO,stdout log4j.appender.stdout = org.apache.log4j.ConsoleAppender log4j.appender.stdout.Target = System.out