lazzexus/Kafkatorio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

version bumps. Kotlin 1.7 and yarn.lock and others

Browse source
This commit is contained in:
Adam 2022-06-19 10:20:48 +02:00
parent f151027464
commit 33d31bfbdd
12 changed files with 450 additions and 718 deletions
Download patch file Download diff file Expand all files Collapse all files

7
buildSrc/repositories.settings.gradle.kts
View file

@ -12,6 +12,9 @@ dependencyResolutionManagement {
repositories {
myMavenLocal()
mavenCentral()
maven("https://s01.oss.sonatype.org/content/repositories/snapshots/") {
mavenContent { snapshotsOnly() }
}
jitpack()
gradlePluginPortal()
@ -28,6 +31,8 @@ dependencyResolutionManagement {
metadataSources { artifact() }
content { includeModule("com.yarnpkg", "yarn") }
}
maven("https://raw.githubusercontent.com/adamko-dev/kotka-streams/artifacts/m2")
}
pluginManagement {
@ -47,7 +52,7 @@ fun RepositoryHandler.jitpack() {
}
fun RepositoryHandler.myMavenLocal(enabled: Boolean = true) {
fun RepositoryHandler.myMavenLocal(enabled: Boolean = false) {
if (enabled) {
logger.lifecycle("Maven local is enabled")
mavenLocal {

11
buildSrc/src/main/kotlin/dev/adamko/kafkatorio/lang/kotlin-jvm.gradle.kts
View file

@ -7,7 +7,7 @@ plugins {
kotlin("jvm")
}
val projectKotlinTarget = "1.6"
val projectKotlinTarget = "1.7"
val projectJvmTarget = "11"
@ -54,10 +54,17 @@ tasks.compileTestKotlin {
kotlin {
jvmToolchain {
(this as JavaToolchainSpec).languageVersion.set(JavaLanguageVersion.of(projectJvmTarget))
languageVersion.set(JavaLanguageVersion.of(projectJvmTarget))
}
}
tasks.withType<Test>().configureEach {
useJUnitPlatform()
}
plugins.withType<ApplicationPlugin>().configureEach {
project.extensions.getByType<JavaApplication>().apply {
applicationDefaultJvmArgs += listOf("-Dkotlinx.coroutines.debug")
}
}

1051
gradle/kotlin-js-store/yarn.lock
View file

File diff suppressed because it is too large Load diff

56
gradle/libs.versions.toml
View file

@ -6,13 +6,13 @@
## compilation ##
jvm = "11"
kotlin = "1.6.21"
kotlin = "1.7.0"
## libs ##
camel-kafkaConnectors = "0.11.0"
http4k = "4.25.16.2"
kafka = "3.2.0"
kvision = "5.10.0"
kvision = "5.10.1"
log4j2 = "2.17.2"
qosLogback = "1.2.11"
slf4j = "1.7.36"
@ -21,7 +21,8 @@ scrimage = "4.0.31"
semver = "1.2.0"
kotlinx-serialization = "1.3.3"
kxs-yaml = "0.44.0"
kxs-charleskornKaml = "0.44.0"
kxs-mamoeYamlkt = "0.12.0"
kotlinJsWrappers = "1.0.0-pre.339"
kotlinx-html = "0.7.5"
@ -30,9 +31,11 @@ kotlinx-coroutines = "1.6.1"
kotlinx-cli = "0.3.4"
kotlinx-datetime = "0.3.3"
ktor = "2.0.1"
ktor = "2.0.2"
kotkaStreams = "v22.05.25"
hoplite = "2.1.5"
kotkaStreams = "dev-SNAPSHOT"
## test ##
junit = "5.8.2"
@ -68,14 +71,25 @@ loggingCapabilities = { id = "dev.jacomet.logging-capabilities", vers
## kotlin ##
kotlin-bom = { group = "org.jetbrains.kotlin", name = "kotlin-bom", version.ref = "kotlin" }
kotlinScripting-common = { group = "org.jetbrains.kotlin", name = "kotlin-scripting-common" }
kotlinScripting-jvm = { group = "org.jetbrains.kotlin", name = "kotlin-scripting-jvm" }
kotlinScripting-jvmHost = { group = "org.jetbrains.kotlin", name = "kotlin-scripting-jvm-host" }
kotlinScripting-dependencies = { group = "org.jetbrains.kotlin", name = "kotlin-scripting-dependencies" }
kotlinScripting-dependenciesMaven = { group = "org.jetbrains.kotlin", name = "kotlin-scripting-dependencies-maven" }
kotlinx-serialization-bom = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-bom", version.ref = "kotlinx-serialization" }
kotlinx-serialization-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-core" }
kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json" }
kotlinx-serialization-protobuf = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-protobuf" }
kotlinx-serialization-cbor = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-cbor" }
kotlinx-serialization-hocon = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-hocon" }
kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json" }
kotlinx-serialization-properties = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-properties" }
kotlinx-serialization-protobuf = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-protobuf" }
kxs-charleskornKaml = { group = "com.charleskorn.kaml", name = "kaml", version.ref = "kxs-charleskornKaml" }
kxs-mamoeYamlkt = { group = "net.mamoe.yamlkt", name = "yamlkt", version.ref = "kxs-mamoeYamlkt" }
kotlinx-serialization-yaml = { group = "com.charleskorn.kaml", name = "kaml", version.ref = "kxs-yaml" }
kotlinx-coroutines-bom = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-bom", version.ref = "kotlinx-coroutines" }
kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core" }
@ -169,7 +183,8 @@ kafka-streamsTestUtils = { group = "org.apache.kafka", name = "kafka-streams-tes
# kafka helpers
#kotka = { group = "com.github.blueanvil", name = "kotka", version = "1.1.1" }
kafka-kotkaStreams = { group = "com.github.adamko-dev.kotka-streams", name = "kotka-streams", version.ref = "kotkaStreams" }
#kafka-kotkaStreams = { group = "com.github.adamko-dev.kotka-streams", name = "kotka-streams", version.ref = "kotkaStreams" }
kafka-kotkaStreams = { group = "dev.adamko.kotka", name = "kotka-streams", version.ref = "kotkaStreams" }
rocksdb = { group = "io.maryk.rocksdb", name = "rocksdb-multiplatform", version = "7.0.3" }
@ -186,6 +201,10 @@ okio-bom = { group = "com.squareup.okio", name = "okio-bom", version.ref = "oki
okio-core = { group = "com.squareup.okio", name = "okio" }
hoplite-core = { group = "com.sksamuel.hoplite", name = "hoplite-core", version.ref = "hoplite" }
hoplite-datetime = { group = "com.sksamuel.hoplite", name = "hoplite-datetime", version.ref = "hoplite" }
hoplite-yaml = { group = "com.sksamuel.hoplite", name = "hoplite-yaml", version.ref = "hoplite" }
#############
### test ###
#############
@ -256,3 +275,22 @@ http4k-test = [
"http4k-test-approval",
"http4k-test-kotest",
]
kotlinScripting-def = [
"kotlinScripting-common",
"kotlinScripting-jvm",
"kotlinScripting-dependencies",
"kotlinScripting-dependenciesMaven",
]
kotlinScripting-host = [
"kotlinScripting-common",
"kotlinScripting-jvm",
"kotlinScripting-jvmHost",
]
hoplite = [
"hoplite-core",
"hoplite-yaml",
"hoplite-datetime",
]

12
modules/events-mod/package.json
View file

@ -9,8 +9,7 @@
"engines": {
"node": "~14.19.1"
},
"devDependencies": {
},
"devDependencies": {},
"dependencies": {
"lua-types": "^2.11.0",
"typescript-to-lua": "1.4.4",
@ -18,10 +17,7 @@
"typescript": "4.6.2"
},
"license": "UNLICENSED",
"peerDependencies": {
},
"optionalDependencies": {
},
"bundledDependencies": [
]
"peerDependencies": {},
"optionalDependencies": {},
"bundledDependencies": []
}

5
modules/events-schema/build.gradle.kts
View file

@ -63,10 +63,7 @@ kotlin {
implementation(project.dependencies.platform(libs.kotlinx.serialization.bom))
implementation(libs.kotlinx.serialization.core)
implementation(libs.kotlinx.serialization.json)
api("dev.adamko.kxtsgen:kxs-ts-gen-core:dev-SNAPSHOT")
// implementation("com.github.adamko-dev:kotlinx-serialization-typescript-generator:dev-SNAPSHOT") {
// isChanging = true
// }
api("dev.adamko.kxstsgen:kxs-ts-gen-core:0.1.3")
}
}

1
modules/events-server/build.gradle.kts
View file

@ -46,6 +46,7 @@ dependencies {
isChanging = true
}
implementation(libs.bundles.hoplite)
}
//configurations.all {

3
modules/infra-kafka-cluster/build.gradle.kts
View file

@ -9,6 +9,9 @@ tasks.dockerEnv {
"GRAFANA_VERSION" to libs.versions.grafana,
"PROMETHEUS_VERSION" to libs.versions.prometheus,
"KAFKA_VERSION" to libs.versions.kafka,
"KAFKA_DL_URL" to libs.versions.kafka.map { ver ->
"https://dlcdn.apache.org/kafka/$ver/kafka_2.13-$ver.tgz"
}
// Limit JVM Heap Size
// "KAFKA_BROKER_HEAP_OPTS" to "-XX:MaxRAMPercentage=70.0",

3
modules/infra-kafka-cluster/src/.env
View file

@ -2,5 +2,6 @@
COMPOSE_PROJECT_NAME=kafkatorio
GRAFANA_VERSION=8.5.0
KAFKATORIO_VERSION=0.5.1
KAFKA_VERSION=3.1.0
KAFKA_DL_URL=https\://dlcdn.apache.org/kafka/3.2.0/kafka_2.13-3.2.0.tgz
KAFKA_VERSION=3.2.0
PROMETHEUS_VERSION=v2.34.0

5
modules/infra-kafka-cluster/src/docker-compose.yml
View file

@ -3,7 +3,7 @@ version: "3.9"
services:
kafka:
image: dev-adamko/kafka-kraft
image: dev-adamko/kafka-kraft:${KAFKA_VERSION}
container_name: "kafka"
restart: "unless-stopped"
build:
@ -11,7 +11,7 @@ services:
context: "."
target: "kafka-kraft"
args:
KAFKA_DL_URL: "https://dlcdn.apache.org/kafka/3.1.0/kafka_2.13-3.1.0.tgz"
KAFKA_DL_URL: "https://dlcdn.apache.org/kafka/${KAFKA_VERSION}/kafka_2.13-${KAFKA_VERSION}.tgz"
volumes:
- "./kafka-server.properties:/kafka/server.properties"
environment:
@ -23,6 +23,7 @@ services:
- "kafka-nw"
- "kafkatorio-nw"
ports:
# note: other Docker containers should use 29092
- "9092:9092"
- "9093:9093"

3
modules/versions-platform/build.gradle.kts
View file

@ -23,7 +23,8 @@ dependencies {
constraints {
api(libs.skrapeit)
api(libs.kotlinx.serialization.yaml)
api(libs.kxs.charleskornKaml)
api(libs.kxs.mamoeYamlkt)
api(libs.kafka.kotkaStreams)
api(libs.kafka.streams)
api(libs.okio.core)

9
settings.gradle.kts
View file

@ -30,11 +30,10 @@ dependencyResolutionManagement {
repositoriesMode.set(RepositoriesMode.PREFER_SETTINGS)
// repositories {
// mavenLocal {
// content {
// includeGroup("io.kvision")
// includeGroup("dev.adamko.kotka")
// }
// maven("https://s01.oss.sonatype.org/content/repositories/snapshots/") {
//// content {
//// includeGroup("dev.adamko.kxstsgen")
//// }
// }
// }
}