Merge branch 'main' into blocking

geirolz · Oct 19, 2024 · 867e8a1 · 867e8a1
2 parents 9163f97 + 0112aad
commit 867e8a1
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 14 deletions.
diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
@@ -38,7 +38,7 @@ jobs:
 
       #----------- CACHE -----------
       - name: Cache SBT
-        uses: actions/cache@v4.0.2
+        uses: actions/cache@v4.1.0
         with:
           # A list of files, directories, and wildcard patterns to cache and restore
           path: |
@@ -55,11 +55,11 @@ jobs:
       - name: MiMa Report
         run: sbt ++${{ matrix.scala }} mimaReportBinaryIssues
 
-      #----------- COVERAGE -----------
-      - name: Upload Coverage to Codacy
-        run: bash <(curl -Ls https://coverage.codacy.com/get.sh)
-        env:
-          CODACY_PROJECT_TOKEN: ${{ secrets.CODACY_PROJECT_TOKEN }}
+#      #----------- COVERAGE -----------
+#      - name: Upload Coverage to Codacy
+#        run: bash <(curl -Ls https://coverage.codacy.com/get.sh)
+#        env:
+#          CODACY_PROJECT_TOKEN: ${{ secrets.CODACY_PROJECT_TOKEN }}
 
   deploy:
     runs-on: ubuntu-latest
@@ -77,7 +77,7 @@ jobs:
 
       #----------- CACHE -----------
       - name: Cache SBT
-        uses: actions/cache@v4.0.2
+        uses: actions/cache@v4.1.0
         with:
           # A list of files, directories, and wildcard patterns to cache and restore
           path: |

diff --git a/.github/workflows/codacy.yml b/.github/workflows/codacy.yml
@@ -39,7 +39,7 @@ jobs:
 
       # Execute Codacy Analysis CLI and generate a SARIF output with the security issues identified during the analysis
       - name: Run Codacy Analysis CLI
-        uses: codacy/codacy-analysis-cli-action@3ff8e64eb4b714c4bee91b7b4eea31c6fc2c4f93
+        uses: codacy/codacy-analysis-cli-action@97bf5df3c09e75f5bcd72695998f96ebd701846e
         with:
           # Check https://github.com/codacy/codacy-analysis-cli#project-token to get your project token from your Codacy repository
           # You can also omit the token and run the tools that support default configurations

diff --git a/core/src/main/scala/cats/xml/xmlNode.scala b/core/src/main/scala/cats/xml/xmlNode.scala
@@ -128,7 +128,7 @@ sealed trait XmlNode extends Xml {
     children.exists(n => (n.label == label) && predicate(n))
 
   // must be 'def' due it's mutable
-  def children: Seq[XmlNode] =
+  def children: List[XmlNode] =
     content.children
 
   /** Create a new immutable instance with the same values of the current one

diff --git a/core/src/main/scala/cats/xml/xmlParser.scala b/core/src/main/scala/cats/xml/xmlParser.scala
@@ -1,6 +1,6 @@
 package cats.xml
 
-import cats.MonadThrow
+import cats.ApplicativeThrow
 import cats.xml.utils.impure
 import org.xml.sax.Attributes
 import org.xml.sax.helpers.DefaultHandler
@@ -40,7 +40,7 @@ object XmlParser extends XmlParserSyntax {
 
   def apply[F[_]](implicit parser: XmlParser[F]): XmlParser[F] = parser
 
-  def fromSAXParser[F[_]: MonadThrow](
+  def fromSAXParser[F[_]: ApplicativeThrow](
     saxParser: SAXParser
   ): XmlParser[F] =
     (inputStream: InputStream) =>
@@ -97,7 +97,7 @@ object XmlParser extends XmlParserSyntax {
         }
       }.liftTo[F]
 
-  implicit def defaultXmlSAXParser[F[_]: MonadThrow]: XmlParser[F] =
+  implicit def defaultXmlSAXParser[F[_]: ApplicativeThrow]: XmlParser[F] =
     fromSAXParser[F](defaultSaxParser)
 }
 private[xml] trait XmlParserSyntax {

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -4,5 +4,4 @@ addSbtPlugin("org.scalameta"  % "sbt-scalafmt"   % "2.5.2")
 addSbtPlugin("org.scoverage"  % "sbt-scoverage"  % "2.2.0")
 addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.6.1")
 addSbtPlugin("org.scalameta"  % "sbt-mdoc"       % "2.5.4")
-//addSbtPlugin("org.jetbrains.scala" % "sbt-ide-settings" % "1.1.1")
-addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.4")
+addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.4")