Skip to content

changed conventions to use extension #821

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fluxxBot wants to merge 1 commit into
base: master
Choose a base branch
from
Open

changed conventions to use extension #821

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ...r-gradle/src/main/groovy/org/jfrog/gradle/plugin/artifactory/ArtifactoryPluginBase.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,10 @@ abstract class ArtifactoryPluginBase implements Plugin<Project> {
* }
*/
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) {
Expand Down
6 changes: 3 additions & 3 deletions ...tor-gradle/src/main/groovy/org/jfrog/gradle/plugin/artifactory/ArtifactoryPluginUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand All @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion ...main/groovy/org/jfrog/gradle/plugin/artifactory/task/helper/TaskHelperConfigurations.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
Loading