Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@ dependencies {
implementation("io.github.cdsap:jdk-tools-parser:0.1.1")
implementation("io.github.cdsap:commandline-value-source:0.1.0")
implementation("com.jakewharton.picnic:picnic:0.7.0")
implementation("com.gradle:develocity-gradle-plugin:3.19.1")
implementation("com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.19.1")
implementation("com.gradle:develocity-gradle-plugin:4.0.2")
testImplementation("junit:junit:4.13.2")
}
tasks.withType<Test>().configureEach {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
package io.github.cdsap.kotlinprocess

import com.gradle.develocity.agent.gradle.DevelocityConfiguration
import com.gradle.scan.plugin.BuildScanExtension
import io.github.cdsap.jdk.tools.parser.ConsolidateProcesses
import io.github.cdsap.jdk.tools.parser.model.Process
import io.github.cdsap.jdk.tools.parser.model.TypeProcess
import io.github.cdsap.kotlinprocess.output.DevelocityValues
import io.github.cdsap.kotlinprocess.output.EnterpriseValues
import io.github.cdsap.valuesourceprocess.jInfo
import io.github.cdsap.valuesourceprocess.jStat
import org.gradle.api.Plugin
Expand All @@ -22,12 +20,9 @@ class InfoKotlinProcessPlugin : Plugin<Project> {
target.gradle.rootProject {

val develocityConfiguration = extensions.findByType(DevelocityConfiguration::class.java)
val enterpriseExtension = extensions.findByType(com.gradle.scan.plugin.BuildScanExtension::class.java)

if (develocityConfiguration != null) {
buildScanDevelocityReporting(project, develocityConfiguration)
} else if (enterpriseExtension != null) {
buildScanEnterpriseReporting(project, enterpriseExtension)
} else {
consoleReporting(target)
}
Expand All @@ -44,18 +39,6 @@ class InfoKotlinProcessPlugin : Plugin<Project> {
project.serviceOf<BuildEventsListenerRegistry>().onTaskCompletion(service)
}

private fun buildScanEnterpriseReporting(
project: Project,
buildScanExtension: BuildScanExtension
) {
val (jStat, jInfo) = providerPair(project)

buildScanExtension.buildFinished {
val processes = processes(jStat, jInfo)
EnterpriseValues(buildScanExtension, processes).addProcessesInfoToBuildScan()
}
}

private fun buildScanDevelocityReporting(
project: Project,
buildScanExtension: DevelocityConfiguration
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import org.junit.rules.TemporaryFolder

class InfoKotlinProcessPluginTest {

private val gradleVersions = listOf("8.6", "8.7", "8.12.1")
private val gradleVersions = listOf("8.7", "8.12.1","8.14.1")

@Rule
@JvmField
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,59 +12,6 @@ class InfoKotlinProcessPluginWtihBuildScanTest {
@Rule
@JvmField
val testProjectDir = TemporaryFolder()
@Test
fun testPluginIsCompatibleWithConfigurationCacheWithGradleEnterprise() {
Assume.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("8.1.1").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()
TestCase.assertTrue(firstBuild.output.contains("Configuration cache entry stored"))
TestCase.assertTrue(secondBuild.output.contains("Configuration cache entry reused."))
}
}

@Test
fun testPluginIsCompatibleWithConfigurationCacheWithDevelocity() {
Expand All @@ -76,7 +23,7 @@ class InfoKotlinProcessPluginWtihBuildScanTest {
testProjectDir.newFile("settings.gradle").appendText(
"""
plugins {
id 'com.gradle.develocity' version '3.17.2'
id 'com.gradle.develocity' version '4.0.2'
}
develocity {
server = "${System.getenv("GE_URL")}"
Expand Down
Loading