From ba7c3bc620715ecf06ec21e9517e172ce04d37bf Mon Sep 17 00:00:00 2001 From: vlad Date: Thu, 27 Apr 2017 00:54:56 -0700 Subject: Using sbt file IO --- src/main/scala/xyz.driver.sbt/SbtSettings.scala | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'src/main') diff --git a/src/main/scala/xyz.driver.sbt/SbtSettings.scala b/src/main/scala/xyz.driver.sbt/SbtSettings.scala index 3e17c51..eb33e94 100644 --- a/src/main/scala/xyz.driver.sbt/SbtSettings.scala +++ b/src/main/scala/xyz.driver.sbt/SbtSettings.scala @@ -19,8 +19,6 @@ 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 => _} @@ -39,15 +37,13 @@ object SbtSettings extends AutoPlugin { Seq( resourceGenerators in Test += Def.task { - val scalafmtStream = getClass.getResourceAsStream("/scalafmt") - val scalafmtContents = Source.fromInputStream(scalafmtStream).map(_.toByte).toArray + val scalafmtStream = getClass.getClassLoader.getResourceAsStream("/scalafmt") val scalafmtFile = file("scalafmt") - IO.write(scalafmtFile, scalafmtContents) + IO.write(scalafmtFile, IO.readBytes(scalafmtStream)) - val scalafmtConfStream = getClass.getResourceAsStream("/.scalafmt.conf") - val scalafmtConfContents = Source.fromInputStream(scalafmtConfStream).map(_.toByte).toArray + val scalafmtConfStream = getClass.getClassLoader.getResourceAsStream("/.scalafmt.conf") val formatFile = file(".scalafmt.conf") - IO.write(formatFile, scalafmtConfContents) + IO.write(formatFile, IO.readBytes(scalafmtConfStream)) Seq(formatFile) @@ -64,10 +60,9 @@ object SbtSettings extends AutoPlugin { lazy val scalastyleSettings = Seq( resourceGenerators in Test += Def.task { - val stream = getClass.getResourceAsStream("/scalastyle-config.xml") - val contents = Source.fromInputStream(stream).map(b => Option(b).fold(0.toByte)(_.toByte)).toArray + val stream = getClass.getClassLoader.getResourceAsStream("/scalastyle-config.xml") val styleFile = file("scalastyle-config.xml") - IO.write(styleFile, contents) + IO.write(styleFile, IO.readBytes(stream)) Seq(styleFile) }.taskValue, scalastyleConfig := file("scalastyle-config.xml"), -- cgit v1.2.3