chore: Use new catalog to avoid conflict with default one.

Author: sureshg

gradle/libs.versions.toml

@@ -59,7 +59,7 @@ otel                           = "1.46.0"
 otel-instr                     = "2.12.0"
 otel-instr-alpha               = "2.12.0-alpha"
 otel-semconv                   = "1.29.0-alpha"
-otel-samplers                  = "1.42.0-alpha"
+otel-samplers                  = "1.43.0-alpha"
 elastic-otel                   = "0.4.0"
 okio                           = "3.9.1"
 sslcontext-kickstart           = "9.0.0"

plugins/build.gradle.kts

@@ -59,12 +59,12 @@ tasks {
 
   withType<GenerateJteTask>().configureEach { mustRunAfter("sourcesJar") }
 
-  // Hack to include the generated version catalog accessors to the final jar
-  //  named<Jar>("jar") {
-  //    from(sourceSets.main.get().output)
-  //    from(files(libs.javaClass.superclass.protectionDomain.codeSource.location))
-  //    archiveClassifier = ""
-  //  }
+  // Include the generated build version catalog (blibs) accessors to the final jar
+  named<Jar>("jar") {
+    from(sourceSets.main.get().output)
+    from(files(blibs.javaClass.superclass.protectionDomain.codeSource.location))
+    archiveClassifier = ""
+  }
 }
 
 jte {
@@ -170,7 +170,7 @@ dependencies {
   implementation(libs.build.tomlj)
 
   // https://github.com/gradle/gradle/issues/15383#issuecomment-779893192
-  implementation(files(libs.javaClass.superclass.protectionDomain.codeSource.location))
+  implementation(files(blibs.javaClass.superclass.protectionDomain.codeSource.location))
 
   // implementation(libs.build.kotlin.compose.compiler)
   // implementation(libs.build.karakum.plugin)

plugins/src/main/kotlin/common/ProjectExtns.kt

@@ -7,7 +7,7 @@ import java.io.ByteArrayOutputStream
 import java.io.File
 import java.nio.file.Path
 import org.graalvm.buildtools.gradle.dsl.GraalVMExtension
-import org.gradle.accessors.dm.LibrariesForLibs
+import org.gradle.accessors.dm.LibrariesForBlibs
 import org.gradle.api.Action
 import org.gradle.api.JavaVersion
 import org.gradle.api.Project
@@ -32,9 +32,9 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 // val logger = LoggerFactory.getLogger("build-logic")
 
-/** Returns version catalog of this project. */
+/** Returns the version catalog of this project. */
 internal val Project.libs
-  get() = the<LibrariesForLibs>()
+  get() = the<LibrariesForBlibs>()
 
 /**
  * Returns version catalog extension of this project. Give access to all version catalogs available.

sandbox/settings.gradle.kts

@@ -38,7 +38,7 @@ dependencyResolutionManagement {
   repositoriesMode = RepositoriesMode.PREFER_SETTINGS
 
   versionCatalogs {
-    create("libs") {
+    create("blibs") {
       from("dev.suresh.build:catalog:+")
       version("java", "21")
     }

settings.gradle.kts

@@ -6,6 +6,13 @@ pluginManagement {
   includeBuild("gradle/build-logic")
 }
 
+dependencyResolutionManagement {
+  versionCatalogs {
+    // Use a new catalog to avoid conflict.
+    register("blibs") { from(files("gradle/libs.versions.toml")) }
+  }
+}
+
 plugins { id("settings.repo") }
 
 rootProject.name = "build-commons"