Skip to content

Commit

Permalink
applied changes from joris' old branch
Browse files Browse the repository at this point in the history
  • Loading branch information
Bdegraaf1234 committed Mar 7, 2024
1 parent 339bebc commit 67df87f
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 5 deletions.
4 changes: 4 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,12 @@ charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true

[*.{kt,kts}]
ktlint_standard_no-wildcard-imports = disabled

[*.md]
trim_trailing_whitespace = false

[*.{json,yaml,yml}]
indent_style = space
indent_size = 2
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/Versions.kt
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ object Versions {
const val java = 11
const val slf4j = "2.0.9"
const val confluent = "7.5.0"
const val guava = "32.1.1-jre"
const val kafka = "7.5.0-ce"
const val avro = "1.11.3"
const val jackson = "2.15.2"
Expand All @@ -28,4 +27,5 @@ object Versions {
const val coroutines = "1.7.3"
const val commonsCompress = "1.24.0"
const val snappy = "1.1.10.5"
const val guava = "32.1.1-jre"
}
10 changes: 8 additions & 2 deletions radar-commons-server/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,21 @@ dependencies {
implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml")
implementation("com.fasterxml.jackson.core:jackson-databind")

api("org.apache.avro:avro:${Versions.avro}")

api("org.apache.avro:avro:${Versions.avro}") {
implementation("org.apache.commons:commons-compress:${Versions.commonsCompress}")
}

implementation("org.apache.kafka:kafka-clients:${Versions.kafka}") {
implementation("org.xerial.snappy:snappy-java:${Versions.snappy}")
}

testImplementation("org.mockito:mockito-core:${Versions.mockito}")
// Direct producer uses KafkaAvroSerializer if initialized
testImplementation("io.confluent:kafka-avro-serializer:${Versions.confluent}")

implementation("io.confluent:kafka-avro-serializer:${Versions.confluent}") {
runtimeOnly("com.google.guava:guava:${Versions.guava}")
}
testImplementation("org.radarbase:radar-schemas-commons:${Versions.radarSchemas}")
}

Expand Down
6 changes: 4 additions & 2 deletions radar-commons-testing/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ dependencies {
api(project(":radar-commons-server"))
api(project(":radar-commons-kotlin"))

api("org.apache.avro:avro:${Versions.avro}")
api("org.radarbase:radar-schemas-commons:${Versions.radarSchemas}")

implementation("com.opencsv:opencsv:${Versions.opencsv}")
Expand All @@ -50,7 +49,10 @@ dependencies {
implementation("org.apache.kafka:kafka-clients:${Versions.kafka}") {
implementation("org.xerial.snappy:snappy-java:${Versions.snappy}")
}
implementation("io.confluent:kafka-avro-serializer:${Versions.confluent}")

implementation("io.confluent:kafka-avro-serializer:${Versions.confluent}") {
runtimeOnly("com.google.guava:guava:${Versions.guava}")
}

api("org.apache.avro:avro:${Versions.avro}") {
implementation("org.apache.commons:commons-compress:${Versions.commonsCompress}")
Expand Down

0 comments on commit 67df87f

Please sign in to comment.