chore: configuration cache changes for Jib task

Author: sureshg

gradle/build-logic/src/main/kotlin/common/ProjectExtns.kt

@@ -203,7 +203,9 @@ val Project.containerLabels
 val Project.defaultJvmArgs
   get() = buildList {
     addAll(libs.versions.java.jvmargs.get().split(",", " ").filter(String::isNotBlank))
-    add("--add-modules=$addModules")
+    if (addModules.isNotBlank()) {
+      add("--add-modules=$addModules")
+    }
   }
 
 /**
@@ -297,7 +299,6 @@ val Project.runJvmArgs
                 "-Dcom.sun.management.jmxremote.authenticate=false",
                 "-Dcom.sun.management.jmxremote.ssl=false",
                 "-Djava.rmi.server.hostname=0.0.0.0",
-                "-Dio.ktor.development=${project.hasProperty("development")}",
                 // "--sun-misc-unsafe-memory-access=warn",
                 // "--finalization=enabled",
                 // "-XX:OnOutOfMemoryError='kill -9 %p'",

gradle/build-logic/src/main/kotlin/dev.suresh.plugin.kotlin.jvm.gradle.kts

@@ -1,5 +1,5 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
-import com.google.devtools.ksp.gradle.KspAATask
+import com.google.cloud.tools.jib.gradle.JibTask
 import common.*
 import java.io.*
 import java.util.spi.ToolProvider
@@ -95,9 +95,6 @@ tasks {
   // Configure jvm args for JavaExec tasks except `run`
   withType<JavaExec>().matching { it.name != "run" }.configureEach { jvmArgs(defaultJvmArgs) }
 
-  // Configure KSP
-  withType<KspAATask>().configureEach { configureKspConfig() }
-
   withType<Jar>().configureEach {
     manifest { attributes(defaultJarManifest) }
     duplicatesStrategy = DuplicatesStrategy.INCLUDE
@@ -129,11 +126,13 @@ tasks {
       encoding = Charsets.UTF_8.name()
       linkSource(true)
       addBooleanOption("-enable-preview", true)
-      addStringOption("-add-modules", addModules)
+      if (addModules.isNotBlank()) {
+        addStringOption("-add-modules", addModules)
+      }
       addStringOption("-release", javaRelease.get().toString())
       addStringOption("Xdoclint:none", "-quiet")
     }
-    exclude("**/Main.java")
+    // exclude("**/Main.java")
   }
 
   pluginManager.withPlugin("com.gradleup.shadow") {
@@ -204,6 +203,12 @@ tasks {
         }
 
     processResources { dependsOn(copyOtelAgent) }
+
+    // Disable configuration cache for Jib
+    withType<JibTask>().configureEach {
+      notCompatibleWithConfigurationCache(
+          "because https://github.com/GoogleContainerTools/jib/issues/3132")
+    }
   }
 
   pluginManager.withPlugin("org.jetbrains.kotlinx.binary-compatibility-validator") {

gradle/build-logic/src/main/kotlin/dev.suresh.plugin.kotlin.mpp.gradle.kts

@@ -1,7 +1,7 @@
 @file:Suppress("UnstableApiUsage")
 
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
-import com.google.devtools.ksp.gradle.KspAATask
+import com.google.cloud.tools.jib.gradle.JibTask
 import common.*
 import kotlinx.validation.*
 import org.gradle.internal.os.OperatingSystem
@@ -98,8 +98,6 @@ tasks {
   kotlin.sourceSets.commonMain { kotlin.srcDirs(buildConfig) }
   // compileKotlinMetadata { dependsOn(buildConfig) }
 
-  withType<KspAATask>().configureEach { configureKspConfig() }
-
   withType<KotlinNpmInstallTask>().configureEach { configureKotlinNpm() }
 
   // withType<Kotlin2JsCompile>().configureEach {}
@@ -155,6 +153,14 @@ tasks {
     }
   }
 
+  pluginManager.withPlugin("com.google.cloud.tools.jib") {
+    // Disable configuration cache for Jib
+    withType<JibTask>().configureEach {
+      notCompatibleWithConfigurationCache(
+          "because https://github.com/GoogleContainerTools/jib/issues/3132")
+    }
+  }
+
   pluginManager.withPlugin("org.jetbrains.kotlinx.binary-compatibility-validator") {
     configure<ApiValidationExtension> {
       ignoredPackages.add("dev.suresh.test")

gradle/build-logic/src/main/kotlin/dev.suresh.plugin.publishing.gradle.kts

@@ -114,13 +114,6 @@ signing {
   }
 }
 
-nmcp {
-  centralPortal {
-    username = mavenCentralUsername
-    password = mavenCentralPassword
-  }
-}
-
 fun MavenPublication.configurePom() {
   pom {
     name = provider { "${project.group}:${project.name}" }

gradle/build-logic/src/main/kotlin/dev.suresh.plugin.repos.settings.gradle.kts

@@ -10,7 +10,7 @@ import org.gradle.toolchains.foojay.FoojayToolchainResolver
 import org.tomlj.Toml
 
 val versionCatalog by lazy {
-  // A hack to read version catalog from settings
+  // A hack to read the version catalog from settings
   runCatching {
         Toml.parse(settingsDir.resolve("gradle/libs.versions.toml").readText()).getTable("versions")
       }