Skip to content

Commit 2391109

Browse files
committed
bug(#4016): unspile with file separator
1 parent ab47b62 commit 2391109

3 files changed

Lines changed: 6 additions & 3 deletions

File tree

eo-maven-plugin/src/main/java/org/eolang/maven/TranspileMojo.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import com.yegor256.xsline.TrJoined;
1717
import com.yegor256.xsline.Train;
1818
import com.yegor256.xsline.Xsline;
19+
import java.io.File;
1920
import java.io.IOException;
2021
import java.nio.file.Files;
2122
import java.nio.file.Path;
@@ -299,7 +300,8 @@ private static int pinfos(final Path generated) throws IOException {
299300
.filter(file -> Files.isDirectory(file) && !file.equals(generated))
300301
.collect(Collectors.toList());
301302
for (final Path dir : dirs) {
302-
final String pkg = generated.relativize(dir).toString().replace("/", ".");
303+
final String pkg = generated.relativize(dir).toString()
304+
.replace(File.separator, ".");
303305
new Saved(
304306
String.join(
305307
"\n",

eo-maven-plugin/src/main/java/org/eolang/maven/UnspileMojo.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
package org.eolang.maven;
66

77
import com.jcabi.log.Logger;
8+
import java.io.File;
89
import java.io.IOException;
910
import java.nio.file.Files;
1011
import java.nio.file.Path;
@@ -67,7 +68,7 @@ private void unspile(final Walk classes) {
6768
.map(
6869
path -> UnspileMojo.JAVA.matcher(
6970
generated.relativize(path).toString()
70-
).replaceAll(".class")
71+
).replaceAll(".class").replace(File.separatorChar, '/')
7172
)
7273
.collect(Collectors.toSet());
7374
included.addAll(UnspileMojo.INNER);

eo-maven-plugin/src/test/java/org/eolang/maven/UnspileMojoTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ void keepsSpecifiedClasses(@Mktmp final Path temp) throws IOException {
5050
"clz", maven.classesPath().resolve("EOorg/package-info.class")
5151
).value();
5252
final Path eolang = new Saved(
53-
"pgk", maven.classesPath().resolve("EOorg/EOeolang/package-info.class")
53+
"pkg", maven.classesPath().resolve("EOorg/EOeolang/package-info.class")
5454
).value();
5555
MatcherAssert.assertThat(
5656
"UnspileMojo must keep files matching to keepBinaries globs",

0 commit comments

Comments
 (0)