Skip to content

Commit

Permalink
fix: don't configure Artifactory for projects named buildSrc
Browse files Browse the repository at this point in the history
Workaround for jfrog/build-info#178
  • Loading branch information
grv87 committed Apr 17, 2019
1 parent ee1e7da commit 0c76473
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 3 deletions.
4 changes: 3 additions & 1 deletion src/main/groovy/org/fidata/gradle/GradlePluginPlugin.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,9 @@ final class GradlePluginPlugin extends AbstractProjectPlugin implements Property

private void configureReleases() {
GString repository = "plugins-${ project.rootProject.convention.getPlugin(RootProjectConvention).isRelease.get() ? 'release' : 'snapshot' }"
project.convention.getPlugin(ArtifactoryPluginConvention).clientConfig.publisher.repoKey = "$repository-local"
if (project.name != 'buildSrc') {
project.convention.getPlugin(ArtifactoryPluginConvention).clientConfig.publisher.repoKey = "$repository-local"
}
project.repositories.maven { MavenArtifactRepository mavenArtifactRepository ->
mavenArtifactRepository.with {
/*
Expand Down
4 changes: 3 additions & 1 deletion src/main/groovy/org/fidata/gradle/JvmBasePlugin.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -695,7 +695,9 @@ final class JvmBasePlugin extends AbstractProjectPlugin implements PropertyChang
}

private void configureReleases() {
configureArtifactory()
if (project.name != 'buildSrc') {
configureArtifactory()
}

configurePublicReleases()
}
Expand Down
4 changes: 3 additions & 1 deletion src/main/groovy/org/fidata/gradle/ProjectPlugin.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -748,6 +748,8 @@ final class ProjectPlugin extends AbstractProjectPlugin {
createGenerateChangelogTasks()
}

configureArtifactory()
if (project.name != 'buildSrc') {
configureArtifactory()
}
}
}

0 comments on commit 0c76473

Please sign in to comment.