chore: build-logic and dep updates

sureshg · Oct 7, 2024 · 1aaa34b · 1aaa34b
1 parent 40429ef
commit 1aaa34b
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 26 deletions.
diff --git a/gradle/build-logic/build.gradle.kts b/gradle/build-logic/build.gradle.kts
@@ -90,15 +90,6 @@ tasks {
 
 gradlePlugin {
   plugins {
-
-    // Re-exposure of plugin from dependency. Gradle doesn't expose the plugin itself.
-    create("com.gradle.develocity") {
-      id = "com.gradle.develocity"
-      implementationClass = "com.gradle.develocity.agent.gradle.DevelocityPlugin"
-      displayName = "Develocity Gradle Plugin"
-      description = "Develocity gradle settings plugin re-exposed from dependency"
-    }
-
     // A generic plugin for both project and settings
     register("Generic Plugin") {
       id = "plugins.generic"
@@ -132,13 +123,13 @@ gradlePlugin {
 // Jte is used for generating build config.
 jte {
   contentType = gg.jte.ContentType.Plain
-  sourceDirectory = sourceSets.main.map { it.resources.srcDirs.first().toPath() }
   generate()
   jteExtension("gg.jte.models.generator.ModelExtension") {
     property("language", "Kotlin")
     // property("interfaceAnnotation", "@foo.bar.MyAnnotation")
     // property("implementationAnnotation", "@foo.bar.MyAnnotation")
   }
+  // sourceDirectory = sourceSets.main.map { it.resources.srcDirs.first().toPath() }
   // jteExtension("gg.jte.nativeimage.NativeResourcesExtension")
   // binaryStaticContent = true
   // kotlinCompileArgs = arrayOf("-jvm-target", dslJavaVersion.get())

diff --git a/gradle/build-logic/settings.gradle.kts b/gradle/build-logic/settings.gradle.kts
@@ -11,12 +11,6 @@ dependencyResolutionManagement {
   repositoriesMode = RepositoriesMode.FAIL_ON_PROJECT_REPOS
 }
 
-enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
-
-enableFeaturePreview("STABLE_CONFIGURATION_CACHE")
-
-rootProject.name = "build-logic"
-
 fun RepositoryHandler.mavenSnapshot() {
   val mvnSnapshot = providers.gradleProperty("enableMavenSnapshot").orNull.toBoolean()
   if (mvnSnapshot) {
@@ -32,3 +26,9 @@ fun RepositoryHandler.mavenSnapshot() {
     maven(url = mvnSnapshotRepo) { mavenContent { snapshotsOnly() } }
   }
 }
+
+enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
+
+enableFeaturePreview("STABLE_CONFIGURATION_CACHE")
+
+rootProject.name = "build-logic"
diff --git a/...-logic/src/main/resources/BuildConfig.kte → .../build-logic/src/main/jte/BuildConfig.kte b/...-logic/src/main/resources/BuildConfig.kte → .../build-logic/src/main/jte/BuildConfig.kte
diff --git a/...-logic/src/main/resources/TableConfig.kte → .../build-logic/src/main/jte/TableConfig.kte b/...-logic/src/main/resources/TableConfig.kte → .../build-logic/src/main/jte/TableConfig.kte
diff --git a/gradle/build-logic/src/main/kotlin/plugins/kotlin.jvm.gradle.kts b/gradle/build-logic/src/main/kotlin/plugins/kotlin.jvm.gradle.kts
@@ -32,6 +32,9 @@ plugins {
 // Apply the regular plugin
 apply(plugin = "plugins.dependency.reports")
 
+// Load the build script from a file
+// apply(from = rootDir.resolve("project.plugin.gradle.kts"))
+
 java {
   withSourcesJar()
   withJavadocJar()
@@ -265,7 +268,7 @@ dependencies {
   implementation(libs.bundles.keystore)
   implementation(libs.bundles.ajalt)
   implementation(libs.slf4j.api)
-  implementation(libs.slf4j.jul)
+  // implementation(libs.slf4j.jul)
 
   // Auto-service
   ksp(libs.ksp.auto.service)

diff --git a/gradle/build-logic/src/main/kotlin/plugins/publishing.gradle.kts b/gradle/build-logic/src/main/kotlin/plugins/publishing.gradle.kts
@@ -2,6 +2,7 @@ package plugins
 
 import com.google.cloud.tools.jib.gradle.JibExtension
 import common.*
+import java.time.Year
 import nmcp.NmcpPublishTask
 import org.jetbrains.kotlin.gradle.tasks.KotlinNativeLink
 
@@ -167,7 +168,7 @@ fun MavenPublication.configurePom() {
   pom {
     name = provider { "${project.group}:${project.name}" }
     description = provider { project.description }
-    inceptionYear = "2024"
+    inceptionYear = Year.now().toString()
     url = githubRepo
 
     developers {

diff --git a/gradle/build-logic/src/main/kotlin/tasks/ReallyExecJar.kt b/gradle/build-logic/src/main/kotlin/tasks/ReallyExecJar.kt
@@ -16,9 +16,12 @@ import org.gradle.language.base.plugins.*
  * [Java Stack Trace Grouper](https://github.com/keith-turner/JSG/blob/master/src/main/scripts/stub.sh)
  * project.
  */
+@CacheableTask
 abstract class ReallyExecJar : DefaultTask() {
 
-  @get:InputFile abstract val jarFile: RegularFileProperty
+  @get:InputFile
+  @get:PathSensitive(PathSensitivity.RELATIVE)
+  abstract val jarFile: RegularFileProperty
 
   @get:Input abstract val javaOpts: ListProperty<String>
 

diff --git a/gradle/build-logic/src/main/kotlin/tasks/SampleTask.kt b/gradle/build-logic/src/main/kotlin/tasks/SampleTask.kt
@@ -17,9 +17,11 @@ abstract class SampleTask : DefaultTask() {
   abstract val versions: MapProperty<String, String>
 
   @get:[InputDirectory Optional]
+  @get:PathSensitive(PathSensitivity.RELATIVE)
   abstract val inputDirectory: DirectoryProperty
 
   @get:[InputFile Optional]
+  @get:PathSensitive(PathSensitivity.RELATIVE)
   abstract val inputFile: RegularFileProperty
 
   @get:Internal val type = "Sample Task"

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -36,7 +36,7 @@ kotlinx-metadata               = "0.9.0"
 kotlinx-reflect-lite           = "1.1.0"
 kotlinx-bcv                    = "0.16.3"
 kotlin-dokka                   = "1.9.20"
-kotlin-wrappers                = "1.0.0-pre.814"
+kotlin-wrappers                = "1.0.0-pre.815"
 kotlin-redacted                = "1.11.0-alpha01"
 kotlinx-multik                 = "0.2.3"
 kotlinx-dataframe              = "0.13.1"
@@ -77,11 +77,11 @@ jimfs                          = "1.3.0"
 sshj                           = "0.38.0"
 jsch                           = "0.2.20"
 pty4j                          = "0.13.0"
-junit                          = "5.11.1"
+junit                          = "5.11.2"
 koin                           = "4.0.0"
 kotest                         = "6.0.0.M1"
 mockk                          = "1.13.12"
-mokkery                        = "2.3.0"
+mokkery                        = "2.4.0"
 wiremock                       = "3.9.1"
 wiremock-kotlin                = "2.1.1"
 okhttp                         = "5.0.0-alpha.14"
@@ -165,10 +165,10 @@ ldaptive                       = "2.3.2"
 chicory                        = "0.0.12"
 
 # Compose
-jetbrains-compose              = "1.7.0-beta02"
-jetbrains-compose-viewmodel    = "2.8.2"
+jetbrains-compose              = "1.7.0-rc01"
+jetbrains-compose-viewmodel    = "2.8.3-rc01"
 jetbrains-compose-nav          = "2.8.0-alpha10"
-jetbrains-compose-adaptive     = "1.0.0-alpha03"
+jetbrains-compose-adaptive     = "1.0.0-rc01"
 kobweb                         = "0.19.2"
 detekt                         = "1.23.7"
 detekt-compose-rules           = "0.4.12"
@@ -197,7 +197,7 @@ semver-plugin                  = "0.7.1"
 tasktree                       = "4.0.0"
 sigstore                       = "1.0.0"
 reproducible-builds            = "1.0"
-autonomousapps-depanalysis     = "2.1.1"
+autonomousapps-depanalysis     = "2.1.4"
 autonomousapps-bestpractices   = "0.10"
 graalvm-nativeimage            = "0.10.3"
 github-depgraph                = "0.1.0"