diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index c3ee5dd..12d9fce 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -5,32 +5,32 @@ object Versions { object Plugins { const val licenseReport = "2.5" const val kotlin = "1.9.21" - const val dokka = "1.9.10" + const val dokka = "1.9.20" const val kotlinSerialization = kotlin const val kotlinAllOpen = kotlin - const val avro = "1.8.0" + const val avro = "1.11.3" const val gradle = "8.3" const val publishPlugin = "2.0.0-rc-1" } const val java = 17 - const val slf4j = "2.0.9" - const val confluent = "7.5.0" - const val kafka = "7.5.0-ce" + const val slf4j = "2.0.13" + const val confluent = "7.6.0" + const val kafka = "$confluent-ce" const val avro = "1.11.3" - const val jackson = "2.15.2" - const val okhttp = "4.11.0" - const val junit = "5.10.0" - const val mockito = "5.5.0" - const val mockitoKotlin = "5.1.0" + const val jackson = "2.17.0" + const val okhttp = "4.12.0" + const val junit = "5.10.2" + const val mockito = "5.11.0" + const val mockitoKotlin = "5.3.1" const val hamcrest = "2.2" - const val radarSchemas = "0.8.4" + const val radarSchemas = "0.8.7" const val opencsv = "5.8" - const val ktor = "2.3.4" - const val coroutines = "1.7.3" - const val commonsCompress = "1.26.0" + const val ktor = "2.3.10" + const val coroutines = "1.8.0" + const val commonsCompress = "1.26.1" const val snappy = "1.1.10.5" - const val guava = "32.1.1-jre" + const val guava = "33.1.0-jre" const val gradleVersionsPlugin = "0.50.0" const val ktlint = "12.0.3" } diff --git a/radar-commons-gradle/build.gradle.kts b/radar-commons-gradle/build.gradle.kts index 9585a34..229641e 100644 --- a/radar-commons-gradle/build.gradle.kts +++ b/radar-commons-gradle/build.gradle.kts @@ -1,17 +1,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget import org.jetbrains.kotlin.gradle.tasks.KotlinCompile -plugins { - `kotlin-dsl` - `java-gradle-plugin` - // Match to the versions in the bottom of this file - kotlin("jvm") version "1.9.21" - `maven-publish` - id("io.github.gradle-nexus.publish-plugin") version "2.0.0-rc-1" - id("org.jetbrains.dokka") version "1.9.10" - signing -} - version = "1.1.2" group = "org.radarbase" description = "RADAR-base common Gradle plugin setup" @@ -23,6 +12,17 @@ repositories { gradlePluginPortal() } +plugins { + `kotlin-dsl` + `java-gradle-plugin` + // Match to the versions in the Versions.kt file, these plugins are also imported as dependencies in this project. + kotlin("jvm") version "1.9.22" // Versions.Plugins.kotlin + `maven-publish` + id("io.github.gradle-nexus.publish-plugin") version "2.0.0-rc-1" // Versions.Plugins.publishPlugin + id("org.jetbrains.dokka") version "1.9.20" // Versions.Plugins.dokka + signing +} + dependencies { implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.Plugins.kotlin}") implementation("org.jetbrains.dokka:dokka-gradle-plugin:${Versions.Plugins.dokka}") @@ -172,42 +172,3 @@ tasks.withType { dependsOn(tasks.withType()) } -// Because this project is where all the required plugins get built, we need to add the dependencies separately here. -// They should be copied from the Versions.kt file directly to maintain consistency. -@Suppress("ConstPropertyName", "MemberVisibilityCanBePrivate") -object Versions { - const val project = "1.1.2" - - object Plugins { - const val licenseReport = "2.5" - const val kotlin = "1.9.21" - const val dokka = "1.9.10" - const val kotlinSerialization = kotlin - const val kotlinAllOpen = kotlin - const val avro = "1.8.0" - const val gradle = "8.3" - const val publishPlugin = "2.0.0-rc-1" - } - - const val java = 17 - const val slf4j = "2.0.9" - const val confluent = "7.5.0" - const val kafka = "7.5.0-ce" - const val avro = "1.11.3" - const val jackson = "2.15.2" - const val okhttp = "4.11.0" - const val junit = "5.10.0" - const val mockito = "5.5.0" - const val mockitoKotlin = "5.1.0" - const val hamcrest = "2.2" - const val radarSchemas = "0.8.4" - const val opencsv = "5.8" - const val ktor = "2.3.4" - const val coroutines = "1.7.3" - const val commonsCompress = "1.26.0" - const val snappy = "1.1.10.5" - const val guava = "32.1.1-jre" - const val gradleVersionsPlugin = "0.50.0" - const val ktlint = "12.0.3" -} -