Skip to content
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

build-info-extractor-gradle: use container api for configuration cach… #705

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

build-info-extractor-gradle: use container api for configuration cach… #705

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
26 changes: 10 additions & 16 deletions ...actor-gradle/src/main/groovy/org/jfrog/gradle/plugin/artifactory/ArtifactoryPlugin.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package org.jfrog.gradle.plugin.artifactory

import org.gradle.api.Action
import org.gradle.api.Project
import org.gradle.api.tasks.TaskProvider
import org.jfrog.gradle.plugin.artifactory.dsl.ArtifactoryPluginConvention
import org.jfrog.gradle.plugin.artifactory.task.ArtifactoryTask
import org.jfrog.gradle.plugin.artifactory.task.DeployTask
Expand All @@ -22,30 +24,22 @@ class ArtifactoryPlugin extends ArtifactoryPluginBase {
}

@Override
protected ArtifactoryTask createArtifactoryPublishTask(Project project) {
def result = project.getTasks().create(ARTIFACTORY_PUBLISH_TASK_NAME, ArtifactoryTask.class)
result.setDescription('''Adds artifacts and generates build-info to be later deployed to Artifactory.''')
return result
protected TaskProvider<ArtifactoryTask> createArtifactoryPublishTask(Project project, Action<ArtifactoryTask> configurationAction) {
return project.getTasks().register(ARTIFACTORY_PUBLISH_TASK_NAME, ArtifactoryTask.class, configurationAction)
}

@Override
protected DistributeBuildTask createArtifactoryDistributeBuildTask(Project project) {
def result = project.getTasks().create(DISTRIBUTE_TASK_NAME, DistributeBuildTask.class)
result.setDescription('''Distributes build artifacts to Bintray.''')
return result
protected TaskProvider<DistributeBuildTask> createArtifactoryDistributeBuildTask(Project project, Action<DistributeBuildTask> configurationAction) {
return project.getTasks().register(DISTRIBUTE_TASK_NAME, DistributeBuildTask.class, configurationAction)
}

@Override
protected DeployTask createArtifactoryDeployTask(Project project) {
def result = project.getTasks().create(DEPLOY_TASK_NAME, DeployTask.class)
result.setDescription('''Deploys artifacts and build-info to Artifactory.''')
return result
protected TaskProvider<DeployTask> createArtifactoryDeployTask(Project project, Action<DeployTask> configurationAction) {
return project.getTasks().register(DEPLOY_TASK_NAME, DeployTask.class, configurationAction)
}

@Override
protected ExtractModuleTask createExtractModuleTask(Project project) {
def result = project.getTasks().create(EXTRACT_MODULE_TASK_NAME, ExtractModuleTask.class)
result.setDescription('''Extracts module info to an intermediate file''')
return result
protected TaskProvider<ExtractModuleTask> createExtractModuleTask(Project project, Action<ExtractModuleTask> configurationAction) {
return project.getTasks().register(EXTRACT_MODULE_TASK_NAME, ExtractModuleTask.class, configurationAction)
}
}
87 changes: 49 additions & 38 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
@@ -1,8 +1,11 @@
package org.jfrog.gradle.plugin.artifactory

import org.gradle.api.Action
import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.api.UnknownTaskException
import org.gradle.api.file.FileCollection
import org.gradle.api.tasks.TaskProvider
import org.jfrog.gradle.plugin.artifactory.dsl.ArtifactoryPluginConvention
import org.jfrog.gradle.plugin.artifactory.extractor.ModuleInfoFileProducer
import org.jfrog.gradle.plugin.artifactory.extractor.listener.ArtifactoryDependencyResolutionListener
Expand Down Expand Up @@ -30,9 +33,9 @@ abstract class ArtifactoryPluginBase implements Plugin<Project> {
// Add an Artifactory plugin convention to all the project modules
ArtifactoryPluginConvention conv = getArtifactoryPluginConvention(project)
// Then add the artifactory publish task
ArtifactoryTask artifactoryTask = addArtifactoryPublishTask(project)
ArtifactoryTask artifactoryTaskProvider = addArtifactoryPublishTask(project)
// Add the module info producer task
addModuleInfoTask(artifactoryTask)
addModuleInfoTask(project, artifactoryTaskProvider)

if (isRootProject(project)) {
addDeployTask(project)
Expand All @@ -53,11 +56,11 @@ abstract class ArtifactoryPluginBase implements Plugin<Project> {
project.gradle.addProjectEvaluationListener(new ProjectsEvaluatedBuildListener())
}

protected abstract ArtifactoryTask createArtifactoryPublishTask(Project project)
protected abstract DistributeBuildTask createArtifactoryDistributeBuildTask(Project project)
protected abstract TaskProvider<ArtifactoryTask> createArtifactoryPublishTask(Project project, Action<ArtifactoryTask> configurationAction)
protected abstract TaskProvider<DistributeBuildTask> createArtifactoryDistributeBuildTask(Project project, Action<DistributeBuildTask> configurationAction)
protected abstract ArtifactoryPluginConvention createArtifactoryPluginConvention(Project project)
protected abstract DeployTask createArtifactoryDeployTask(Project project);
protected abstract ExtractModuleTask createExtractModuleTask(Project project);
protected abstract TaskProvider<DeployTask> createArtifactoryDeployTask(Project project, Action<DeployTask> configurationAction);
protected abstract TaskProvider<ExtractModuleTask> createExtractModuleTask(Project project, Action<ExtractModuleTask> configurationAction);

ArtifactoryDependencyResolutionListener getArtifactoryDependencyResolutionListener() {
return artifactoryDependencyResolutionListener
Expand All @@ -83,55 +86,63 @@ abstract class ArtifactoryPluginBase implements Plugin<Project> {
/**
* Add the "artifactoryPublish" gradle task (under "publishing" task group)
*/
private ArtifactoryTask addArtifactoryPublishTask(Project project) {
ArtifactoryTask artifactoryTask = project.tasks.findByName(ARTIFACTORY_PUBLISH_TASK_NAME)
if (artifactoryTask == null) {
private TaskProvider<ArtifactoryTask> addArtifactoryPublishTask(Project project) {
try {
return project.tasks.named(ARTIFACTORY_PUBLISH_TASK_NAME, ArtifactoryTask)
} catch (UnknownTaskException ignored) {
log.debug("Configuring ${ARTIFACTORY_PUBLISH_TASK_NAME} task for project ${project.path}: is root? ${isRootProject(project)}")
artifactoryTask = createArtifactoryPublishTask(project)
artifactoryTask.setGroup(PUBLISH_TASK_GROUP)
return createArtifactoryPublishTask(project) {
setDescription('''Adds artifacts and generates build-info to be later deployed to Artifactory.''')
setGroup(PUBLISH_TASK_GROUP)
}
}
artifactoryTask
}

/**
* Add the "artifactoryDistribute" gradle task (under "publishing" task group)
*/
private DistributeBuildTask addDistributeBuildTask(Project project) {
DistributeBuildTask distributeBuildTask = project.tasks.findByName(DISTRIBUTE_TASK_NAME)
if (distributeBuildTask == null) {
private void addDistributeBuildTask(Project project) {
try {
// will throw if task not found
project.tasks.named(DISTRIBUTE_TASK_NAME)
} catch (UnknownTaskException ignored) {
log.debug("Configuring ${DISTRIBUTE_TASK_NAME} task for project ${project.path}: is root? ${isRootProject(project)}")
distributeBuildTask = createArtifactoryDistributeBuildTask(project)
distributeBuildTask.setGroup(PUBLISH_TASK_GROUP)
createArtifactoryDistributeBuildTask(project) {
setDescription('''Distributes build artifacts to Bintray.''')
setGroup(PUBLISH_TASK_GROUP)
}
}
distributeBuildTask
}

private ExtractModuleTask addModuleInfoTask(ArtifactoryTask artifactoryTask) {
Project project = artifactoryTask.project
ExtractModuleTask extractModuleTask = project.tasks.findByName(EXTRACT_MODULE_TASK_NAME)
if (extractModuleTask == null) {
log.debug("Configuring extractModuleInfo task for project ${project.path}")
extractModuleTask = createExtractModuleTask(project)
}
extractModuleTask.outputs.upToDateWhen { false }
extractModuleTask.moduleFile.set(project.layout.buildDirectory.file("moduleInfo.json"))
extractModuleTask.mustRunAfter(project.tasks.withType(ArtifactoryTask.class))
private void addModuleInfoTask(Project project, TaskProvider<ArtifactoryTask> artifactoryTaskProvider) {

project.rootProject.tasks.withType(DeployTask).configureEach { deployTask ->
deployTask.registerModuleInfoProducer(new DefaultModuleInfoFileProducer(artifactoryTask, extractModuleTask))
try {
project.tasks.named(EXTRACT_MODULE_TASK_NAME)
} catch (UnknownTaskException ignored) {
log.debug("Configuring extractModuleInfo task for project ${project.path}")
createExtractModuleTask(project) { extractModuleTask ->
setDescription('''Extracts module info to an intermediate file''')
outputs.upToDateWhen { false }
moduleFile.set(project.layout.buildDirectory.file("moduleInfo.json"))
mustRunAfter(extractModuleTask.project.tasks.withType(ArtifactoryTask.class))

extractModuleTask.project.rootProject.tasks.withType(DeployTask).configureEach { deployTask ->
deployTask.registerModuleInfoProducer(new DefaultModuleInfoFileProducer(artifactoryTaskProvider.get(), extractModuleTask))
}
}
}

return extractModuleTask
}

private DeployTask addDeployTask(Project project) {
DeployTask deployTask = project.tasks.findByName(DEPLOY_TASK_NAME)
if (deployTask == null) {
private void addDeployTask(Project project) {
try {
project.tasks.named(DEPLOY_TASK_NAME)
} catch (UnknownTaskException ignored) {
log.debug("Configuring deployTask task for project ${project.path}")
deployTask = createArtifactoryDeployTask(project)
deployTask.setGroup(PUBLISH_TASK_GROUP)
createArtifactoryDeployTask(project) {
setDescription('''Deploys artifacts and build-info to Artifactory.''')
setGroup(PUBLISH_TASK_GROUP)
}
}
deployTask
}

private static class DefaultModuleInfoFileProducer implements ModuleInfoFileProducer {
Expand Down