Skip to content

Commit 95206eb

Browse files
0.2.0 - enables groupId:artifactId
1 parent ee0d0ba commit 95206eb

File tree

2 files changed

+30
-9
lines changed

2 files changed

+30
-9
lines changed

pom.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<groupId>io.github.makingthematrix</groupId>
55
<artifactId>scala-suffix-maven-plugin</artifactId>
66
<packaging>maven-plugin</packaging>
7-
<version>0.1.0</version>
7+
<version>0.2.0</version>
88
<name>Scala SufFix Maven Plugin</name>
99
<url>https://github.com/makingthematrix/scala-suffix</url>
1010
<organization>
@@ -51,6 +51,7 @@
5151
<maven-compiler-plugin-version>3.8.1</maven-compiler-plugin-version>
5252
<maven.compiler.source>11</maven.compiler.source>
5353
<maven.compiler.target>11</maven.compiler.target>
54+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
5455
</properties>
5556

5657
<distributionManagement>

src/main/java/io/github/makingthematrix/SufFixMojo.java

Lines changed: 28 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -55,15 +55,35 @@ public final class SufFixMojo extends AbstractMojo {
5555
return temp;
5656
});
5757

58-
public void execute() {
59-
final var artifacts = (Set<Artifact>)Collections.unmodifiableSet(project.getDependencyArtifacts());
60-
libraries.stream().map(libraryName ->
61-
artifacts.stream()
62-
.filter(art -> art.getArtifactId().toLowerCase().contains(libraryName))
58+
final private Lazy<Set<Artifact>> artifacts =
59+
Lazy.of(() -> (Set<Artifact>)Collections.unmodifiableSet(project.getDependencyArtifacts()));
60+
61+
private Optional<Tuple2<File, String>> findManifestToFix(String libraryName) {
62+
if (libraryName.contains(":")) {
63+
var split = libraryName.split(":");
64+
if (split.length > 1) {
65+
final var groupId = split[0].trim();
66+
final var artifactId = split[1].trim();
67+
return artifacts.get().stream()
68+
.filter(art -> art.getGroupId().equals(groupId) && art.getArtifactId().equals(artifactId))
69+
.findAny()
70+
.map(art -> Tuple.of(art.getFile(), libraryName));
71+
} else {
72+
return Optional.empty();
73+
}
74+
} else {
75+
return artifacts.get().stream()
76+
.filter(art -> art.getArtifactId().trim().equals(libraryName))
6377
.findAny()
64-
.map(art -> Tuple.of(art.getFile(), libraryName))
65-
).flatMap(Optional::stream)
66-
.forEach(this::fixManifest);
78+
.map(art -> Tuple.of(art.getFile(), libraryName));
79+
}
80+
}
81+
82+
public void execute() {
83+
libraries.stream()
84+
.map(this::findManifestToFix)
85+
.flatMap(Optional::stream)
86+
.forEach(this::fixManifest);
6787
}
6888

6989
private void fixManifest(Tuple2<File, String> tuple) {

0 commit comments

Comments
 (0)