mirror of
https://github.com/2006-Scape/apollo.git
synced 2026-07-03 00:38:21 +00:00
Fix inclusion of ktlint for check tasks
This commit is contained in:
@@ -15,6 +15,5 @@ allprojects {
|
||||
}
|
||||
|
||||
apply from: 'gradle/properties.gradle'
|
||||
apply from: 'gradle/kotlin.gradle'
|
||||
apply from: 'gradle/jacoco.gradle'
|
||||
apply from: 'gradle/wrapper.gradle'
|
||||
@@ -1,5 +1,6 @@
|
||||
apply plugin: 'application'
|
||||
apply plugin: 'org.jetbrains.kotlin.jvm'
|
||||
apply from: "$rootDir/gradle/kotlin.gradle"
|
||||
|
||||
description = 'Apollo Game'
|
||||
mainClassName = 'org.apollo.Server'
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
apply plugin: 'java-library'
|
||||
apply plugin: 'org.jetbrains.kotlin.jvm'
|
||||
apply from: "$rootDir/gradle/kotlin.gradle"
|
||||
|
||||
dependencies {
|
||||
test.useJUnitPlatform()
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
subprojects { subproj ->
|
||||
if (subproj.buildFile.exists()) {
|
||||
apply plugin: 'apollo-plugin'
|
||||
apply from: "$rootDir/gradle/kotlin.gradle"
|
||||
|
||||
test {
|
||||
useJUnitPlatform()
|
||||
|
||||
+8
-12
@@ -1,14 +1,10 @@
|
||||
gradle.projectsEvaluated {
|
||||
configure(subprojects.findAll { it.pluginManager.hasPlugin('kotlin') }) {
|
||||
apply plugin: 'org.jmailen.kotlinter'
|
||||
apply plugin: 'org.jmailen.kotlinter'
|
||||
|
||||
kotlinter {
|
||||
ignoreFailures = true
|
||||
indentSize = 4
|
||||
continuationIndentSize = 4
|
||||
reporters = ['checkstyle', 'plain']
|
||||
}
|
||||
|
||||
kotlin { experimental { coroutines 'enable' } }
|
||||
}
|
||||
kotlinter {
|
||||
ignoreFailures = true
|
||||
indentSize = 4
|
||||
continuationIndentSize = 4
|
||||
reporters = ['checkstyle', 'plain']
|
||||
}
|
||||
|
||||
kotlin { experimental { coroutines 'enable' } }
|
||||
|
||||
Reference in New Issue
Block a user