Bumped dependencies

build.gradle.kts

@@ -30,6 +30,7 @@ val githubUrl = "https://github.com/$githubRepoName"
 
 radarRootProject {
     projectVersion.set(Versions.project)
+    gradleVersion.set("8.3")
 }
 
 subprojects {

buildSrc/build.gradle.kts

@@ -1,7 +1,24 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
 plugins {
     `kotlin-dsl`
 }
 
 repositories {
     mavenCentral()
 }
+
+
+tasks.withType<JavaCompile> {
+    sourceCompatibility = "17"
+    targetCompatibility = "17"
+}
+
+tasks.withType<KotlinCompile> {
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_17)
+        languageVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9)
+        apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9)
+    }
+}

buildSrc/src/main/kotlin/Versions.kt

@@ -2,24 +2,24 @@ object Versions {
     const val project = "1.0.1-SNAPSHOT"
 
     object Plugins {
-        const val kotlin = "1.8.22"
+        const val kotlin = "1.9.10"
         const val kotlinSerialization = kotlin
-        const val avro = "1.7.1"
+        const val avro = "1.8.0"
     }
 
     const val java = 11
     const val slf4j = "2.0.7"
-    const val confluent = "7.4.0"
-    const val kafka = "7.4.0-ce"
-    const val avro = "1.11.1"
+    const val confluent = "7.5.0"
+    const val kafka = "7.5.0-ce"
+    const val avro = "1.11.2"
     const val jackson = "2.15.2"
     const val okhttp = "4.11.0"
-    const val junit = "5.9.3"
-    const val mockito = "5.4.0"
-    const val mockitoKotlin = "5.0.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.7.1"
-    const val ktor = "2.3.2"
-    const val coroutines = "1.7.2"
+    const val opencsv = "5.8"
+    const val ktor = "2.3.4"
+    const val coroutines = "1.7.3"
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -83,7 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

radar-commons-gradle/build.gradle.kts

@@ -1,13 +1,14 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     `kotlin-dsl`
     `java-gradle-plugin`
-    kotlin("jvm") version "1.8.10"
+    kotlin("jvm") version "1.9.0"
     `maven-publish`
 }
 
-version = "1.0.1-SNAPSHOT"
+version = "1.0.2-SNAPSHOT"
 group = "org.radarbase"
 description = "RADAR common Gradle plugins"
 
@@ -17,11 +18,11 @@ repositories {
 }
 
 dependencies {
-    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.22")
-    implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.8.20")
+    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.0")
+    implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.9.0")
     implementation("com.github.ben-manes:gradle-versions-plugin:0.47.0")
     implementation("io.github.gradle-nexus:publish-plugin:1.3.0")
-    implementation("org.jlleitschuh.gradle:ktlint-gradle:11.4.2")
+    implementation("org.jlleitschuh.gradle:ktlint-gradle:11.5.1")
     implementation("com.github.jk1.dependency-license-report:com.github.jk1.dependency-license-report.gradle.plugin:2.5")
 }
 
@@ -50,8 +51,10 @@ tasks.withType<JavaCompile> {
     options.release.set(11)
 }
 tasks.withType<KotlinCompile> {
-    kotlinOptions {
-        jvmTarget = "11"
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_11)
+        languageVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9)
+        apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9)
     }
 }
 

radar-commons-gradle/src/main/kotlin/org/radarbase/gradle/plugin/RadarKotlinPlugin.kt

@@ -120,7 +120,7 @@ class RadarKotlinPlugin : Plugin<Project> {
 
         tasks.register<Copy>("copyDependencies") {
             from(configurations.named("runtimeClasspath").map { it.files })
-            into("$buildDir/third-party/")
+            into(layout.buildDirectory.dir("third-party"))
             doLast {
                 println("Copied third-party runtime dependencies")
             }
@@ -130,11 +130,11 @@ class RadarKotlinPlugin : Plugin<Project> {
 
         tasks.register<Tar>("collectLicenses") {
             from(
-                fileTree("$buildDir/reports/dependency-license"),
+                fileTree(layout.buildDirectory.dir("reports/dependency-license")),
                 rootDir.resolve("LICENSE"),
             )
             compression = Compression.GZIP
-            destinationDirectory.set(file("$buildDir/reports"))
+            destinationDirectory.set(layout.buildDirectory.dir("reports"))
             archiveBaseName.set("${project.name}-dependency-license")
             dependsOn(tasks["generateLicenseReport"])
         }

radar-commons-gradle/src/main/kotlin/org/radarbase/gradle/plugin/RadarPublishingPlugin.kt

@@ -46,7 +46,7 @@ class RadarPublishingPlugin : Plugin<Project> {
         apply<DokkaPlugin>()
 
         val dokkaJar by tasks.registering(Jar::class) {
-            from("$buildDir/dokka/javadoc")
+            from(layout.buildDirectory.dir("javadoc"))
             archiveClassifier.set("javadoc")
             val dokkaJavadoc by tasks
             dependsOn(dokkaJavadoc)

radar-commons-gradle/src/main/kotlin/org/radarbase/gradle/plugin/Versions.kt

@@ -1,9 +1,9 @@
 package org.radarbase.gradle.plugin
 
 object Versions {
-    const val wrapper = "8.2"
-    const val kotlin = "1.8.22"
-    const val ktlint = "0.49.1"
+    const val wrapper = "8.3"
+    const val kotlin = "1.9.10"
+    const val ktlint = "0.50.0"
     const val java = 11
-    const val junit = "5.9.3"
+    const val junit = "5.10.0"
 }

radar-commons/src/main/java/org/radarbase/config/ServerConfig.kt

@@ -107,6 +107,7 @@ class ServerConfig {
             checkNotNull(protocol) { "Cannot create URL without protocol" }
             checkNotNull(host) { "Cannot create URL without host" }
             return try {
+                @Suppress("DEPRECATION")
                 URL(protocol, host, port, path)
             } catch (ex: MalformedURLException) {
                 throw IllegalStateException("Already parsed a URL but it turned out invalid", ex)