Skip to content

Commit 5de2661

Browse files
author
Phillip Webb
committed
Drop RepackageTask.getDependencies()
Drop `RepackageTask.getDependencies` from the gradle plugin in favor of exposing `getLibraries()` and using the callback. Drop getDependencies
1 parent c713c80 commit 5de2661

File tree

2 files changed

+19
-22
lines changed

2 files changed

+19
-22
lines changed

spring-boot-tools/spring-boot-gradle-plugin/src/main/groovy/org/springframework/boot/gradle/repackage/RepackagePluginFeatures.java

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package org.springframework.boot.gradle.repackage;
1818

1919
import java.io.File;
20+
import java.io.IOException;
2021

2122
import org.gradle.api.Action;
2223
import org.gradle.api.Project;
@@ -27,6 +28,8 @@
2728
import org.gradle.api.tasks.bundling.Jar;
2829
import org.springframework.boot.gradle.PluginFeatures;
2930
import org.springframework.boot.gradle.SpringBootPluginExtension;
31+
import org.springframework.boot.loader.tools.LibraryCallback;
32+
import org.springframework.boot.loader.tools.LibraryScope;
3033
import org.springframework.util.StringUtils;
3134

3235
/**
@@ -124,11 +127,25 @@ private void setupInputOutputs(Jar jarTask, String classifier) {
124127
+ classifier + "." + StringUtils.getFilenameExtension(outputName);
125128
File outputFile = new File(inputFile.getParentFile(), outputName);
126129
this.task.getInputs().file(jarTask);
127-
this.task.getInputs().file(this.task.getDependencies());
130+
addLibraryDependencies(this.task);
128131
this.task.getOutputs().file(outputFile);
129132
this.task.setOutputFile(outputFile);
130133
}
131134

135+
private void addLibraryDependencies(final RepackageTask task) {
136+
try {
137+
task.getLibraries().doWithLibraries(new LibraryCallback() {
138+
@Override
139+
public void library(File file, LibraryScope scope) throws IOException {
140+
task.getInputs().file(file);
141+
}
142+
});
143+
}
144+
catch (IOException ex) {
145+
throw new IllegalStateException(ex);
146+
}
147+
}
148+
132149
}
133150

134151
}

spring-boot-tools/spring-boot-gradle-plugin/src/main/groovy/org/springframework/boot/gradle/repackage/RepackageTask.java

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818

1919
import java.io.File;
2020
import java.io.IOException;
21-
import java.util.ArrayList;
22-
import java.util.List;
2321
import java.util.concurrent.TimeUnit;
2422

2523
import org.gradle.api.Action;
@@ -29,8 +27,6 @@
2927
import org.gradle.api.tasks.TaskContainer;
3028
import org.gradle.api.tasks.bundling.Jar;
3129
import org.springframework.boot.gradle.SpringBootPluginExtension;
32-
import org.springframework.boot.loader.tools.LibraryCallback;
33-
import org.springframework.boot.loader.tools.LibraryScope;
3430
import org.springframework.boot.loader.tools.Repackager;
3531
import org.springframework.util.FileCopyUtils;
3632

@@ -101,23 +97,7 @@ public void repackage() {
10197
project.getTasks().withType(Jar.class, new RepackageAction(extension, libraries));
10298
}
10399

104-
public File[] getDependencies() {
105-
ProjectLibraries libraries = getLibraries();
106-
final List<File> files = new ArrayList<File>();
107-
try {
108-
libraries.doWithLibraries(new LibraryCallback() {
109-
@Override
110-
public void library(File file, LibraryScope scope) throws IOException {
111-
files.add(file);
112-
}
113-
});
114-
} catch (IOException ex) {
115-
throw new IllegalStateException("Cannot retrieve dependencies", ex);
116-
}
117-
return files.toArray(new File[files.size()]);
118-
}
119-
120-
private ProjectLibraries getLibraries() {
100+
public ProjectLibraries getLibraries() {
121101
Project project = getProject();
122102
SpringBootPluginExtension extension = project.getExtensions().getByType(
123103
SpringBootPluginExtension.class);

0 commit comments

Comments
 (0)