diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2016-02-03 22:06:42 +1000 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2016-02-04 09:19:19 +1000 |
| commit | da46355a90442636ee7634c31a69eae8e8b9cd42 (patch) | |
| tree | eec9abbf057e3c5fd4566df6628f9693835cc536 /project/JarJar.scala | |
| parent | 74e53cb4930fc3e02222d8be0f065ce8aaa71230 (diff) | |
| parent | cc6fea6d30609b8879db1ecdbc288e4cdaa5b8d4 (diff) | |
| download | scala-da46355a90442636ee7634c31a69eae8e8b9cd42.tar.gz scala-da46355a90442636ee7634c31a69eae8e8b9cd42.tar.bz2 scala-da46355a90442636ee7634c31a69eae8e8b9cd42.zip | |
Merge commit 'cc6fea6' into merge/2.11.x-to-2.12.x-20160203
Conflicts:
build.sbt
scripts/jobs/integrate/bootstrap
Diffstat (limited to 'project/JarJar.scala')
| -rw-r--r-- | project/JarJar.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/project/JarJar.scala b/project/JarJar.scala index 2eec0e9033..918060c9ee 100644 --- a/project/JarJar.scala +++ b/project/JarJar.scala @@ -35,12 +35,12 @@ object JarJar { } case class JarEntryInput(jarFile: JarFile, entry: JarEntry) extends Entry { - def name = entry.getName + def name = entry.getName.replace('\\', '/') def time = entry.getTime def data = sbt.IO.readBytes(jarFile.getInputStream(entry)) } case class FileInput(base: File, file: File) extends Entry { - def name = file.relativeTo(base).get.getPath + def name = file.relativeTo(base).get.getPath.replace('\\', '/') def time = file.lastModified def data = sbt.IO.readBytes(file) } |