Skip to content

Commit 031b900

Browse files
sorin-floreajthurne
sorin-florea
authored and
jthurne
committed
Remove the data processing logic
1 parent 79e204b commit 031b900

35 files changed

+58
-3682
lines changed

‎build.gradle.kts

Lines changed: 33 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,26 @@ plugins {
1313
group = "com.gradle"
1414

1515
repositories {
16+
maven {
17+
name = "Solutions"
18+
url = uri("https://repo.gradle.org/artifactory/solutions")
19+
credentials {
20+
username = providers
21+
.environmentVariable("GRADLE_SOLUTIONS_REPOSITORY_USERNAME")
22+
.orElse(providers.gradleProperty("gradleSolutionsRepositoryUsername"))
23+
.get()
24+
password = providers
25+
.environmentVariable("GRADLE_SOLUTIONS_REPOSITORY_PASSWORD")
26+
.orElse(providers.gradleProperty("gradleSolutionsRepositoryPassword"))
27+
.get()
28+
}
29+
authentication {
30+
create<BasicAuthentication>("basic")
31+
}
32+
content {
33+
includeModule("com.gradle.enterprise", "build-scan-summary")
34+
}
35+
}
1636
exclusiveContent {
1737
forRepository {
1838
ivy {
@@ -36,6 +56,7 @@ val isDevelopmentRelease = !hasProperty("finalRelease")
3656
val releaseVersion = releaseVersion()
3757
val releaseNotes = releaseNotes()
3858
val distributionVersion = distributionVersion()
59+
val buildScanSummaryVersion = "0.9-2023.2"
3960

4061
allprojects {
4162
version = releaseVersion.get()
@@ -47,7 +68,7 @@ val mavenComponents by configurations.creating
4768

4869
dependencies {
4970
argbash("argbash:argbash:2.10.0@zip")
50-
commonComponents(project(path = ":fetch-build-scan-data-cmdline-tool", configuration = "shadow"))
71+
commonComponents("com.gradle.enterprise:build-scan-summary:${buildScanSummaryVersion}")
5172
mavenComponents(project(":configure-gradle-enterprise-maven-extension"))
5273
mavenComponents("com.gradle:gradle-enterprise-maven-extension:1.18.4")
5374
mavenComponents("com.gradle:common-custom-user-data-maven-extension:1.13")
@@ -95,7 +116,10 @@ val copyGradleScripts by tasks.registering(Copy::class) {
95116
// local variable required for configuration cache compatibility
96117
// https://docs.gradle.org/current/userguide/configuration_cache.html#config_cache:not_yet_implemented:accessing_top_level_at_execution
97118
val releaseVersion = releaseVersion
119+
val buildScanSummaryVersion = buildScanSummaryVersion
120+
98121
inputs.property("project.version", releaseVersion)
122+
inputs.property("summary.version", buildScanSummaryVersion)
99123

100124
from(layout.projectDirectory.file("LICENSE"))
101125
from(layout.projectDirectory.dir("release").file("version.txt"))
@@ -104,6 +128,7 @@ val copyGradleScripts by tasks.registering(Copy::class) {
104128
from(layout.projectDirectory.dir("components/scripts/gradle")) {
105129
exclude("gradle-init-scripts")
106130
filter { line: String -> line.replace("<HEAD>", releaseVersion.get()) }
131+
filter { line: String -> line.replace("<SUMMARY_VERSION>", buildScanSummaryVersion) }
107132
}
108133
from(layout.projectDirectory.dir("components/scripts/gradle")) {
109134
include("gradle-init-scripts/**")
@@ -116,6 +141,7 @@ val copyGradleScripts by tasks.registering(Copy::class) {
116141
include("lib/**")
117142
exclude("lib/cli-parsers")
118143
filter { line: String -> line.replace("<HEAD>", releaseVersion.get()) }
144+
filter { line: String -> line.replace("<SUMMARY_VERSION>", buildScanSummaryVersion) }
119145
}
120146
from(generateBashCliParsers.map { it.outputDir.file("lib/cli-parsers/gradle") }) {
121147
into("lib/")
@@ -133,14 +159,18 @@ val copyMavenScripts by tasks.registering(Copy::class) {
133159
// local variable required for configuration cache compatibility
134160
// https://docs.gradle.org/current/userguide/configuration_cache.html#config_cache:not_yet_implemented:accessing_top_level_at_execution
135161
val releaseVersion = releaseVersion
162+
val buildScanSummaryVersion = buildScanSummaryVersion
163+
136164
inputs.property("project.version", releaseVersion)
165+
inputs.property("summary.version", buildScanSummaryVersion)
137166

138167
from(layout.projectDirectory.file("LICENSE"))
139168
from(layout.projectDirectory.dir("release").file("version.txt"))
140169
rename("version.txt", "VERSION")
141170

142171
from(layout.projectDirectory.dir("components/scripts/maven")) {
143172
filter { line: String -> line.replace("<HEAD>", releaseVersion.get()) }
173+
filter { line: String -> line.replace("<SUMMARY_VERSION>", buildScanSummaryVersion) }
144174
}
145175
from(layout.projectDirectory.dir("components/scripts/")) {
146176
include("README.md")
@@ -149,6 +179,7 @@ val copyMavenScripts by tasks.registering(Copy::class) {
149179
include("lib/**")
150180
exclude("lib/cli-parsers")
151181
filter { line: String -> line.replace("<HEAD>", releaseVersion.get()) }
182+
filter { line: String -> line.replace("<SUMMARY_VERSION>", buildScanSummaryVersion) }
152183
}
153184
from(generateBashCliParsers.map { it.outputDir.file("lib/cli-parsers/maven") }) {
154185
into("lib/")
@@ -300,4 +331,4 @@ fun releaseVersion(): Provider<String> {
300331
fun releaseNotes(): Provider<String> {
301332
val releaseNotesFile = layout.projectDirectory.file("release/changes.md")
302333
return providers.fileContents(releaseNotesFile).asText.map { it.trim() }
303-
}
334+
}

‎components/fetch-build-scan-data-cmdline-tool/.openapi-generator-ignore

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

‎components/fetch-build-scan-data-cmdline-tool/build.gradle.kts

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

‎components/fetch-build-scan-data-cmdline-tool/src/main/java/com/gradle/enterprise/Main.java

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

‎components/fetch-build-scan-data-cmdline-tool/src/main/java/com/gradle/enterprise/api/client/AuthenticationConfigurator.java

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

‎components/fetch-build-scan-data-cmdline-tool/src/main/java/com/gradle/enterprise/api/client/FailedRequestException.java

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

0 commit comments

Comments
 (0)