Merge pull request #660 from typelevel/topic/version-bumps

Version bumps
typelevel · Sep 29, 2024 · 85a3df4 · 85a3df4
2 parents ba83b24 + 4caeefe
commit 85a3df4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/build.sbt b/build.sbt
@@ -24,8 +24,8 @@ val sourcePosVersion       = "1.1.0"
 val typenameVersion        = "1.1.0"
 val whaleTailVersion       = "0.0.12"
 
-val Scala2 = "2.13.14"
-val Scala3 = "3.3.3"
+val Scala2 = "2.13.15"
+val Scala3 = "3.3.4"
 ThisBuild / scalaVersion        := Scala2
 ThisBuild / crossScalaVersions  := Seq(Scala2, Scala3)
 ThisBuild / tlJdkRelease        := Some(11)

diff --git a/modules/core/src/main/scala/query.scala b/modules/core/src/main/scala/query.scala
@@ -450,9 +450,8 @@ object Query {
         case Filter(pred, child) => (Some(pred), child)
         case child => (None, child)
       }
-      limit.orElse(offset).orElse(order).orElse(filter).map { _ =>
-        (filter, order, offset, limit, q3)
-      }
+      if(limit.isEmpty && offset.isEmpty && order.isEmpty && filter.isEmpty) None
+      else Some((filter, order, offset, limit, q3))
     }
   }
 

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -6,6 +6,6 @@ addSbtPlugin("de.heikoseeberger"         % "sbt-header"                    % "5.
 addSbtPlugin("pl.project13.scala"        % "sbt-jmh"                       % "0.4.7")
 addSbtPlugin("nl.zolotko.sbt"            % "sbt-jfr"                       % "0.0.1")
 addSbtPlugin("com.eed3si9n"              % "sbt-buildinfo"                 % "0.12.0")
-addSbtPlugin("org.scala-js"              % "sbt-scalajs"                   % "1.16.0")
+addSbtPlugin("org.scala-js"              % "sbt-scalajs"                   % "1.17.0")
 addSbtPlugin("org.scala-native"          % "sbt-scala-native"              % "0.4.17")
-addSbtPlugin("org.scoverage"             % "sbt-scoverage"                 % "2.2.0")
+addSbtPlugin("org.scoverage"             % "sbt-scoverage"                 % "2.2.1")