Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

improve compatibility of gradle plugin #907

Merged
merged 2 commits into from
Jun 4, 2021
Merged

improve compatibility of gradle plugin #907

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0093767
improve compatibility of gradle plugin
petertrr Jun 4, 2021
1b605fd
Merge branch 'master' into bugfix/#906
petertrr Jun 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion diktat-common/src/main/resources/log4j.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions diktat-gradle-plugin/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@ tasks.withType<KotlinCompile> {
languageVersion = "1.3"
apiVersion = "1.3"
jvmTarget = "1.8"
useIR = true
useIR = false // for compatibility with older gradle
allWarningsAsErrors = true
}
}

dependsOn.add(generateVersionsFile)
}
Expand Down
14 changes: 3 additions & 11 deletions diktat-gradle-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,22 +28,14 @@
<groupId>org.cqfn.diktat</groupId>
<artifactId>diktat-rules</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.pinterest.ktlint</groupId>
<artifactId>ktlint-core</artifactId>
<exclusions>
<exclusion>
<groupId>com.pinterest.ktlint</groupId>
<artifactId>ktlint-ruleset-standard</artifactId>
<!-- Since we need diktat-rules only for property name, we can exclude everything else -->
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.pinterest.ktlint</groupId>
<artifactId>ktlint-reporter-plain</artifactId>
<version>${ktlint.version}</version>
</dependency>
</dependencies>

<build>
Expand Down
2 changes: 1 addition & 1 deletion diktat-rules/src/main/resources/log4j.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion diktat-test-framework/src/main/resources/log4j.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down