diff options
author | Li Haoyi <haoyi.sg@gmail.com> | 2019-05-20 07:17:07 +0800 |
---|---|---|
committer | Li Haoyi <haoyi.sg@gmail.com> | 2019-05-20 07:17:07 +0800 |
commit | 673722ca35cf7ee555d22c27d40cfcee439aa022 (patch) | |
tree | 5d6260b04190a24ea861be9f846a3f5827f8b583 | |
parent | 1d36dcb31e7dcd22acbc9531469c0b5703057e06 (diff) | |
parent | 88b412d17096475e41e6eb778d2c16836e2b0e62 (diff) | |
download | mill-673722ca35cf7ee555d22c27d40cfcee439aa022.tar.gz mill-673722ca35cf7ee555d22c27d40cfcee439aa022.tar.bz2 mill-673722ca35cf7ee555d22c27d40cfcee439aa022.zip |
Merge branch '609'
-rw-r--r-- | main/src/modules/Jvm.scala | 4 | ||||
-rw-r--r-- | scalalib/test/src/HelloWorldTests.scala | 10 |
2 files changed, 6 insertions, 8 deletions
diff --git a/main/src/modules/Jvm.scala b/main/src/modules/Jvm.scala index 9f176974..c1f07a9b 100644 --- a/main/src/modules/Jvm.scala +++ b/main/src/modules/Jvm.scala @@ -289,9 +289,7 @@ object Jvm { writeEntry(path, concatenated, append = true) case (mapping, WriteOnceEntry(entry)) => val path = zipFs.getPath(mapping).toAbsolutePath - if (Files.notExists(path)) { - writeEntry(path, entry.inputStream, append = false) - } + writeEntry(path, entry.inputStream, append = false) } zipFs.close() diff --git a/scalalib/test/src/HelloWorldTests.scala b/scalalib/test/src/HelloWorldTests.scala index da08f056..57750991 100644 --- a/scalalib/test/src/HelloWorldTests.scala +++ b/scalalib/test/src/HelloWorldTests.scala @@ -766,7 +766,7 @@ object HelloWorldTests extends TestSuite { resourcePath = helloWorldMultiResourcePath ) - 'writeFirstWhenNoRule - { + 'writeDownstreamWhenNoRule - { 'withDeps - workspaceTest(HelloWorldAkkaHttpNoRules) { eval => val Right((result, _)) = eval.apply(HelloWorldAkkaHttpNoRules.core.assembly) @@ -802,11 +802,11 @@ object HelloWorldTests extends TestSuite { val referenceContent = readFileFromJar(jarFile, "reference.conf") assert( - referenceContent.contains("Model Reference Config File"), - referenceContent.contains("foo.bar=2"), + !referenceContent.contains("Model Reference Config File"), + !referenceContent.contains("foo.bar=2"), - !referenceContent.contains("Core Reference Config File"), - !referenceContent.contains("bar.baz=hello") + referenceContent.contains("Core Reference Config File"), + referenceContent.contains("bar.baz=hello") ) } } |