From 3bc7f15a80f344f99e4c808b19b01e8e7fee99f9 Mon Sep 17 00:00:00 2001 From: vlad Date: Wed, 26 Apr 2017 23:48:41 -0700 Subject: Optimizing resources bytestreams --- src/main/scala/xyz.driver.sbt/SbtSettings.scala | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/main/scala/xyz.driver.sbt/SbtSettings.scala') diff --git a/src/main/scala/xyz.driver.sbt/SbtSettings.scala b/src/main/scala/xyz.driver.sbt/SbtSettings.scala index 1f1b3a0..a03672d 100644 --- a/src/main/scala/xyz.driver.sbt/SbtSettings.scala +++ b/src/main/scala/xyz.driver.sbt/SbtSettings.scala @@ -19,6 +19,8 @@ import sbtrelease.ReleasePlugin.autoImport._ import sbtrelease.{Version, _} import wartremover.WartRemover.autoImport._ +import scala.io.Source + // we hide the existing definition for setReleaseVersion to replace it with our own import sbtrelease.ReleaseStateTransformations.{setReleaseVersion => _} @@ -38,12 +40,12 @@ object SbtSettings extends AutoPlugin { resourceGenerators in Test += Def.task { val scalafmtStream = getClass.getResourceAsStream("scalafmt") - val scalafmtContents = Stream.continually(scalafmtStream.read).takeWhile(_ != -1).map(_.toByte).toArray + val scalafmtContents = Source.fromInputStream(scalafmtStream).map(_.toByte).toArray val scalafmtFile = file("scalafmt") IO.write(scalafmtFile, scalafmtContents) val scalafmtConfStream = getClass.getResourceAsStream(".scalafmt.conf") - val scalafmtConfContents = Stream.continually(scalafmtConfStream.read).takeWhile(_ != -1).map(_.toByte).toArray + val scalafmtConfContents = Source.fromInputStream(scalafmtConfStream).map(_.toByte).toArray val formatFile = file(".scalafmt.conf") IO.write(formatFile, scalafmtConfContents) @@ -63,7 +65,7 @@ object SbtSettings extends AutoPlugin { lazy val scalastyleSettings = Seq( resourceGenerators in Test += Def.task { val stream = getClass.getResourceAsStream("scalastyle-config.xml") - val contents = Stream.continually(stream.read).takeWhile(_ != -1).map(_.toByte).toArray + val contents = Source.fromInputStream(stream).map(b => Option(b).fold(0.toByte)(_.toByte)).toArray val styleFile = file("scalastyle-config.xml") IO.write(styleFile, contents) Seq(styleFile) -- cgit v1.2.3