Skip to content

ArtifactoryTask: Add proper gradle annotations to avoid 6.x warnings #263

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

Merged
yahavi merged 1 commit into from
Oct 27, 2019
Merged

ArtifactoryTask: Add proper gradle annotations to avoid 6.x warnings #263

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
46 changes: 28 additions & 18 deletions ...ctor-gradle/src/main/groovy/org/jfrog/gradle/plugin/artifactory/task/ArtifactoryTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,38 +48,20 @@ public class ArtifactoryTask extends DefaultTask {
private static final Logger log = Logging.getLogger(ArtifactoryTask.class);
private final Map<String, Boolean> flags = Maps.newHashMap();

@InputFile
@Optional
public File ivyDescriptor;

@InputFile
@Optional
public File mavenDescriptor;

@InputFiles
@Optional
public Set<Configuration> publishConfigs = Sets.newHashSet();

@Input
@Optional
public Set<IvyPublication> ivyPublications = Sets.newHashSet();

@Input
@Optional
public Set<MavenPublication> mavenPublications = Sets.newHashSet();

private boolean addArchivesConfigToTask = false;
public TaskHelperConfigurations helperConfigurations = new TaskHelperConfigurations(this);
public TaskHelperPublications helperPublications = new TaskHelperPublications(this);

@Input
Set<Publication> getPublications() {
Set<Publication> publications = new HashSet<Publication>();
publications.addAll(ivyPublications);
publications.addAll(mavenPublications);
return publications;
}

@TaskAction
public void taskAction() throws IOException {
log.debug("Task '{}' activated", getPath());
Expand Down Expand Up @@ -128,15 +110,40 @@ public void publications(Object... publications) {
}

/** Getters **/
@Input
Set<Publication> getPublications() {
Set<Publication> publications = new HashSet<Publication>();
publications.addAll(ivyPublications);
publications.addAll(mavenPublications);
return publications;
}

@InputFiles
@Optional
public Set<Configuration> getPublishConfigs() {
return publishConfigs;
}

@Input
@Optional
public Set<IvyPublication> getIvyPublications() {
return ivyPublications;
}

@Input
@Optional
public Set<MavenPublication> getMavenPublications() {
return mavenPublications;
}

@InputFile
@Optional
public File getIvyDescriptor() {
return ivyDescriptor;
}

@InputFile
@Optional
public File getMavenDescriptor() {
return mavenDescriptor;
}
Expand Down Expand Up @@ -235,6 +242,7 @@ public void finalizeByDeployTask(Project project) {
finalizedBy(deployTask);
}

@Internal
public boolean isEvaluated() {
return evaluated;
}
Expand Down Expand Up @@ -263,6 +271,8 @@ public void setProperties(Map<String, CharSequence> props) {
}
}

@Input
@Optional
public Set<GradleDeployDetails> getDeployDetails() {
return deployDetails;
}
Expand Down
1 change: 1 addition & 0 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,6 +334,7 @@ project('build-info-extractor-ivy') {

project('build-info-extractor-gradle') {
apply plugin: 'groovy'
apply plugin: 'java-gradle-plugin'
description = 'JFrog Build-Info Gradle Extractor'

println description
Expand Down