Skip to content

Commit 5bad2e4

Browse files
committed
Simplify setup
1 parent 05ec3b7 commit 5bad2e4

File tree

2 files changed

+25
-19
lines changed

2 files changed

+25
-19
lines changed

build.gradle.kts

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1-
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
21
import org.radarbase.gradle.plugin.radarKotlin
2+
import org.radarbase.gradle.plugin.radarPublishing
33
import java.time.Duration
44

55
plugins {
66
id("application")
77
id("org.radarbase.radar-root-project") version Versions.radarCommons
88
id("org.radarbase.radar-dependency-management") version Versions.radarCommons
99
id("org.radarbase.radar-kotlin") version Versions.radarCommons
10+
id("org.radarbase.radar-publishing") version Versions.radarCommons
1011
id("com.avast.gradle.docker-compose") version Versions.dockerCompose
1112
}
1213

@@ -24,6 +25,19 @@ radarKotlin {
2425
slf4jVersion.set(Versions.slf4j)
2526
}
2627

28+
radarPublishing {
29+
val githubRepoName = "RADAR-base/radar-output-restructure"
30+
githubUrl.set("https://github.com/$githubRepoName.git")
31+
developers {
32+
developer {
33+
id.set("blootsvoets")
34+
name.set("Joris Borgdorff")
35+
email.set("[email protected]")
36+
organization.set("The Hyve")
37+
}
38+
}
39+
}
40+
2741
sourceSets {
2842
create("integrationTest") {
2943
compileClasspath += sourceSets.main.get().output
@@ -86,9 +100,6 @@ dependencies {
86100

87101
application {
88102
mainClass.set("org.radarbase.output.Application")
89-
applicationDefaultJvmArgs = listOf(
90-
"-Djava.security.egd=file:/dev/./urandom",
91-
)
92103
}
93104

94105
distributions {
@@ -101,12 +112,6 @@ distributions {
101112
}
102113
}
103114

104-
tasks.withType<KotlinCompile> {
105-
kotlinOptions {
106-
freeCompilerArgs = listOf("-opt-in=kotlin.RequiresOptIn")
107-
}
108-
}
109-
110115
tasks.startScripts {
111116
classpath = classpath?.let { it + files("lib/PlaceHolderForPluginPath") }
112117

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
1+
@Suppress("ConstPropertyName")
12
object Versions {
23
const val project = "2.3.3-SNAPSHOT"
34

45
const val java = 17
56
const val kotlin = "1.9.10"
6-
const val dockerCompose = "0.17.4"
7+
const val dockerCompose = "0.17.5"
78

8-
const val radarCommons = "1.1.0"
9+
const val radarCommons = "1.1.1"
910
const val radarSchemas = "0.8.4"
1011
const val jackson = "2.15.2"
1112
const val slf4j = "2.0.9"
1213
const val log4j2 = "2.20.0"
13-
const val avro = "1.11.2"
14+
const val avro = "1.11.3"
1415

1516
const val mockitoKotlin = "5.1.0"
1617
const val hamcrest = "2.2"
@@ -19,17 +20,17 @@ object Versions {
1920

2021
const val managementPortal = "2.0.1-SNAPSHOT"
2122
const val coroutines = "1.7.3"
22-
const val snappy = "1.1.10.3"
23+
const val snappy = "1.1.10.5"
2324
const val jCommander = "1.82"
2425
const val almworks = "1.1.2"
25-
const val minio = "8.5.5"
26+
const val minio = "8.5.6"
2627
const val guava = "31.1-jre"
2728
const val opencsv = "5.8"
2829
const val okhttp = "4.11.0"
29-
const val jedis = "5.0.0"
30-
const val azureStorage = "12.23.1"
31-
const val netty = "4.1.97.Final"
30+
const val jedis = "5.0.1"
31+
const val azureStorage = "12.24.0"
32+
const val netty = "4.1.99.Final"
3233
const val snakeYaml = "2.2"
3334
const val apacheCommonsText = "1.10.0"
34-
const val projectReactorNetty = "1.1.10"
35+
const val projectReactorNetty = "1.1.11"
3536
}

0 commit comments

Comments
 (0)