From 6fcc4c8cac6e2b4f86d6b3df812e203bca255ba9 Mon Sep 17 00:00:00 2001 From: Kanishk Date: Thu, 15 May 2025 20:23:17 +0530 Subject: [PATCH] changed conventions to use extension --- .../gradle/plugin/artifactory/ArtifactoryPluginBase.groovy | 6 +++--- .../gradle/plugin/artifactory/ArtifactoryPluginUtil.java | 6 +++--- .../artifactory/task/helper/TaskHelperConfigurations.java | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build-info-extractor-gradle/src/main/groovy/org/jfrog/gradle/plugin/artifactory/ArtifactoryPluginBase.groovy b/build-info-extractor-gradle/src/main/groovy/org/jfrog/gradle/plugin/artifactory/ArtifactoryPluginBase.groovy index c4e8c50a8..6eadb563e 100644 --- a/build-info-extractor-gradle/src/main/groovy/org/jfrog/gradle/plugin/artifactory/ArtifactoryPluginBase.groovy +++ b/build-info-extractor-gradle/src/main/groovy/org/jfrog/gradle/plugin/artifactory/ArtifactoryPluginBase.groovy @@ -70,10 +70,10 @@ abstract class ArtifactoryPluginBase implements Plugin { * } */ private ArtifactoryPluginConvention getArtifactoryPluginConvention(Project project) { - if (project.convention.plugins.artifactory == null) { - project.convention.plugins.artifactory = createArtifactoryPluginConvention(project) + if (!project.extensions.findByName("artifactory")) { + project.extensions.create("artifactory", ArtifactoryPluginConvention, project) } - return project.convention.plugins.artifactory + return project.extensions.getByName("artifactory") } private static boolean isRootProject(Project project) { diff --git a/build-info-extractor-gradle/src/main/groovy/org/jfrog/gradle/plugin/artifactory/ArtifactoryPluginUtil.java b/build-info-extractor-gradle/src/main/groovy/org/jfrog/gradle/plugin/artifactory/ArtifactoryPluginUtil.java index f661cff4e..a71c386d9 100644 --- a/build-info-extractor-gradle/src/main/groovy/org/jfrog/gradle/plugin/artifactory/ArtifactoryPluginUtil.java +++ b/build-info-extractor-gradle/src/main/groovy/org/jfrog/gradle/plugin/artifactory/ArtifactoryPluginUtil.java @@ -7,12 +7,12 @@ public class ArtifactoryPluginUtil { public static ArtifactoryPluginConvention getArtifactoryConvention(Project project) { - return project.getRootProject().getConvention().findPlugin(ArtifactoryPluginConvention.class); + return project.getRootProject().getExtensions().findByType(ArtifactoryPluginConvention.class); } public static ArtifactoryPluginConvention getPublisherConvention(Project project) { while (project != null) { - ArtifactoryPluginConvention acc = project.getConvention().findPlugin(ArtifactoryPluginConvention.class); + ArtifactoryPluginConvention acc = project.getExtensions().findByType(ArtifactoryPluginConvention.class); if (acc != null) { ArtifactoryClientConfiguration.PublisherHandler publisher = acc.getClientConfig().publisher; if (publisher.getContextUrl() != null && (publisher.getRepoKey() != null || publisher.getSnapshotRepoKey() != null)) { @@ -34,7 +34,7 @@ public static ArtifactoryClientConfiguration.PublisherHandler getPublisherHandle public static ArtifactoryClientConfiguration.ResolverHandler getResolverHandler(Project project) { while (project != null) { - ArtifactoryPluginConvention acc = project.getConvention().findPlugin(ArtifactoryPluginConvention.class); + ArtifactoryPluginConvention acc = project.getExtensions().findByType(ArtifactoryPluginConvention.class); if (acc != null) { ArtifactoryClientConfiguration.ResolverHandler resolver = acc.getClientConfig().resolver; if (resolver.getContextUrl() != null && resolver.getRepoKey() != null) { diff --git a/build-info-extractor-gradle/src/main/groovy/org/jfrog/gradle/plugin/artifactory/task/helper/TaskHelperConfigurations.java b/build-info-extractor-gradle/src/main/groovy/org/jfrog/gradle/plugin/artifactory/task/helper/TaskHelperConfigurations.java index 5d6df506f..1418cd7dd 100644 --- a/build-info-extractor-gradle/src/main/groovy/org/jfrog/gradle/plugin/artifactory/task/helper/TaskHelperConfigurations.java +++ b/build-info-extractor-gradle/src/main/groovy/org/jfrog/gradle/plugin/artifactory/task/helper/TaskHelperConfigurations.java @@ -192,7 +192,7 @@ protected void setDefaultMavenDescriptor() { artifactoryTask.mavenDescriptor = null; } else { artifactoryTask.mavenDescriptor = new File( - project.getConvention().getPlugin(MavenPluginConvention.class).getMavenPomDir(), + Objects.requireNonNull(project.getExtensions().findByType(MavenPluginConvention.class)).getMavenPomDir(), "pom-default.xml"); dependsOn(installTask); }