chore: gradle housekeeping

Author: sgbalogh

app/build.gradle.kts

@@ -27,18 +27,19 @@ dependencies {
     testImplementation("org.junit.jupiter:junit-jupiter:5.9.2")
 }
 
-val executables = mapOf(
-    "AccountDemo" to "org.example.app.AccountDemo",
-    "BasinDemo" to "org.example.app.BasinDemo",
-    "BufferedReadSessionDemo" to "org.example.app.BufferedReadSessionDemo",
-    "FutureAppendSessionDemo" to "org.example.app.FutureAppendSessionDemo",
-    "ReadSessionDemo" to "org.example.app.ReadSessionDemo",
+val executables = listOf(
+    "org.example.app.AccountDemo",
+    "org.example.app.BasinDemo",
+    "org.example.app.ManagedReadSessionDemo",
+    "org.example.app.ManagedAppendSessionDemo",
+    "org.example.app.ReadSessionDemo"
 )
 
-executables.forEach { name, mainClassName ->
-    tasks.register<JavaExec>("run${name}") {
+executables.forEach { mainClassName ->
+    val name = mainClassName.substringAfterLast('.')
+    tasks.register<JavaExec>("run$name") {
         group = "application"
-        description = "Run the $name executable"
+        description = "Run the $name demo app."
         classpath = sourceSets["main"].runtimeClasspath
         mainClass.set(mainClassName)
     }

gradle/libs.versions.toml

@@ -1,8 +1,28 @@
-# This file was generated by the Gradle 'init' task.
-# https://docs.gradle.org/current/userguide/platforms.html#sub::toml-dependencies-format
-
 [versions]
+assertJ = "3.24.2"
+grpc = "1.70.0"
+javaxAnnotation = "1.3.2"
 junit-jupiter = "5.11.4"
+mockito = "5.8.0"
+protobuf = "4.29.3"
+slf4j = "1.7.32"
+system-stubs-jupiter = "2.1.7"
+tomcatAnnotations = "11.0.2"
 
 [libraries]
-junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit-jupiter" }
+assertj-core = { module = "org.assertj:assertj-core", version.ref = "assertJ" }
+grpc-inprocess = { module = "io.grpc:grpc-inprocess", version.ref = "grpc" }
+grpc-netty-shaded = { module = "io.grpc:grpc-netty-shaded", version.ref = "grpc" }
+grpc-protobuf = { module = "io.grpc:grpc-protobuf", version.ref = "grpc" }
+grpc-stub = { module = "io.grpc:grpc-stub", version.ref = "grpc" }
+grpc-testing = { module = "io.grpc:grpc-testing", version.ref = "grpc" }
+javax-annotation-api = { module = "javax.annotation:javax.annotation-api", version.ref = "javaxAnnotation" }
+junit-bom = { module = "org.junit:junit-bom", version.ref = "junit-jupiter" }
+junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit-jupiter" }
+junit-platform-launcher = { module = "org.junit.platform:junit-platform-launcher" }
+mockito-core = { module = "org.mockito:mockito-core", version.ref = "mockito" }
+mockito-junit-jupiter = { module = "org.mockito:mockito-junit-jupiter", version.ref = "mockito" }
+protobuf-java = { module = "com.google.protobuf:protobuf-java", version.ref = "protobuf" }
+slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
+system-stubs-jupiter = { module = "uk.org.webcompere:system-stubs-jupiter", version.ref = "system-stubs-jupiter" }
+tomcat-annotations = { module = "org.apache.tomcat:tomcat-annotations-api", version.ref = "tomcatAnnotations" }

s2-internal/build.gradle.kts

@@ -11,34 +11,29 @@ repositories {
     mavenCentral()
 }
 
-val grpcVersion = "1.64.0"
-val protobufVersion = "3.25.0"
-val tomcatAnnotationsVersion = "11.0.2"
-val javaxAnnotationVersion = "1.3.2"
-val mockitoVersion = "5.8.0"
-val assertJVersion = "3.24.2"
-
 dependencies {
-    implementation("io.grpc:grpc-protobuf:$grpcVersion")
-    implementation("io.grpc:grpc-stub:$grpcVersion")
-    implementation("io.grpc:grpc-netty-shaded:$grpcVersion")
-    implementation("javax.annotation:javax.annotation-api:$javaxAnnotationVersion")
-    implementation("com.google.protobuf:protobuf-java:$protobufVersion")
-    implementation("org.slf4j:slf4j-api:1.7.32")
-    compileOnly("org.apache.tomcat:tomcat-annotations-api:$tomcatAnnotationsVersion")
-    testImplementation(platform("org.junit:junit-bom:5.11.4"))
+    compileOnly(libs.tomcat.annotations)
+    implementation(libs.grpc.netty.shaded)
+    implementation(libs.grpc.protobuf)
+    implementation(libs.grpc.stub)
+    implementation(libs.javax.annotation.api)
+    implementation(libs.protobuf.java)
+    implementation(libs.slf4j.api)
+    testImplementation(libs.assertj.core)
+    testImplementation(libs.grpc.inprocess)
+    testImplementation(libs.grpc.testing)
     testImplementation(libs.junit.jupiter)
-    testImplementation("io.grpc:grpc-testing:$grpcVersion")
-    testImplementation("io.grpc:grpc-inprocess:$grpcVersion")
-    testImplementation("org.mockito:mockito-core:$mockitoVersion")
-    testImplementation("org.mockito:mockito-junit-jupiter:$mockitoVersion") {
+    testImplementation(libs.mockito.core)
+    testImplementation(libs.mockito.junit.jupiter) {
         exclude(group = "org.junit.jupiter")
     }
-    testImplementation("uk.org.webcompere:system-stubs-jupiter:2.1.7")
-    testImplementation("org.assertj:assertj-core:$assertJVersion")
-    testRuntimeOnly("org.junit.platform:junit-platform-launcher")
+    testImplementation(libs.system.stubs.jupiter)
+    testImplementation(platform(libs.junit.bom))
+    testRuntimeOnly(libs.junit.platform.launcher)
 }
 
+val protobufVersion: String = libs.versions.protobuf.get()
+val grpcVersion: String = libs.versions.grpc.get()
 protobuf {
     protoc {
         artifact = "com.google.protobuf:protoc:$protobufVersion"
@@ -61,6 +56,8 @@ java {
     toolchain {
         languageVersion.set(JavaLanguageVersion.of(17))
     }
+    withJavadocJar()
+    withSourcesJar()
 }
 
 

s2/build.gradle.kts

@@ -10,37 +10,25 @@ repositories {
     mavenCentral()
 }
 
-val grpcVersion = "1.64.0"
-val protobufVersion = "3.25.0"
-val tomcatAnnotationsVersion = "11.0.2"
-val javaxAnnotationVersion = "1.3.2"
-val mockitoVersion = "5.8.0"
-val assertJVersion = "3.24.2"
-
 dependencies {
+    compileOnly(libs.tomcat.annotations)
+    implementation(libs.grpc.netty.shaded)
+    implementation(libs.grpc.protobuf)
+    implementation(libs.grpc.stub)
+    implementation(libs.javax.annotation.api)
+    implementation(libs.slf4j.api)
     implementation(project(":s2-internal"))
-
-    implementation("io.grpc:grpc-protobuf:$grpcVersion")
-    implementation("io.grpc:grpc-stub:$grpcVersion")
-    implementation("io.grpc:grpc-netty-shaded:$grpcVersion")
-    implementation("javax.annotation:javax.annotation-api:$javaxAnnotationVersion")
-    implementation("com.google.protobuf:protobuf-java:$protobufVersion")
-    implementation("org.slf4j:slf4j-api:1.7.32")
-
-    compileOnly("org.apache.tomcat:tomcat-annotations-api:$tomcatAnnotationsVersion")
-
-    testImplementation(platform("org.junit:junit-bom:5.11.4"))
+    testImplementation(libs.assertj.core)
+    testImplementation(libs.grpc.inprocess)
+    testImplementation(libs.grpc.testing)
     testImplementation(libs.junit.jupiter)
-    testImplementation("io.grpc:grpc-testing:$grpcVersion")
-    testImplementation("io.grpc:grpc-inprocess:$grpcVersion")
-    testImplementation("org.mockito:mockito-core:$mockitoVersion")
-    testImplementation("org.mockito:mockito-junit-jupiter:$mockitoVersion") {
+    testImplementation(libs.mockito.core)
+    testImplementation(libs.mockito.junit.jupiter) {
         exclude(group = "org.junit.jupiter")
     }
-    testImplementation("uk.org.webcompere:system-stubs-jupiter:2.1.7")
-    testImplementation("org.assertj:assertj-core:$assertJVersion")
-
-    testRuntimeOnly("org.junit.platform:junit-platform-launcher")
+    testImplementation(libs.system.stubs.jupiter)
+    testImplementation(platform(libs.junit.bom))
+    testRuntimeOnly(libs.junit.platform.launcher)
 }