Merge pull request #315 from pshevche/pshevche/always-use-new-api-if-available

Always use the new Develocity API even if plugin applied using old ID

Author: runningcode

src/main/java/com/gradle/CommonCustomUserDataGradlePlugin.java

@@ -10,6 +10,8 @@
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
 import org.gradle.api.initialization.Settings;
+import org.gradle.api.plugins.ExtensionAware;
+import org.gradle.api.plugins.ExtensionContainer;
 import org.gradle.api.provider.ProviderFactory;
 import org.gradle.caching.configuration.BuildCacheConfiguration;
 
@@ -92,12 +94,12 @@ private void applySettingsPlugin(Settings settings) {
         AtomicBoolean somePluginAlreadyConfigured = new AtomicBoolean(false);
         settings.getPluginManager().withPlugin("com.gradle.develocity", __ -> {
             if (somePluginAlreadyConfigured.compareAndSet(false, true)) {
-                applySettingsPlugin(new DevelocityConfigurationAdapter(settings.getExtensions().getByName("develocity")), providers, settings);
+                applySettingsPlugin(createDevelocityAdapter(settings), providers, settings);
             }
         });
         settings.getPluginManager().withPlugin("com.gradle.enterprise", __ -> {
             if (somePluginAlreadyConfigured.compareAndSet(false, true)) {
-                applySettingsPlugin(new GradleEnterpriseExtensionAdapter(settings.getExtensions().getByName("gradleEnterprise")), providers, settings);
+                applySettingsPlugin(createDevelocityAdapter(settings), providers, settings);
             }
         });
     }
@@ -107,16 +109,27 @@ private void applyProjectPluginGradle5(Project project) {
         AtomicBoolean somePluginAlreadyConfigured = new AtomicBoolean(false);
         project.getPluginManager().withPlugin("com.gradle.develocity", __ -> {
             if (somePluginAlreadyConfigured.compareAndSet(false, true)) {
-                applyProjectPlugin(project, new DevelocityConfigurationAdapter(project.getExtensions().getByName("develocity")));
+                applyProjectPlugin(project, createDevelocityAdapter(project));
             }
         });
         project.getPluginManager().withPlugin("com.gradle.build-scan", __ -> {
             if (somePluginAlreadyConfigured.compareAndSet(false, true)) {
-                applyProjectPlugin(project, new GradleEnterpriseExtensionAdapter(project.getExtensions().getByName("gradleEnterprise")));
+                applyProjectPlugin(project, createDevelocityAdapter(project));
             }
         });
     }
 
+    private static <T extends ExtensionAware> DevelocityAdapter createDevelocityAdapter(T target) {
+        ExtensionContainer extensions = target.getExtensions();
+
+        Object develocityExtension = extensions.findByName("develocity");
+        if (develocityExtension != null) {
+            return new DevelocityConfigurationAdapter(develocityExtension);
+        }
+
+        return new GradleEnterpriseExtensionAdapter(extensions.getByName("gradleEnterprise"));
+    }
+
     private void applyProjectPluginGradle4(Project project) {
         ensureRootProject(project);
         project.getPluginManager().withPlugin("com.gradle.build-scan",