clean up build

Author: flyaruu

build.gradle.kts

@@ -15,14 +15,17 @@ buildscript {
         classpath("com.google.protobuf:protobuf-gradle-plugin:0.8.15")
     }
 }
+
+val buildKotlinVersion: String by extra
+
 plugins {
     id("org.jetbrains.kotlin.jvm") version "1.4.32"
     id("org.jetbrains.kotlin.plugin.allopen") version "1.4.32"
     id("org.jlleitschuh.gradle.ktlint") version "10.1.0"
     id("org.jetbrains.dokka") version "1.4.32"
-    id("com.github.hierynomus.license-base").version("0.15.0")
-    id("com.github.spotbugs") version "4.7.1"
-    id("io.gitlab.arturbosch.detekt") version "1.16.0"
+    id("com.github.hierynomus.license-base").version("0.16.1")
+    id("com.github.spotbugs") version "4.7.2"
+    id("io.gitlab.arturbosch.detekt") version "1.18.0-RC2"
     signing
     `maven-publish`
     `java-library`
@@ -57,10 +60,8 @@ subprojects {
     apply(plugin = "maven-publish")
     apply(plugin = "distribution")
     apply(plugin = "org.jetbrains.kotlin.jvm")
-    // apply(plugin = "org.jlleitschuh.gradle.ktlint")
     apply(plugin = "org.jetbrains.dokka")
     apply(plugin = "com.github.hierynomus.license-base")
-    //  apply(plugin = "checkstyle")
     apply(plugin = "jacoco")
     if (!isKotlinModule(this)) {
         // logger.warn("This project is not kotlin: ${this.name}")
@@ -74,19 +75,28 @@ subprojects {
     }
     if (isKotlinModule(this)) {
         apply(plugin = "io.gitlab.arturbosch.detekt")
+        detekt {
+            // Version of Detekt that will be used. When unspecified the latest detekt
+            // version found will be used. Override to stay on the same version.
+            toolVersion = "1.18.0-RC2"
+
+            // The directories where detekt looks for source files.
+            // Defaults to `files("src/main/java", "src/main/kotlin")`.
+            input = files("src/main/java", "src/main/kotlin")
+            config = files("${rootDir.path}/detektConfig.yml")
+        }
     }
     tasks.withType<com.hierynomus.gradle.license.tasks.LicenseFormat>().configureEach {
         this.header = File(this.project.rootDir, "HEADER")
         this.exclude("*.xml", "*.json")
         this.mapping(mapOf("java" to "SLASHSTAR_STYLE", "kt" to "SLASHSTAR_STYLE"))
     }
 
-    // if("floodplain-elasticsearch" != name) {
     tasks.test {
         useJUnitPlatform()
         jvmArgs("--enable-preview")
     }
-    // }
+
     tasks.withType<com.hierynomus.gradle.license.tasks.LicenseCheck>().configureEach {
         this.header = File(this.project.rootDir, "HEADER")
         this.exclude("*.xml", "*.json")
@@ -112,10 +122,6 @@ subprojects {
 
     val dokkaHtml by tasks.getting(org.jetbrains.dokka.gradle.DokkaTask::class)
 
-    // val dokkaHtml = tasks.named<org.jetbrains.dokka.gradle.DokkaTask>("dokkaHtml").configure {
-    //     // outputDirectory = buildDir.resolve("dokka").absolutePath
-    // }
-
     tasks {
         val sourcesJar by creating(Jar::class) {
             archiveClassifier.set("sources")
@@ -187,17 +193,6 @@ subprojects {
     }
 }
 
-detekt {
-    // Version of Detekt that will be used. When unspecified the latest detekt
-    // version found will be used. Override to stay on the same version.
-    toolVersion = "1.18.0-RC2"
-
-    // The directories where detekt looks for source files. 
-    // Defaults to `files("src/main/java", "src/main/kotlin")`.
-    input = files("src/main/java", "src/main/kotlin")
-    config = files("${projectDir.path}/detektConfig.yml")
-}
-
 fun customizePom(publication: MavenPublication) {
     with(publication.pom) {
         withXml {
@@ -237,7 +232,7 @@ fun customizePom(publication: MavenPublication) {
 }
 
 val detektAll by tasks.registering(Detekt::class) {
-    this.config.setFrom("${projectDir.path}/detektConfig.yml")
+    this.config.setFrom("${rootDir.path}/detektConfig.yml")
     description = "Runs over whole code base without the starting overhead for each module."
     parallel = true
     buildUponDefaultConfig = true
@@ -348,7 +343,7 @@ tasks.register<JacocoReport>("codeCoverageReport") {
 tasks.withType<Test> {
     useJUnitPlatform {
         includeEngines = setOf("junit-jupiter")
-        //this.includeTags = setOf("*")
+        // this.includeTags = setOf("*")
     }
     testLogging {
         events("passed", "skipped", "failed")

buildSrc/build.gradle.kts

@@ -1,7 +1,8 @@
+
+val buildKotlin = "1.4.32"
+
 plugins {
     `kotlin-dsl`
-    id("org.jetbrains.kotlin.jvm").version("1.4.31")
-    id("org.jetbrains.dokka").version("1.4.10.2")
     id("io.gitlab.arturbosch.detekt").version ("1.14.1")
 
 }
@@ -10,4 +11,5 @@ repositories {
     mavenLocal()
     mavenCentral()
     gradlePluginPortal()
+    // maven("https://maven.pkg.jetbrains.space/public/p/kotlinx-html/maven")
 }

buildSrc/src/main/kotlin/Dependencies.kt

@@ -1,19 +1,19 @@
 package io.floodplain.build
 
-object Versions {
+object FloodplainPlugins {
     const val kotlin = "1.4.32"
-
 }
 
 object Libs {
-    const val kotlin = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${Versions.kotlin}"
+    const val kotlin = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${FloodplainPlugins.kotlin}"
 }
 
 fun isReleaseVersion(): Boolean {
     return !FloodplainDeps.floodplain_version.endsWith("SNAPSHOT")
 }
 
 object FloodplainDeps {
+    const val kotlin = FloodplainPlugins.kotlin
     const val floodplain_version = "1.5.21-SNAPSHOT"
     const val jackson_version = "2.12.4"
     const val kafka_version = "2.8.0"

detektConfig.yml

@@ -1,7 +1,6 @@
 exceptions:
   SwallowedException:
-    active: false
-    excludes: ['**/Chunk.kt']
+    excludes: ['io/floodplain/external/**']
 
 formatting:
   MaximumLineLength:
@@ -25,7 +24,7 @@ style:
     max: 2
 
 build:
-  maxIssues: 45 # break the build if more than ten weighted issues are found
+  maxIssues: 145 # break the build if more than ten weighted issues are found
   weights:
     complexity: 2 # every rule of the complexity rule set should count as if two issues were found...
     LongParameterList: 1 # ...with the exception of the LongParameterList rule.

floodplain-api/src/main/kotlin/io/floodplain/Chunk.kt floodplain-api/src/main/kotlin/io/floodplain/external/Chunk.kt

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.floodplain
+package io.floodplain.external
 
 import kotlinx.coroutines.channels.ClosedReceiveChannelException
 import kotlinx.coroutines.channels.produce
@@ -37,6 +37,7 @@ import kotlinx.coroutines.selects.select
  * @param duration: The operation will not wait longer for entries than this number (in millis)
  */
 @OptIn(kotlinx.coroutines.ObsoleteCoroutinesApi::class)
+@Suppress("SwallowedException")
 fun <T> Flow<T>.bufferTimeout(size: Int, duration: Long): Flow<List<T>> {
     require(size > 0) { "Window size should be greater than 0" }
     require(duration > 0) { "Duration should be greater than 0" }

floodplain-debezium/build.gradle.kts

@@ -5,7 +5,6 @@ dependencies {
     implementation(FloodplainDeps.debeziumMySQL)
     compile(FloodplainDeps.kotlinLogging)
     implementation(project(":floodplain-api"))
-    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
     implementation(FloodplainDeps.kotlinCoroutines)
     testImplementation(project(":floodplain-dsl"))
     testImplementation(project(":floodplain-test"))

floodplain-debezium/src/main/kotlin/io/floodplain/debezium/postgres/DebeziumSource.kt

@@ -41,6 +41,8 @@ import kotlin.system.measureTimeMillis
 
 private val logger = mu.KotlinLogging.logger {}
 
+private const val OFFSETFILELENGTH = 7
+private const val SENDBLOCKING_WARN_THRESHOLD = 1000
 internal class EngineKillSwitch(var engine: DebeziumEngine<ChangeEvent<String, String>>? = null) {
 
     private val killed = AtomicBoolean(false)
@@ -56,7 +58,7 @@ internal class EngineKillSwitch(var engine: DebeziumEngine<ChangeEvent<String, S
 
 @OptIn(ExperimentalPathApi::class)
 private fun createOffsetFilePath(offsetId: String?): Path {
-    val tempFile = createTempFile(offsetId ?: UUID.randomUUID().toString().substring(0..7))
+    val tempFile = createTempFile(offsetId ?: UUID.randomUUID().toString().substring(0..OFFSETFILELENGTH))
     if (offsetId == null) {
         tempFile.toFile().deleteOnExit()
     }
@@ -127,6 +129,7 @@ fun createDebeziumChangeFlow(
     return runDebeziumServer(props)
 }
 
+@Suppress("SwallowedException")
 private fun ProducerScope<ChangeRecord>.createEngine(
     props: Properties,
     engineKillSwitch: EngineKillSwitch
@@ -152,7 +155,7 @@ private fun ProducerScope<ChangeRecord>.createEngine(
                         Thread.currentThread().interrupt()
                     }
                 }
-                if (perf > 1000) {
+                if (perf > SENDBLOCKING_WARN_THRESHOLD) {
                     logger.debug("Send blocking ran for: $perf")
                 }
             }

floodplain-dsl/build.gradle.kts

@@ -22,7 +22,6 @@ dependencies {
     implementation(FloodplainDeps.argParser)
     implementation(FloodplainDeps.jacksonDatabind310)
     implementation(FloodplainDeps.kafkaConnectRuntime)
-    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
     implementation(FloodplainDeps.kotlinCoroutines)
     testImplementation("org.junit.jupiter:junit-jupiter:${FloodplainDeps.junit_5_version}")
 }

floodplain-dsl/src/main/kotlin/io/floodplain/kotlindsl/LocalRuntime.kt

@@ -18,7 +18,7 @@
  */
 package io.floodplain.kotlindsl
 
-import io.floodplain.bufferTimeout
+import io.floodplain.external.bufferTimeout
 import io.floodplain.kotlindsl.message.IMessage
 import io.floodplain.kotlindsl.message.fromImmutable
 import io.floodplain.replication.api.ReplicationMessage

floodplain-dsl/src/test/kotlin/io/floodplain/kotlindsl/TestOutputFlow.kt

@@ -18,7 +18,7 @@
  */
 package io.floodplain.kotlindsl
 
-import io.floodplain.bufferTimeout
+import io.floodplain.external.bufferTimeout
 import io.floodplain.kotlindsl.message.IMessage
 import io.floodplain.kotlindsl.message.empty
 import io.floodplain.streams.api.Topic

floodplain-elasticsearch/build.gradle.kts

@@ -2,7 +2,6 @@ import io.floodplain.build.FloodplainDeps
 
 dependencies {
     compile(FloodplainDeps.kotlinLogging)
-    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
     implementation(project(":floodplain-stream-topology"))
     implementation(project(":streams-api"))
     implementation(project(":streams"))

floodplain-example/build.gradle.kts

@@ -23,6 +23,5 @@ dependencies {
     implementation("io.confluent:kafka-connect-elasticsearch:5.5.0")
     implementation(FloodplainDeps.kotlinCoroutines)
     compile(FloodplainDeps.slf4j)
-    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
     testImplementation("org.junit.jupiter:junit-jupiter:${FloodplainDeps.junit_5_version}")
 }

floodplain-fhir/build.gradle.kts

@@ -5,8 +5,6 @@ dependencies {
     implementation(FloodplainDeps.jacksonCore)
     implementation(FloodplainDeps.jacksonDatabind)
     implementation(FloodplainDeps.jacksonDatabind310)
-
-    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
     implementation(project(":floodplain-stream-topology"))
     implementation(project(":floodplain-dsl"))
     implementation(project(":replication-api"))

floodplain-googlesheets/build.gradle.kts

@@ -6,7 +6,6 @@ import io.floodplain.build.FloodplainDeps
 
 dependencies {
     compile(FloodplainDeps.kotlinLogging)
-    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
     implementation(project(":floodplain-stream-topology"))
     // This dependency is exported to consumers, that is to say found on their compile classpath.
     implementation("org.apache.commons:commons-math3:3.6.1")

floodplain-integration/build.gradle.kts

@@ -3,7 +3,6 @@ import io.floodplain.build.FloodplainDeps
 dependencies {
     api(FloodplainDeps.slf4j)
     compile(FloodplainDeps.kotlinLogging)
-    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
     implementation(project(":floodplain-stream-topology"))
     implementation(project(":immutable-api"))
     implementation(project(":streams-api"))

floodplain-mongodb/build.gradle.kts

@@ -2,7 +2,6 @@ import io.floodplain.build.FloodplainDeps
 
 dependencies {
     compile(FloodplainDeps.kotlinLogging)
-    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
     implementation(project(":floodplain-stream-topology"))
     implementation("org.mongodb.kafka:mongo-kafka-connect:1.6.0")
     implementation(FloodplainDeps.kafkaConnectRuntime)

floodplain-test/build.gradle.kts

@@ -4,5 +4,4 @@ dependencies {
     implementation(FloodplainDeps.testContainer)
     implementation(FloodplainDeps.testContainerKafka)
     implementation(FloodplainDeps.kotlinLogging)
-    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
 }

gradle.properties

@@ -1,4 +1,4 @@
 #Gradle properties
 systemProp.org.gradle.internal.publish.checksums.insecure=true
-kotlinVersion=1.4.31
+buildKotlinVersion=1.4.32
 org.gradle.jvmargs=-Xmx1024m

settings.gradle.kts

@@ -7,6 +7,13 @@
  * in the user manual at https://docs.gradle.org/5.6.2/userguide/multi_project_builds.html
  */
 
+pluginManagement {
+    val buildKotlinVersion: String by settings
+    plugins {
+        id("org.jetbrains.kotlin.jvm").version(buildKotlinVersion)
+        id("org.jetbrains.dokka").version(buildKotlinVersion)
+    }
+}
 rootProject.name = "floodplain-library"
 include(
     "immutable-api",