Skip to content

Commit 0e71255

Browse files
authored
Removing older ge reference (#46)
* removing older ge reference * fixing previous test with older plugin * removing ge test
1 parent 162f717 commit 0e71255

File tree

5 files changed

+3
-97
lines changed

5 files changed

+3
-97
lines changed

build.gradle.kts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ dependencies {
1818
implementation("io.github.cdsap:jdk-tools-parser:0.1.1")
1919
implementation("io.github.cdsap:commandline-value-source:0.1.0")
2020
implementation("com.jakewharton.picnic:picnic:0.7.0")
21-
implementation("com.gradle:develocity-gradle-plugin:3.19.1")
22-
implementation("com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.19.1")
21+
implementation("com.gradle:develocity-gradle-plugin:4.0.2")
2322
testImplementation("junit:junit:4.13.2")
2423
}
2524
tasks.withType<Test>().configureEach {

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

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
package io.github.cdsap.kotlinprocess
22

33
import com.gradle.develocity.agent.gradle.DevelocityConfiguration
4-
import com.gradle.scan.plugin.BuildScanExtension
54
import io.github.cdsap.jdk.tools.parser.ConsolidateProcesses
65
import io.github.cdsap.jdk.tools.parser.model.Process
76
import io.github.cdsap.jdk.tools.parser.model.TypeProcess
87
import io.github.cdsap.kotlinprocess.output.DevelocityValues
9-
import io.github.cdsap.kotlinprocess.output.EnterpriseValues
108
import io.github.cdsap.valuesourceprocess.jInfo
119
import io.github.cdsap.valuesourceprocess.jStat
1210
import org.gradle.api.Plugin
@@ -22,12 +20,9 @@ class InfoKotlinProcessPlugin : Plugin<Project> {
2220
target.gradle.rootProject {
2321

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

2724
if (develocityConfiguration != null) {
2825
buildScanDevelocityReporting(project, develocityConfiguration)
29-
} else if (enterpriseExtension != null) {
30-
buildScanEnterpriseReporting(project, enterpriseExtension)
3126
} else {
3227
consoleReporting(target)
3328
}
@@ -44,18 +39,6 @@ class InfoKotlinProcessPlugin : Plugin<Project> {
4439
project.serviceOf<BuildEventsListenerRegistry>().onTaskCompletion(service)
4540
}
4641

47-
private fun buildScanEnterpriseReporting(
48-
project: Project,
49-
buildScanExtension: BuildScanExtension
50-
) {
51-
val (jStat, jInfo) = providerPair(project)
52-
53-
buildScanExtension.buildFinished {
54-
val processes = processes(jStat, jInfo)
55-
EnterpriseValues(buildScanExtension, processes).addProcessesInfoToBuildScan()
56-
}
57-
}
58-
5942
private fun buildScanDevelocityReporting(
6043
project: Project,
6144
buildScanExtension: DevelocityConfiguration

src/main/kotlin/io/github/cdsap/kotlinprocess/output/EnterpriseValues.kt

Lines changed: 0 additions & 23 deletions
This file was deleted.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import org.junit.rules.TemporaryFolder
1010

1111
class InfoKotlinProcessPluginTest {
1212

13-
private val gradleVersions = listOf("8.6", "8.7", "8.12.1")
13+
private val gradleVersions = listOf("8.7", "8.12.1","8.14.1")
1414

1515
@Rule
1616
@JvmField

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

Lines changed: 1 addition & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -12,59 +12,6 @@ class InfoKotlinProcessPluginWtihBuildScanTest {
1212
@Rule
1313
@JvmField
1414
val testProjectDir = TemporaryFolder()
15-
@Test
16-
fun testPluginIsCompatibleWithConfigurationCacheWithGradleEnterprise() {
17-
Assume.assumeTrue(
18-
"Gradle Enterprise URL and Access Key are set",
19-
System.getenv("GE_URL") != null && System.getenv("GE_API_KEY") != null
20-
)
21-
22-
testProjectDir.newFile("settings.gradle").appendText(
23-
"""
24-
plugins {
25-
id 'com.gradle.enterprise' version '3.12.2'
26-
}
27-
gradleEnterprise {
28-
server = "${System.getenv("GE_URL")}"
29-
accessKey="${System.getenv("GE_API_KEY")}"
30-
buildScan {
31-
capture { taskInputFiles = true }
32-
publishAlways()
33-
34-
}
35-
}
36-
""".trimIndent()
37-
)
38-
testProjectDir.newFile("build.gradle").appendText(
39-
"""
40-
plugins {
41-
id 'org.jetbrains.kotlin.jvm' version '1.7.21'
42-
id 'application'
43-
id 'io.github.cdsap.kotlinprocess'
44-
}
45-
repositories {
46-
mavenCentral()
47-
}
48-
49-
""".trimIndent()
50-
)
51-
listOf("8.1.1").forEach {
52-
val firstBuild = GradleRunner.create()
53-
.withProjectDir(testProjectDir.root)
54-
.withArguments("compileKotlin", "--configuration-cache")
55-
.withPluginClasspath()
56-
.withGradleVersion(it)
57-
.build()
58-
val secondBuild = GradleRunner.create()
59-
.withProjectDir(testProjectDir.root)
60-
.withArguments("compileKotlin", "--configuration-cache")
61-
.withPluginClasspath()
62-
.withGradleVersion(it)
63-
.build()
64-
TestCase.assertTrue(firstBuild.output.contains("Configuration cache entry stored"))
65-
TestCase.assertTrue(secondBuild.output.contains("Configuration cache entry reused."))
66-
}
67-
}
6815

6916
@Test
7017
fun testPluginIsCompatibleWithConfigurationCacheWithDevelocity() {
@@ -76,7 +23,7 @@ class InfoKotlinProcessPluginWtihBuildScanTest {
7623
testProjectDir.newFile("settings.gradle").appendText(
7724
"""
7825
plugins {
79-
id 'com.gradle.develocity' version '3.17.2'
26+
id 'com.gradle.develocity' version '4.0.2'
8027
}
8128
develocity {
8229
server = "${System.getenv("GE_URL")}"

0 commit comments

Comments
 (0)