Skip to content

Commit 89236e2

Browse files
flyaruuflyaruu
committed
removed argparser. Update to Java 17. Upgrade deps
1 parent 51fcac4 commit 89236e2

File tree

24 files changed

+55
-330
lines changed

24 files changed

+55
-330
lines changed

‎.idea/codeStyles/Project.xml

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/gradle.xml

+1-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/kotlinc.xml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/misc.xml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build.gradle.kts

+4-6
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ import java.io.File
66

77
buildscript {
88
repositories {
9-
mavenLocal()
109
mavenCentral()
1110
gradlePluginPortal()
1211
maven("https://plugins.gradle.org/m2/")
12+
mavenLocal()
1313
}
1414
dependencies {
1515
classpath("gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin:0.16.1")
@@ -22,11 +22,11 @@ buildscript {
2222
val buildKotlinVersion: String by extra
2323

2424
plugins {
25-
kotlin("jvm") version "1.7.10"
25+
kotlin("jvm") version "1.8.20"
2626

27-
id("org.jetbrains.kotlin.plugin.allopen") version "1.7.10"
27+
id("org.jetbrains.kotlin.plugin.allopen") version "1.8.20"
2828
id("org.jlleitschuh.gradle.ktlint") version "11.0.0"
29-
id("org.jetbrains.dokka") version "1.7.10"
29+
id("org.jetbrains.dokka") version "1.8.10"
3030
id("com.github.hierynomus.license-base").version("0.16.1")
3131
id("com.github.spotbugs") version "5.0.12"
3232
id("io.gitlab.arturbosch.detekt") version "1.21.0"
@@ -49,7 +49,6 @@ java {
4949
dependencies {
5050
implementation(io.floodplain.build.Libs.kotlin)
5151
implementation("org.jetbrains.kotlin:kotlin-serialization")
52-
5352
}
5453

5554
allprojects {
@@ -307,7 +306,6 @@ plugins.withType<JacocoPlugin> {
307306
}
308307

309308
tasks.withType<JacocoReport> {
310-
311309
}
312310

313311
tasks.register<JacocoReport>("codeCoverageReport") {

‎buildSrc/build.gradle.kts

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ val buildKotlin = "1.4.32"
55
plugins {
66
`kotlin-dsl`
77
id("io.gitlab.arturbosch.detekt").version ("1.20.0")
8-
kotlin("jvm") version "1.7.10"
8+
kotlin("jvm") version "1.8.20"
99

1010
}
1111

@@ -16,9 +16,9 @@ tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
1616
}
1717

1818
repositories {
19-
mavenLocal()
2019
mavenCentral()
2120
gradlePluginPortal()
21+
mavenLocal()
2222
// maven("https://maven.pkg.jetbrains.space/public/p/kotlinx-html/maven")
2323
}
2424
dependencies {
@@ -27,9 +27,9 @@ dependencies {
2727
}
2828
val compileKotlin: KotlinCompile by tasks
2929
compileKotlin.kotlinOptions {
30-
jvmTarget = "11"
30+
jvmTarget = "17"
3131
}
3232
val compileTestKotlin: KotlinCompile by tasks
3333
compileTestKotlin.kotlinOptions {
34-
jvmTarget = "11"
34+
jvmTarget = "17"
3535
}

‎buildSrc/src/main/kotlin/Dependencies.kt

+8-10
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package io.floodplain.build
22

33
object FloodplainPlugins {
4-
const val kotlin = "1.7.10"
4+
const val kotlin = "1.8.20"
55
}
66

77
object Libs {
@@ -15,27 +15,26 @@ fun isReleaseVersion(): Boolean {
1515
object FloodplainDeps {
1616
const val kotlin = FloodplainPlugins.kotlin
1717
const val floodplain_version = "1.12.1-SNAPSHOT"
18-
const val jackson_version = "2.14.1"
18+
const val jackson_version = "2.15.0"
1919
const val kafka_version = "3.3.1!!"
2020
const val slf4j_version = "1.7.36"
21-
const val mysql_version = "8.0.31"
22-
const val mongodb_version = "4.5.0"
21+
const val mysql_version = "8.0.32"
22+
const val mongodb_version = "4.9.1"
2323
const val debezium_version = "2.1.1.Final"
24-
const val testContainer_version = "1.17.6"
24+
const val testContainer_version = "1.18.0"
2525
const val kotlin_coroutines_version = "1.6.4"
2626
const val junit_5_version = "5.9.2"
2727
const val debeziumPostgres = "io.debezium:debezium-connector-postgres:$debezium_version"
2828
const val debeziumMySQL = "io.debezium:debezium-connector-mysql:$debezium_version"
2929
const val debeziumEmbedded = "io.debezium:debezium-embedded:$debezium_version"
30-
const val debeziumTestContainers = "io.debezium:debezium-testing-testcontainers:$debezium_version"
3130
const val cdiApi = "jakarta.enterprise:jakarta.enterprise.cdi-api:2.0.2"
3231
const val microProfileConfig = "org.eclipse.microprofile.config:microprofile-config-api:1.3"
3332
const val mongoClientSync = "org.mongodb:mongodb-driver-sync:$mongodb_version"
3433
const val slf4j = "org.slf4j:slf4j-api:$slf4j_version"
3534
const val slf4jLog4j = "org.slf4j:slf4j-log4j12:$slf4j_version"
36-
const val protobuf = "com.google.protobuf:protobuf-java:3.17.3"
37-
const val kotlinLogging = "io.github.microutils:kotlin-logging:2.1.21"
38-
const val commonsCompress = "org.apache.commons:commons-compress:1.21"
35+
const val protobuf = "com.google.protobuf:protobuf-java:3.22.2"
36+
const val kotlinLogging = "io.github.microutils:kotlin-logging:3.0.5"
37+
const val commonsCompress = "org.apache.commons:commons-compress:1.23.0"
3938
const val jacksonCore = "com.fasterxml.jackson.core:jackson-core:$jackson_version"
4039
const val jacksonDatabind = "com.fasterxml.jackson.core:jackson-databind:$jackson_version"
4140
const val jacksonDatabind310 = "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
@@ -47,5 +46,4 @@ object FloodplainDeps {
4746
const val testContainer = "org.testcontainers:testcontainers:$testContainer_version"
4847
const val testContainerKafka = "org.testcontainers:kafka:$testContainer_version"
4948
const val kotlinCoroutines = "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_coroutines_version"
50-
const val argParser = "com.xenomachina:kotlin-argparser:2.0.7"
5149
}

‎floodplain-api/build.gradle.kts

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import io.floodplain.build.FloodplainDeps
22
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
33

44
plugins {
5-
kotlin("jvm") version "1.7.10"
5+
kotlin("jvm") version "1.8.20"
66
}
77

88
dependencies {
@@ -14,9 +14,9 @@ repositories {
1414
}
1515
val compileKotlin: KotlinCompile by tasks
1616
compileKotlin.kotlinOptions {
17-
jvmTarget = "11"
17+
jvmTarget = "17"
1818
}
1919
val compileTestKotlin: KotlinCompile by tasks
2020
compileTestKotlin.kotlinOptions {
21-
jvmTarget = "11"
21+
jvmTarget = "17"
2222
}

‎floodplain-debezium/build.gradle.kts

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import io.floodplain.build.FloodplainDeps
22
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
33

44
plugins {
5-
kotlin("jvm") version "1.7.10"
5+
kotlin("jvm") version "1.8.20"
66
}
77
dependencies {
88
implementation(FloodplainDeps.debeziumEmbedded)
@@ -22,9 +22,9 @@ repositories {
2222
}
2323
val compileKotlin: KotlinCompile by tasks
2424
compileKotlin.kotlinOptions {
25-
jvmTarget = "11"
25+
jvmTarget = "17"
2626
}
2727
val compileTestKotlin: KotlinCompile by tasks
2828
compileTestKotlin.kotlinOptions {
29-
jvmTarget = "11"
29+
jvmTarget = "17"
3030
}

‎floodplain-dsl/build.gradle.kts

+3-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import io.floodplain.build.FloodplainDeps
22
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
33

44
plugins {
5-
kotlin("jvm") version "1.7.10"
5+
kotlin("jvm") version "1.8.20"
66
}
77

88
dependencies {
@@ -25,7 +25,6 @@ dependencies {
2525
implementation(FloodplainDeps.debeziumPostgres)
2626
implementation(FloodplainDeps.debeziumMySQL)
2727
implementation(FloodplainDeps.debeziumEmbedded)
28-
implementation(FloodplainDeps.argParser)
2928
implementation(FloodplainDeps.jacksonDatabind310)
3029
implementation(FloodplainDeps.kafkaConnectRuntime)
3130
implementation(FloodplainDeps.kotlinCoroutines)
@@ -37,9 +36,9 @@ repositories {
3736
}
3837
val compileKotlin: KotlinCompile by tasks
3938
compileKotlin.kotlinOptions {
40-
jvmTarget = "11"
39+
jvmTarget = "17"
4140
}
4241
val compileTestKotlin: KotlinCompile by tasks
4342
compileTestKotlin.kotlinOptions {
44-
jvmTarget = "11"
43+
jvmTarget = "17"
4544
}

‎floodplain-dsl/src/main/kotlin/io/floodplain/kotlindsl/Stream.kt

-14
Original file line numberDiff line numberDiff line change
@@ -507,20 +507,6 @@ class Stream(override val topologyContext: TopologyContext, val topologyConstruc
507507
return streamsConfiguration
508508
}
509509

510-
fun runWithArguments(
511-
args: Array<out String?> = emptyArray(),
512-
after: suspend ((topologyContext: TopologyContext) -> Unit)
513-
) {
514-
runBlocking {
515-
io.floodplain.runtime.run(
516-
this@Stream,
517-
args,
518-
{ after(it) },
519-
{ _, topologyContext -> after(topologyContext) }
520-
)
521-
}
522-
}
523-
524510
override val rootTopology: Stream
525511
get() = this
526512
}

‎floodplain-dsl/src/main/kotlin/io/floodplain/runtime/LocalArgs.kt

-112
This file was deleted.

‎floodplain-dsl/src/test/kotlin/io/floodplain/kotlindsl/TestTopology.kt

-10
Original file line numberDiff line numberDiff line change
@@ -1176,14 +1176,4 @@ class TestTopology {
11761176
logger.info("Result: $value")
11771177
}
11781178
}
1179-
1180-
@Test
1181-
fun testArgumentParser() {
1182-
stream {
1183-
from("sometopic") {
1184-
toTopic("outputTopic")
1185-
}
1186-
}.runWithArguments(arrayOf("--help")) {
1187-
}
1188-
}
11891179
}

0 commit comments

Comments
 (0)