From ffd284bd9f9cf0d7b7e0a1285adcb3a9c35402d6 Mon Sep 17 00:00:00 2001 From: geirolz Date: Sat, 1 Jun 2024 15:26:42 +0200 Subject: [PATCH] Fix build --- .github/workflows/cicd.yml | 2 +- core/src/main/scala/cats/xml/cursor/AttrCursor.scala | 4 ++-- core/src/main/scala/cats/xml/cursor/NodeCursor.scala | 4 ++-- core/src/main/scala/cats/xml/cursor/TextCursor.scala | 4 ++-- .../cats/xml/utils/generic/TypeInfoInstances.scala | 12 +++++------- 5 files changed, 12 insertions(+), 14 deletions(-) diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml index 05e3162..bcd230d 100644 --- a/.github/workflows/cicd.yml +++ b/.github/workflows/cicd.yml @@ -30,7 +30,7 @@ jobs: - scala: 2.13.14 name: Scala2_13 test-tasks: coverage test coverageReport gen-doc - - scala: 3.3.1 + - scala: 3.3.3 name: Scala3_3 test-tasks: coverage test coverageReport diff --git a/core/src/main/scala/cats/xml/cursor/AttrCursor.scala b/core/src/main/scala/cats/xml/cursor/AttrCursor.scala index 7e08a97..213ff4c 100644 --- a/core/src/main/scala/cats/xml/cursor/AttrCursor.scala +++ b/core/src/main/scala/cats/xml/cursor/AttrCursor.scala @@ -120,8 +120,8 @@ final class AttrCursor(protected val vCursor: NodeCursor, op: AttrCursor.Op) // eq override def equals(obj: Any): Boolean = - obj.isInstanceOf[AttrCursor] - && Eq[AttrCursor].eqv(this, obj.asInstanceOf[AttrCursor]) + obj.isInstanceOf[AttrCursor] && + Eq[AttrCursor].eqv(this, obj.asInstanceOf[AttrCursor]) } object AttrCursor { diff --git a/core/src/main/scala/cats/xml/cursor/NodeCursor.scala b/core/src/main/scala/cats/xml/cursor/NodeCursor.scala index 578fdad..809fb7e 100644 --- a/core/src/main/scala/cats/xml/cursor/NodeCursor.scala +++ b/core/src/main/scala/cats/xml/cursor/NodeCursor.scala @@ -126,8 +126,8 @@ sealed trait NodeCursor // eq override final def equals(obj: Any): Boolean = - obj.isInstanceOf[NodeCursor] - && Eq[NodeCursor].eqv(this, obj.asInstanceOf[NodeCursor]) + obj.isInstanceOf[NodeCursor] && + Eq[NodeCursor].eqv(this, obj.asInstanceOf[NodeCursor]) } object NodeCursor { diff --git a/core/src/main/scala/cats/xml/cursor/TextCursor.scala b/core/src/main/scala/cats/xml/cursor/TextCursor.scala index 642970e..e2c6cd8 100644 --- a/core/src/main/scala/cats/xml/cursor/TextCursor.scala +++ b/core/src/main/scala/cats/xml/cursor/TextCursor.scala @@ -43,8 +43,8 @@ final class TextCursor(protected[xml] val lastCursor: NodeCursor) // eq override def equals(obj: Any): Boolean = - obj.isInstanceOf[TextCursor] - && Eq[TextCursor].eqv(this, obj.asInstanceOf[TextCursor]) + obj.isInstanceOf[TextCursor] && + Eq[TextCursor].eqv(this, obj.asInstanceOf[TextCursor]) } object TextCursor { diff --git a/internal-utils/src/main/scala-2/cats/xml/utils/generic/TypeInfoInstances.scala b/internal-utils/src/main/scala-2/cats/xml/utils/generic/TypeInfoInstances.scala index 45c5987..c697325 100644 --- a/internal-utils/src/main/scala-2/cats/xml/utils/generic/TypeInfoInstances.scala +++ b/internal-utils/src/main/scala-2/cats/xml/utils/generic/TypeInfoInstances.scala @@ -91,13 +91,11 @@ object TypeInfoInstances { def isOptionOfAnyPrimitiveOrString(tpe: c.universe.Type): Boolean = { val typeArgs = tpe.typeArgs - tpe <:< typeOf[Option[?]] - && typeArgs.nonEmpty - && ( - typeArgs.exists(isPrimitive) || - typeArgs.exists(isPrimitiveWrapper) || - typeArgs.exists(isString) - ) + tpe <:< typeOf[Option[?]] && + typeArgs.nonEmpty && + (typeArgs.exists(isPrimitive) || + typeArgs.exists(isPrimitiveWrapper) || + typeArgs.exists(isString)) } // value class