Merge pull request #7 from cdsap/fix_configuration_cache_issue_on_build_scan_execution

Remove eager call on CommandLineWithOutputValue for BuildScan output

Author: cdsap

.github/workflows/build.yaml

@@ -21,3 +21,6 @@ jobs:
               uses: gradle/gradle-build-action@v2
             - name: Execute Gradle build
               run:  ./gradlew test
+              env:
+                GE_URL: ${{ secrets.GE_URL }}
+                GE_API_KEY: ${{ secrets.GE_API_KEY }}

src/main/kotlin/io/github/cdsap/kotlinprocess/InfoKotlinProcessPlugin.kt

@@ -31,9 +31,11 @@ class InfoKotlinProcessPlugin : Plugin<Project> {
         project: Project,
         buildScanExtension: BuildScanExtension
     ) {
-        val processes = ConsolidateProcesses().consolidate(project.jStat().get(), project.jInfo().get())
+        val jStat = project.jStat()
+        val jInfo = project.jInfo()
 
         buildScanExtension.buildFinished {
+            val processes = ConsolidateProcesses().consolidate(jStat.get(), jInfo.get())
             BuildScanOutput(buildScanExtension, processes).addProcessesInfoToBuildScan()
         }
     }

src/test/kotlin/io/github/cdsap/kotlinprocess/InfoKotlinProcessPluginTest.kt

@@ -1,6 +1,7 @@
 package io.github.cdsap.kotlinprocess
 
 import junit.framework.TestCase.assertTrue
+import org.gradle.internal.impldep.org.junit.Assume.assumeTrue
 import org.gradle.testkit.runner.GradleRunner
 import org.junit.Rule
 import org.junit.Test
@@ -40,7 +41,7 @@ class InfoKotlinProcessPluginTest {
     }
 
     @Test
-    fun testPluginIsCompatibleWithConfigurationCache() {
+    fun testPluginIsCompatibleWithConfigurationCacheWithoutGradleEnterprise() {
         testProjectDir.newFile("build.gradle").appendText(
             """
                 plugins {
@@ -57,13 +58,68 @@ class InfoKotlinProcessPluginTest {
         listOf("7.5.1", "7.6").forEach {
             val firstBuild = GradleRunner.create()
                 .withProjectDir(testProjectDir.root)
-                .withArguments("compileKotlin", "--configuration-cache", "--configuration-cache-problems=warn")
+                .withArguments("compileKotlin", "--configuration-cache")
                 .withPluginClasspath()
                 .withGradleVersion(it)
                 .build()
             val secondBuild = GradleRunner.create()
                 .withProjectDir(testProjectDir.root)
-                .withArguments("compileKotlin", "--configuration-cache", "--configuration-cache-problems=warn")
+                .withArguments("compileKotlin", "--configuration-cache")
+                .withPluginClasspath()
+                .withGradleVersion(it)
+                .build()
+            assertTrue(firstBuild.output.contains("Configuration cache entry stored"))
+            assertTrue(secondBuild.output.contains("Configuration cache entry reused."))
+        }
+    }
+
+
+    @Test
+    fun testPluginIsCompatibleWithConfigurationCacheWithGradleEnterprise() {
+        assumeTrue(
+            "Gradle Enterprise URL and Access Key are set",
+            System.getenv("GE_URL") != null && System.getenv("GE_API_KEY") != null
+        )
+
+        testProjectDir.newFile("settings.gradle").appendText(
+            """
+                plugins {
+                    id 'com.gradle.enterprise' version '3.12.2'
+                }
+                gradleEnterprise {
+                    server = "${System.getenv("GE_URL")}"
+                    accessKey="${System.getenv("GE_API_KEY")}"
+                    buildScan {
+                        capture { taskInputFiles = true }
+                        publishAlways()
+
+                    }
+                }
+            """.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()
+                }
+
+            """.trimIndent()
+        )
+        listOf("7.5.1", "7.6").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()