Switch from com.gradle.enterprise to com.gradle.develocity

This commit is contained in:
daz
2024-04-03 15:09:53 -06:00
parent 81b3a2db60
commit 518b14b196
12 changed files with 41 additions and 50 deletions

View File

@@ -1,13 +1,12 @@
plugins {
id "com.gradle.enterprise" version "3.17"
id "com.gradle.develocity" version "3.17"
id "com.gradle.common-custom-user-data-gradle-plugin" version "1.13"
}
gradleEnterprise {
develocity {
buildScan {
termsOfServiceUrl = "https://gradle.com/terms-of-service"
termsOfServiceAgree = "yes"
publishAlways()
termsOfUseUrl = "https://gradle.com/help/legal-terms-of-use"
termsOfUseAgree = "yes"
uploadInBackground = false
}
}

View File

@@ -171,15 +171,12 @@ class TestBuildResultRecorder extends BaseInitScriptTest {
when:
settingsFile.text = """
plugins {
id 'com.gradle.enterprise' version '3.17' apply(false)
id 'com.gradle.develocity' version '3.17' apply(false)
}
gradle.settingsEvaluated {
apply plugin: 'com.gradle.enterprise'
gradleEnterprise {
apply plugin: 'com.gradle.develocity'
develocity {
server = '$mockScansServer.address'
buildScan {
publishAlways()
}
}
}
""" + settingsFile.text

View File

@@ -55,7 +55,7 @@ class TestDevelocityInjection extends BaseInitScriptTest {
assumeTrue testGradleVersion.compatibleWithCurrentJvm
given:
settingsFile.text = maybeAddGradleEnterprisePlugin(testGradleVersion.gradleVersion, '3.16.2')
settingsFile.text = maybeAddDevelocityPlugin(testGradleVersion.gradleVersion, '3.16.2')
buildFile.text = maybeAddBuildScanPlugin(testGradleVersion.gradleVersion, '3.16.2')
when:
@@ -443,15 +443,15 @@ class TestDevelocityInjection extends BaseInitScriptTest {
}
}
private String maybeAddGradleEnterprisePlugin(GradleVersion gradleVersion, String gePluginVersion) {
private String maybeAddDevelocityPlugin(GradleVersion gradleVersion, String gePluginVersion) {
if (gradleVersion < GradleVersion.version('6.0')) {
'' // applied in build.gradle
} else {
"""
plugins {
id 'com.gradle.enterprise' version '${gePluginVersion}'
id 'com.gradle.develocity' version '${gePluginVersion}'
}
gradleEnterprise {
develocity {
server = '${mockScansServer.address}'
buildScan {
publishAlways()
@@ -475,7 +475,7 @@ class TestDevelocityInjection extends BaseInitScriptTest {
} else if (gradleVersion < GradleVersion.version('6.0')) {
"""
plugins {
id 'com.gradle.build-scan' version '${buildScanPluginVersion}'
id 'com.gradle.develocity' version '${buildScanPluginVersion}'
}
buildScan {
server = '${mockScansServer.address}'