Fix inclusion of ktlint for check tasks

This commit is contained in:
Gary Tierney
2018-08-22 23:16:53 +01:00
parent 96e11dfe27
commit ba5ff2b765
5 changed files with 11 additions and 13 deletions
-1
View File
@@ -15,6 +15,5 @@ allprojects {
} }
apply from: 'gradle/properties.gradle' apply from: 'gradle/properties.gradle'
apply from: 'gradle/kotlin.gradle'
apply from: 'gradle/jacoco.gradle' apply from: 'gradle/jacoco.gradle'
apply from: 'gradle/wrapper.gradle' apply from: 'gradle/wrapper.gradle'
+1
View File
@@ -1,5 +1,6 @@
apply plugin: 'application' apply plugin: 'application'
apply plugin: 'org.jetbrains.kotlin.jvm' apply plugin: 'org.jetbrains.kotlin.jvm'
apply from: "$rootDir/gradle/kotlin.gradle"
description = 'Apollo Game' description = 'Apollo Game'
mainClassName = 'org.apollo.Server' mainClassName = 'org.apollo.Server'
+1
View File
@@ -1,5 +1,6 @@
apply plugin: 'java-library' apply plugin: 'java-library'
apply plugin: 'org.jetbrains.kotlin.jvm' apply plugin: 'org.jetbrains.kotlin.jvm'
apply from: "$rootDir/gradle/kotlin.gradle"
dependencies { dependencies {
test.useJUnitPlatform() test.useJUnitPlatform()
+1
View File
@@ -1,6 +1,7 @@
subprojects { subproj -> subprojects { subproj ->
if (subproj.buildFile.exists()) { if (subproj.buildFile.exists()) {
apply plugin: 'apollo-plugin' apply plugin: 'apollo-plugin'
apply from: "$rootDir/gradle/kotlin.gradle"
test { test {
useJUnitPlatform() useJUnitPlatform()
+8 -12
View File
@@ -1,14 +1,10 @@
gradle.projectsEvaluated { apply plugin: 'org.jmailen.kotlinter'
configure(subprojects.findAll { it.pluginManager.hasPlugin('kotlin') }) {
apply plugin: 'org.jmailen.kotlinter'
kotlinter { kotlinter {
ignoreFailures = true ignoreFailures = true
indentSize = 4 indentSize = 4
continuationIndentSize = 4 continuationIndentSize = 4
reporters = ['checkstyle', 'plain'] reporters = ['checkstyle', 'plain']
}
kotlin { experimental { coroutines 'enable' } }
}
} }
kotlin { experimental { coroutines 'enable' } }