Merge branch 'release-v2.2.x'

Author: damianmalczewski

.github/workflows/gradle-build.yml

@@ -8,7 +8,6 @@ on:
       - "release-*"
     paths:
       - ".github/workflows/gradle-build.yml"
-      - "buildSrc/**"
       - "gradle/**"
       - "**/src/**"
       - "**/*.gradle.kts"

.github/workflows/gradle-dependency-submission.yml

@@ -8,7 +8,6 @@ on:
       - "release-*"
     paths:
       - ".github/workflows/gradle-dependency-submission.yml"
-      - "buildSrc/**"
       - "gradle/**"
       - "**/*.gradle.kts"
       - "gradle.properties"

AGENTS.md

@@ -16,7 +16,7 @@ Prioritize changes in the module matching the Spring integration in context.
 
 ## Build & Validate
 
-Requires **JDK 17+**. Dependencies managed in `gradle/libs.versions.toml`. Custom Gradle plugins live in `buildSrc`.
+Requires **JDK 17+**. Dependencies managed in `gradle/libs.versions.toml`. Custom Gradle plugins live in `build-logic`.
 
 ```shell
 ./gradlew                  # default: spotlessApply build (preferred)

buildSrc/build.gradle.kts build-logic/build.gradle.ktsbuildSrc/build.gradle.kts renamed to build-logic/build.gradle.kts

@@ -1,17 +1,10 @@
-// Note that usage of version catalogs in buildSrc is not as straightforward as in regular modules.
+// Note that usage of version catalogs in build-logic is not as straightforward as in regular modules.
 // For more information, see:
 // https://docs.gradle.org/current/userguide/version_catalogs.html#sec:buildsrc-version-catalog
 plugins {
     `kotlin-dsl`
 }
 
-version = "current"
-
-repositories {
-    gradlePluginPortal()
-    mavenCentral()
-}
-
 dependencies {
     implementation(plugin(libs.plugins.errorprone))
     implementation(plugin(libs.plugins.idea.ext))

build-logic/gradle.properties

@@ -0,0 +1,3 @@
+# Project Settings
+group=io.github.problem4j
+version=latest

buildSrc/settings.gradle.kts build-logic/settings.gradle.ktsbuildSrc/settings.gradle.kts renamed to build-logic/settings.gradle.kts

@@ -1,18 +1,24 @@
-// Note that usage of version catalogs in buildSrc is not as straightforward as in regular modules.
+// Note that usage of version catalogs in build-logic is not as straightforward as in regular modules.
 // For more information, see:
 // https://docs.gradle.org/current/userguide/version_catalogs.html#sec:buildsrc-version-catalog
 pluginManagement {
     repositories {
         gradlePluginPortal()
+        mavenCentral()
     }
 }
 
 dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositories {
+        gradlePluginPortal()
+        mavenCentral()
+    }
     versionCatalogs {
         create("libs") {
             from(files("../gradle/libs.versions.toml"))
         }
     }
 }
 
-rootProject.name = "buildSrc"
+rootProject.name = "build-logic"

…nternal.errorprone-convention.gradle.kts …nternal.errorprone-convention.gradle.ktsbuildSrc/src/main/kotlin/internal.errorprone-convention.gradle.kts renamed to build-logic/src/main/kotlin/internal.errorprone-convention.gradle.kts buildSrc/src/main/kotlin/internal.errorprone-convention.gradle.kts renamed to build-logic/src/main/kotlin/internal.errorprone-convention.gradle.kts

@@ -2,7 +2,7 @@ import internal.isTestTask
 import net.ltgt.gradle.errorprone.errorprone
 
 plugins {
-    id("internal.java-convention")
+    id("java")
     id("net.ltgt.errorprone")
 }
 

…tlin/internal.idea-convention.gradle.kts …tlin/internal.idea-convention.gradle.ktsbuildSrc/src/main/kotlin/internal.idea-convention.gradle.kts renamed to build-logic/src/main/kotlin/internal.idea-convention.gradle.kts buildSrc/src/main/kotlin/internal.idea-convention.gradle.kts renamed to build-logic/src/main/kotlin/internal.idea-convention.gradle.kts

@@ -2,7 +2,6 @@ import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.gradle.api.tasks.testing.logging.TestLogEvent
 
 plugins {
-    id("internal.common-convention")
     id("java-library")
 }
 
@@ -19,18 +18,36 @@ plugins {
 // Tests are NOT compiled with --release XYZ, so they may use newer Java APIs.
 
 java {
-    toolchain.languageVersion = JavaLanguageVersion.of(25)
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(25)
+    }
+    withSourcesJar()
+    withJavadocJar()
 }
 
 tasks.withType<JavaCompile>().configureEach {
     options.compilerArgs.add("-parameters")
     options.encoding = "UTF-8"
 }
 
-tasks.named<JavaCompile>("compileJava") {
+tasks.named<JavaCompile>("compileJava").configure {
     options.release = 17
 }
 
+tasks.withType<Jar>().configureEach {
+    manifest {
+        attributes["Implementation-Title"] = project.name
+        attributes["Implementation-Version"] = project.version
+        attributes["Build-Jdk-Spec"] = java.toolchain.languageVersion.get().toString()
+        attributes["Created-By"] = "Gradle ${gradle.gradleVersion}"
+        attributes["Automatic-Module-Name"] = project.name.replace('-', '.')
+    }
+    from("${rootProject.rootDir}/LICENSE") {
+        into("META-INF/")
+        rename { "LICENSE.txt" }
+    }
+}
+
 tasks.withType<Test>().configureEach {
     useJUnitPlatform()
 
@@ -51,14 +68,20 @@ tasks.withType<Javadoc>().configureEach {
     javadocTool = javaToolchains.javadocToolFor { languageVersion = JavaLanguageVersion.of(17) }
 }
 
-tasks.withType<Jar>().configureEach {
-    manifest {
-        attributes["Implementation-Title"] = project.name
-        attributes["Implementation-Version"] = project.version
-        attributes["Created-By"] = "Gradle ${gradle.gradleVersion}"
-    }
-    from("${rootProject.rootDir}/LICENSE") {
-        into("META-INF/")
-        rename { "LICENSE.txt" }
+// Usage:
+//   ./gradlew printVersion
+tasks.register<DefaultTask>("printVersion") {
+    description = "Prints the current project version to the console."
+    group = "help"
+
+    val projectName = project.name
+    val projectVersion = project.version.toString()
+
+    doLast {
+        println("$projectName version: $projectVersion")
     }
 }
+
+tasks.withType<PublishToMavenLocal>().configureEach {
+    finalizedBy("printVersion")
+}