Fixing correct reference to DevelocityConfiguration (#62)

cdsap · web-flow · commit be5186585d69 · 2025-11-24T15:49:31.000-08:00
* fixing correct reference to DevelocityConfiguration
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -4,6 +4,24 @@ on:
   push:
       branches: [main]
 jobs:
+    ktlint:
+        timeout-minutes: 300
+        runs-on: ubuntu-latest
+        steps:
+            -   uses: actions/checkout@v6
+            -   uses: actions/setup-java@v5
+                with:
+                    distribution: temurin
+                    java-version: 17
+
+            -   name: Setup Gradle
+                uses: gradle/actions/setup-gradle@v5
+            -   name: Execute Gradle build
+                run: ./gradlew ktlintCheck
+                env:
+                    GE_URL: ${{ secrets.GE_URL }}
+                    GE_API_KEY: ${{ secrets.GE_API_KEY }}
+
     prBranch:
         timeout-minutes: 300
         strategy:
@@ -26,6 +44,7 @@ jobs:
                 GE_URL: ${{ secrets.GE_URL }}
                 GE_API_KEY: ${{ secrets.GE_API_KEY }}
 
+
     integrationJavaTests:
         timeout-minutes: 300
         strategy:
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -3,6 +3,7 @@ plugins {
     `maven-publish`
     `kotlin-dsl`
     id("com.gradle.plugin-publish") version "1.0.0-rc-1"
+    id("org.jlleitschuh.gradle.ktlint") version "14.0.1"
 }
 
 group = "io.github.cdsap"
@@ -25,7 +26,7 @@ tasks.withType<Test>().configureEach {
     filter {
 
         if (project.hasProperty("excludeTests")) {
-            excludeTest(project.property("excludeTests").toString(),"")
+            excludeTest(project.property("excludeTests").toString(), "")
         }
     }
 }
@@ -87,7 +88,7 @@ publishing {
                 name.set("InfoKotlinProcess")
                 url.set("https://github.com/cdsap/InfoKotlinProcess/")
                 description.set(
-                    "Retrieve information of the Kotlin process in your Build Scan or console"
+                    "Retrieve information of the Kotlin process in your Build Scan or console",
                 )
                 licenses {
                     license {
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -16,4 +16,3 @@ dependencyResolutionManagement {
 }
 
 rootProject.name = "infokotlinprocess"
-
diff --git a/src/main/kotlin/io/github/cdsap/kotlinprocess/DevelocityWrapperConfiguration.kt b/src/main/kotlin/io/github/cdsap/kotlinprocess/DevelocityWrapperConfiguration.kt
@@ -11,18 +11,16 @@ import org.gradle.api.Project
 import org.gradle.api.provider.Provider
 
 class DevelocityWrapperConfiguration {
-
     fun configureProjectWithDevelocity(target: Project) {
-        val extension = target.extensions.findByType(DevelocityWrapperConfiguration::class.java) != null
+        val extension = target.extensions.findByType(DevelocityConfiguration::class.java) != null
         if (extension) {
             buildScanDevelocityReporting(target, target.extensions.findByType(DevelocityConfiguration::class.java)!!)
-            target.extensions.create("develocity", DevelocityWrapperConfiguration::class.java)
         }
     }
 
     private fun buildScanDevelocityReporting(
         project: Project,
-        buildScanExtension: DevelocityConfiguration
+        buildScanExtension: DevelocityConfiguration,
     ) {
         val (jStat, jInfo) = providerPair(project)
 
@@ -34,7 +32,7 @@ class DevelocityWrapperConfiguration {
 
     private fun processes(
         jStat: Provider<String>,
-        jInfo: Provider<String>
+        jInfo: Provider<String>,
     ): List<Process> {
         val processes = ConsolidateProcesses().consolidate(jStat.get(), jInfo.get(), TypeProcess.Kotlin)
         return processes
diff --git a/src/main/kotlin/io/github/cdsap/kotlinprocess/InfoKotlinProcessBuildService.kt b/src/main/kotlin/io/github/cdsap/kotlinprocess/InfoKotlinProcessBuildService.kt
@@ -10,7 +10,8 @@ import org.gradle.tooling.events.FinishEvent
 import org.gradle.tooling.events.OperationCompletionListener
 
 abstract class InfoKotlinProcessBuildService :
-    BuildService<InfoKotlinProcessBuildService.Params>, AutoCloseable,
+    BuildService<InfoKotlinProcessBuildService.Params>,
+    AutoCloseable,
     OperationCompletionListener {
     interface Params : BuildServiceParameters {
         var jInfoProvider: Provider<String>
@@ -22,7 +23,7 @@ abstract class InfoKotlinProcessBuildService :
             ConsolidateProcesses().consolidate(
                 parameters.jStatProvider.get(),
                 parameters.jInfoProvider.get(),
-                TypeProcess.Kotlin
+                TypeProcess.Kotlin,
             )
         if (processes.isNotEmpty()) {
             ConsoleOutput(processes).print()
diff --git a/src/main/kotlin/io/github/cdsap/kotlinprocess/InfoKotlinProcessPlugin.kt b/src/main/kotlin/io/github/cdsap/kotlinprocess/InfoKotlinProcessPlugin.kt
@@ -7,18 +7,17 @@ import org.gradle.api.Project
 import org.gradle.build.event.BuildEventsListenerRegistry
 import org.gradle.kotlin.dsl.support.serviceOf
 
-
 class InfoKotlinProcessPlugin : Plugin<Project> {
     override fun apply(target: Project) {
         target.gradle.rootProject {
-
-            val hasDevelocity = try {
-                Class.forName("com.gradle.develocity.agent.gradle.DevelocityConfiguration")
-                true
-            } catch (_: ClassNotFoundException) {
-                false
-            }
-            if (hasDevelocity ) {
+            val hasDevelocity =
+                try {
+                    Class.forName("com.gradle.develocity.agent.gradle.DevelocityConfiguration")
+                    true
+                } catch (_: ClassNotFoundException) {
+                    false
+                }
+            if (hasDevelocity) {
                 DevelocityWrapperConfiguration().configureProjectWithDevelocity(target)
             } else {
                 consoleReporting(target)
@@ -27,12 +26,14 @@ class InfoKotlinProcessPlugin : Plugin<Project> {
     }
 
     private fun consoleReporting(project: Project) {
-        val service = project.gradle.sharedServices.registerIfAbsent(
-            "kotlinProcessService", InfoKotlinProcessBuildService::class.java
-        ) {
-            parameters.jInfoProvider = project.jInfo(Constants.KOTLIN_PROCESS_NAME)
-            parameters.jStatProvider = project.jStat(Constants.KOTLIN_PROCESS_NAME)
-        }
+        val service =
+            project.gradle.sharedServices.registerIfAbsent(
+                "kotlinProcessService",
+                InfoKotlinProcessBuildService::class.java,
+            ) {
+                parameters.jInfoProvider = project.jInfo(Constants.KOTLIN_PROCESS_NAME)
+                parameters.jStatProvider = project.jStat(Constants.KOTLIN_PROCESS_NAME)
+            }
         project.serviceOf<BuildEventsListenerRegistry>().onTaskCompletion(service)
     }
 }
diff --git a/src/main/kotlin/io/github/cdsap/kotlinprocess/output/ConsoleOutput.kt b/src/main/kotlin/io/github/cdsap/kotlinprocess/output/ConsoleOutput.kt
@@ -4,7 +4,9 @@ import com.jakewharton.picnic.TextAlignment
 import com.jakewharton.picnic.table
 import io.github.cdsap.jdk.tools.parser.model.Process
 
-class ConsoleOutput(private val processes: List<Process>) {
+class ConsoleOutput(
+    private val processes: List<Process>,
+) {
     fun print() {
         println(
             table {
@@ -42,6 +44,7 @@ class ConsoleOutput(private val processes: List<Process>) {
                         }
                     }
                 }
-            })
+            },
+        )
     }
 }
diff --git a/src/main/kotlin/io/github/cdsap/kotlinprocess/output/DevelocityValues.kt b/src/main/kotlin/io/github/cdsap/kotlinprocess/output/DevelocityValues.kt
@@ -7,7 +7,6 @@ class DevelocityValues(
     private val develocityConfiguration: DevelocityConfiguration,
     private val processes: List<Process>,
 ) {
-
     fun addProcessesInfoToBuildScan() {
         processes.map {
             develocityConfiguration.buildScan {
diff --git a/src/test/kotlin/io/github/cdsap/kotlinprocess/InfoKotlinProcessNoDVTest.kt b/src/test/kotlin/io/github/cdsap/kotlinprocess/InfoKotlinProcessNoDVTest.kt
@@ -7,82 +7,87 @@ import org.junit.Test
 import org.junit.rules.TemporaryFolder
 
 class InfoKotlinProcessNoDVTest {
-
     @Rule
     @JvmField
     val testProjectDir = TemporaryFolder()
 
     @Test
     fun testPluginIsCompatibleWithConfigurationCacheWithDevelocity() {
-
         testProjectDir.newFile("settings.gradle").appendText(
             """
-            """.trimIndent()
+            """.trimIndent(),
         )
         testProjectDir.newFile("build.gradle").appendText(
             """
-                plugins {
-                    id 'org.jetbrains.kotlin.jvm' version '1.7.21'
-                    id 'application'
-                    id 'io.github.cdsap.kotlinprocess'
-                }
-                repositories {
-                    mavenCentral()
-                }
+            plugins {
+                id 'org.jetbrains.kotlin.jvm' version '1.7.21'
+                id 'application'
+                id 'io.github.cdsap.kotlinprocess'
+            }
+            repositories {
+                mavenCentral()
+            }
 
-            """.trimIndent()
+            """.trimIndent(),
         )
         listOf("8.14.2").forEach {
-            val firstBuild = GradleRunner.create()
-                .withProjectDir(testProjectDir.root)
-                .withArguments("compileKotlin", "--configuration-cache")
-                .withPluginClasspath()
-                .withGradleVersion(it)
-                .build()
-            val secondBuild = GradleRunner.create()
-                .withProjectDir(testProjectDir.root)
-                .withArguments("compileKotlin", "--configuration-cache")
-                .withPluginClasspath()
-                .withGradleVersion(it)
-                .build()
+            val firstBuild =
+                GradleRunner
+                    .create()
+                    .withProjectDir(testProjectDir.root)
+                    .withArguments("compileKotlin", "--configuration-cache")
+                    .withPluginClasspath()
+                    .withGradleVersion(it)
+                    .build()
+            val secondBuild =
+                GradleRunner
+                    .create()
+                    .withProjectDir(testProjectDir.root)
+                    .withArguments("compileKotlin", "--configuration-cache")
+                    .withPluginClasspath()
+                    .withGradleVersion(it)
+                    .build()
             TestCase.assertTrue(firstBuild.output.contains("Configuration cache entry stored"))
             TestCase.assertTrue(secondBuild.output.contains("Configuration cache entry reused."))
         }
     }
 
     @Test
     fun testPluginIsCompatibleWithProjectIsolation() {
-
         testProjectDir.newFile("settings.gradle").appendText(
             """
-            """.trimIndent()
+            """.trimIndent(),
         )
         testProjectDir.newFile("build.gradle").appendText(
             """
-                plugins {
-                    id 'org.jetbrains.kotlin.jvm' version '2.0.20'
-                    id 'application'
-                    id 'io.github.cdsap.kotlinprocess'
-                }
-                repositories {
-                    mavenCentral()
-                }
+            plugins {
+                id 'org.jetbrains.kotlin.jvm' version '2.0.20'
+                id 'application'
+                id 'io.github.cdsap.kotlinprocess'
+            }
+            repositories {
+                mavenCentral()
+            }
 
-            """.trimIndent()
+            """.trimIndent(),
         )
         listOf("8.14.2").forEach {
-            val firstBuild = GradleRunner.create()
-                .withProjectDir(testProjectDir.root)
-                .withArguments("compileKotlin", "-Dorg.gradle.unsafe.isolated-projects=true")
-                .withPluginClasspath()
-                .withGradleVersion(it)
-                .build()
-            val secondBuild = GradleRunner.create()
-                .withProjectDir(testProjectDir.root)
-                .withArguments("compileKotlin", "-Dorg.gradle.unsafe.isolated-projects=true")
-                .withPluginClasspath()
-                .withGradleVersion(it)
-                .build()
+            val firstBuild =
+                GradleRunner
+                    .create()
+                    .withProjectDir(testProjectDir.root)
+                    .withArguments("compileKotlin", "-Dorg.gradle.unsafe.isolated-projects=true")
+                    .withPluginClasspath()
+                    .withGradleVersion(it)
+                    .build()
+            val secondBuild =
+                GradleRunner
+                    .create()
+                    .withProjectDir(testProjectDir.root)
+                    .withArguments("compileKotlin", "-Dorg.gradle.unsafe.isolated-projects=true")
+                    .withPluginClasspath()
+                    .withGradleVersion(it)
+                    .build()
             TestCase.assertTrue(firstBuild.output.contains("Configuration cache entry stored"))
             TestCase.assertTrue(secondBuild.output.contains("Configuration cache entry reused."))
         }
diff --git a/src/test/kotlin/io/github/cdsap/kotlinprocess/InfoKotlinProcessPluginTest.kt b/src/test/kotlin/io/github/cdsap/kotlinprocess/InfoKotlinProcessPluginTest.kt
diff --git a/src/test/kotlin/io/github/cdsap/kotlinprocess/InfoKotlinProcessPluginWtihBuildScanTest.kt b/src/test/kotlin/io/github/cdsap/kotlinprocess/InfoKotlinProcessPluginWtihBuildScanTest.kt

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ plugins {`
`3`	`3`	`maven-publish`
`4`	`4`	`kotlin-dsl`
`5`	`5`	`id("com.gradle.plugin-publish") version "1.0.0-rc-1"`
	`6`	`+ id("org.jlleitschuh.gradle.ktlint") version "14.0.1"`
`6`	`7`	`}`
`7`	`8`
`8`	`9`	`group = "io.github.cdsap"`
`@@ -25,7 +26,7 @@ tasks.withType<Test>().configureEach {`
`25`	`26`	`filter {`
`26`	`27`
`27`	`28`	`if (project.hasProperty("excludeTests")) {`
`28`		`- excludeTest(project.property("excludeTests").toString(),"")`
	`29`	`+ excludeTest(project.property("excludeTests").toString(), "")`
`29`	`30`	`}`
`30`	`31`	`}`
`31`	`32`	`}`
`@@ -87,7 +88,7 @@ publishing {`
`87`	`88`	`name.set("InfoKotlinProcess")`
`88`	`89`	`url.set("https://github.com/cdsap/InfoKotlinProcess/")`
`89`	`90`	`description.set(`
`90`		`- "Retrieve information of the Kotlin process in your Build Scan or console"`
	`91`	`+ "Retrieve information of the Kotlin process in your Build Scan or console",`
`91`	`92`	`)`
`92`	`93`	`licenses {`
`93`	`94`	`license {`
Original file line number	Diff line number	Diff line change
`@@ -16,4 +16,3 @@ dependencyResolutionManagement {`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`rootProject.name = "infokotlinprocess"`
`19`		`-`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,9 @@ import com.jakewharton.picnic.TextAlignment`
`4`	`4`	`import com.jakewharton.picnic.table`
`5`	`5`	`import io.github.cdsap.jdk.tools.parser.model.Process`
`6`	`6`
`7`		`-class ConsoleOutput(private val processes: List<Process>) {`
	`7`	`+class ConsoleOutput(`
	`8`	`+ private val processes: List<Process>,`
	`9`	`+) {`
`8`	`10`	`fun print() {`
`9`	`11`	`println(`
`10`	`12`	`table {`
`@@ -42,6 +44,7 @@ class ConsoleOutput(private val processes: List<Process>) {`
`42`	`44`	`}`
`43`	`45`	`}`
`44`	`46`	`}`
`45`		`- })`
	`47`	`+ },`
	`48`	`+ )`
`46`	`49`	`}`
`47`	`50`	`}`