Update to kantan.sbt 2.6.0

nrinaudo · Dec 20, 2019 · ae0eb8d · ae0eb8d
1 parent 3c05690
commit ae0eb8d
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 14 deletions.
diff --git a/cats/core/shared/src/main/scala/kantan/codecs/cats/CatsInstances.scala b/cats/core/shared/src/main/scala/kantan/codecs/cats/CatsInstances.scala
@@ -26,8 +26,8 @@ trait DecoderInstances {
 
   implicit final def decoderInstances[E, F, T]
     : SemigroupK[({ type L[A] = Decoder[E, A, F, T] })#L] with MonadError[({ type L[A] = Decoder[E, A, F, T] })#L, F] =
-    new SemigroupK[({ type L[A]  = Decoder[E, A, F, T] })#L]
-    with MonadError[({ type L[A] = Decoder[E, A, F, T] })#L, F] {
+    new SemigroupK[({ type L[A]    = Decoder[E, A, F, T] })#L]
+      with MonadError[({ type L[A] = Decoder[E, A, F, T] })#L, F] {
 
       final def combineK[D](x: Decoder[E, D, F, T], y: Decoder[E, D, F, T]): Decoder[E, D, F, T] = x.orElse(y)
 

diff --git a/core/shared/src/main/scala/kantan/codecs/Decoder.scala b/core/shared/src/main/scala/kantan/codecs/Decoder.scala
@@ -51,7 +51,7 @@ trait Decoder[Encoded, Decoded, Failure, Tag] extends Serializable {
   @SuppressWarnings(Array("org.wartremover.warts.StringPlusAny"))
   def unsafeDecode(e: Encoded): Decoded = decode(e).fold(
     error => sys.error(s"Failed to decode value $e: $error"),
-    d => d
+    d     => d
   )
 
   // - Composition -----------------------------------------------------------------------------------------------------

diff --git a/core/shared/src/main/scala/kantan/codecs/resource/ResourceIterator.scala b/core/shared/src/main/scala/kantan/codecs/resource/ResourceIterator.scala
@@ -96,7 +96,8 @@ trait ResourceIterator[+A] extends VersionSpecificResourceIterator[A] with java.
     else {
       if(try {
            checkNext
-         } catch {
+         }
+         catch {
            case scala.util.control.NonFatal(e) =>
              lastError = Some(e)
              close()
@@ -117,7 +118,8 @@ trait ResourceIterator[+A] extends VersionSpecificResourceIterator[A] with java.
         val n = readNext()
         hasNext
         n
-      } catch {
+      }
+      catch {
         case e: Throwable =>
           close()
           throw e

diff --git a/core/shared/src/test/scala/kantan/codecs/export/DerivedCodecTests.scala b/core/shared/src/test/scala/kantan/codecs/export/DerivedCodecTests.scala
@@ -18,10 +18,10 @@ package kantan.codecs.export
 
 import kantan.codecs.{Decoder, Encoder}
 import kantan.codecs.export.DerivedCodecTests.{Just, Maybe, None}
+import kantan.codecs.strings.{codecs, DecodeError, StringDecoder, StringEncoder, StringResult}
 import org.scalatest.funsuite.AnyFunSuite
 import org.scalatest.matchers.should.Matchers
 import org.scalatestplus.scalacheck.ScalaCheckPropertyChecks
-import kantan.codecs.strings.{codecs, DecodeError, StringDecoder, StringEncoder, StringResult}
 
 class DerivedCodecTests extends AnyFunSuite with ScalaCheckPropertyChecks with Matchers {
   val decode: String => StringResult[Maybe[Int]] = s =>

diff --git a/java8/core/src/main/scala/kantan/codecs/strings/java8/Format.scala b/java8/core/src/main/scala/kantan/codecs/strings/java8/Format.scala
@@ -16,7 +16,7 @@
 
 package kantan.codecs.strings.java8
 
-import java.time.{Instant, LocalDate, LocalDateTime, LocalTime, OffsetDateTime, ZoneOffset, ZonedDateTime}
+import java.time.{Instant, LocalDate, LocalDateTime, LocalTime, OffsetDateTime, ZonedDateTime}
 import java.time.format.DateTimeFormatter
 import java.time.temporal.TemporalAccessor
 import kantan.codecs.strings.{StringDecoder, StringResult}
@@ -171,7 +171,8 @@ object Format {
       format.formatter
       Right(format)
 
-    } catch {
+    }
+    catch {
       case _: Exception => Left(s"Invalid pattern: '$pattern'")
     }
 
@@ -191,7 +192,7 @@ object Format {
     * res2: StringResult[Instant] = Right(2000-01-01T12:00:00Z)
     * }}}
     */
-  val defaultInstantFormat: Format = Format(DateTimeFormatter.ISO_INSTANT.withZone(ZoneOffset.UTC))
+  val defaultInstantFormat: Format = Format(DateTimeFormatter.ISO_INSTANT.withZone(java.time.ZoneOffset.UTC))
 
   /** Default `LocalDateTime` format.
     *

diff --git a/java8/core/src/test/scala/kantan/codecs/strings/java8/TimeDecoderCompanionTests.scala b/java8/core/src/test/scala/kantan/codecs/strings/java8/TimeDecoderCompanionTests.scala
@@ -16,7 +16,7 @@
 
 package kantan.codecs.strings.java8
 
-import java.time.{Instant, ZonedDateTime, OffsetDateTime, LocalDateTime, LocalDate, LocalTime}
+import java.time.{Instant, LocalDate, LocalDateTime, LocalTime, OffsetDateTime, ZonedDateTime}
 import kantan.codecs.Decoder
 import kantan.codecs.export.Exported
 import kantan.codecs.strings.{DecodeError, StringDecoder}

diff --git a/laws/shared/src/main/scala/kantan/codecs/laws/discipline/arbitrary.scala b/laws/shared/src/main/scala/kantan/codecs/laws/discipline/arbitrary.scala
@@ -124,7 +124,8 @@ trait CommonArbitraryInstances extends ArbitraryArities {
     } yield {
       try {
         BigDecimal(x, scale, mc)
-      } catch {
+      }
+      catch {
         // Handle the case where scale/precision conflict
         case _: java.lang.ArithmeticException => BigDecimal(x, scale, UNLIMITED)
       }
@@ -174,7 +175,7 @@ trait CommonArbitraryInstances extends ArbitraryArities {
     Arbitrary(
       Gen.oneOf(
         arb[Exception].map(e => scala.util.Failure(e): Try[A]),
-        aa.arbitrary.map(a => scala.util.Success(a): Try[A])
+        aa.arbitrary.map(a   => scala.util.Success(a): Try[A])
       )
     )
 }
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,2 +1,2 @@
-addSbtPlugin("com.nrinaudo" % "kantan.sbt-kantan"  % "2.5.1")
-addSbtPlugin("com.nrinaudo" % "kantan.sbt-scalajs" % "2.5.1")
+addSbtPlugin("com.nrinaudo" % "kantan.sbt-kantan"  % "2.6.0")
+addSbtPlugin("com.nrinaudo" % "kantan.sbt-scalajs" % "2.6.0")