Fix version reported when injecting in Gradle 5.x

gradle · Nov 8, 2024 · 4778149 · 4778149
1 parent 343d9ff
commit 4778149
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/main/resources/develocity-injection.init.gradle b/src/main/resources/develocity-injection.init.gradle
@@ -163,7 +163,7 @@ void enableDevelocityInjection() {
                     }
                     if (!scanPluginComponent) {
                         def pluginClass = dvOrGe(DEVELOCITY_PLUGIN_CLASS, BUILD_SCAN_PLUGIN_CLASS)
-                        def pluginVersion = dvOrGe(develocityPluginVersion, "1.16")
+                        def pluginVersion = atLeastGradle5 ? develocityPluginVersion : "1.16"
                         applyPluginExternally(pluginManager, pluginClass, pluginVersion)
                         def rootExtension = dvOrGe(
                             { develocity },

diff --git a/src/test/groovy/com/gradle/TestDevelocityInjection.groovy b/src/test/groovy/com/gradle/TestDevelocityInjection.groovy
@@ -307,16 +307,22 @@ class TestDevelocityInjection extends BaseInitScriptTest {
 
     void outputContainsDevelocityPluginApplicationViaInitScript(BuildResult result, GradleVersion gradleVersion, String pluginVersion = DEVELOCITY_PLUGIN_VERSION) {
         def pluginApplicationLogMsgGradle4 = "Applying com.gradle.scan.plugin.BuildScanPlugin with version 1.16 via init script"
+        def pluginApplicationLogMsgBuildScanPlugin = "Applying com.gradle.scan.plugin.BuildScanPlugin with version ${pluginVersion} via init script"
         def pluginApplicationLogMsgGEPlugin = "Applying com.gradle.enterprise.gradleplugin.GradleEnterprisePlugin with version ${pluginVersion} via init script"
         def pluginApplicationLogMsgDVPlugin = "Applying com.gradle.develocity.agent.gradle.DevelocityPlugin with version ${pluginVersion} via init script"
 
         def isGEPluginVersion = GradleVersion.version(pluginVersion) < GradleVersion.version("3.17")
 
-        if (gradleVersion < GRADLE_5 || (gradleVersion < GRADLE_6 && isGEPluginVersion)) {
+        if (gradleVersion < GRADLE_5) {
             assert result.output.contains(pluginApplicationLogMsgGradle4)
             assert 1 == result.output.count(pluginApplicationLogMsgGradle4)
             assert !result.output.contains(pluginApplicationLogMsgGEPlugin)
             assert !result.output.contains(pluginApplicationLogMsgDVPlugin)
+        } else if (gradleVersion < GRADLE_6 && isGEPluginVersion) {
+            assert result.output.contains(pluginApplicationLogMsgBuildScanPlugin)
+            assert 1 == result.output.count(pluginApplicationLogMsgBuildScanPlugin)
+            assert !result.output.contains(pluginApplicationLogMsgGEPlugin)
+            assert !result.output.contains(pluginApplicationLogMsgDVPlugin)
         } else if (isGEPluginVersion) {
             assert result.output.contains(pluginApplicationLogMsgGEPlugin)
             assert 1 == result.output.count(pluginApplicationLogMsgGEPlugin)