From 014bd6fdd663b8b99510b2aa4eda2e73bd0743aa Mon Sep 17 00:00:00 2001 From: Katrix Date: Tue, 17 Oct 2023 15:16:35 +0200 Subject: [PATCH] Update some more stuff in the hopes that CI will work --- apiV2/app/db/impl/query/apiv2/ProjectQueries.scala | 2 +- ore/conf/logback.xml | 3 --- project/plugins.sbt | 4 +++- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/apiV2/app/db/impl/query/apiv2/ProjectQueries.scala b/apiV2/app/db/impl/query/apiv2/ProjectQueries.scala index 2fc90d0b4..9ee81da87 100644 --- a/apiV2/app/db/impl/query/apiv2/ProjectQueries.scala +++ b/apiV2/app/db/impl/query/apiv2/ProjectQueries.scala @@ -157,7 +157,7 @@ object ProjectQueries extends APIV2Queries { // 1483056000 is the Ore epoch // 86400 seconds to days - // 604800‬ seconds to weeks + // 604800 seconds to weeks order match { case ProjectSortingStrategy.MostStars => fr"ps.stars *" ++ relevance case ProjectSortingStrategy.MostDownloads => fr"(ps.downloads / 100) *" ++ relevance diff --git a/ore/conf/logback.xml b/ore/conf/logback.xml index 88927aafe..b7d38f487 100644 --- a/ore/conf/logback.xml +++ b/ore/conf/logback.xml @@ -33,9 +33,6 @@ DENY - - - diff --git a/project/plugins.sbt b/project/plugins.sbt index a067b8fa3..dfd59220f 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -4,10 +4,12 @@ evictionWarningOptions in update := EvictionWarningOptions.default .withWarnDirectEvictions(false) .withWarnScalaVersionEviction(false) -addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.16") +addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.20") addSbtPlugin("com.typesafe.sbt" % "sbt-digest" % "1.1.4") addSbtPlugin("com.typesafe.sbt" % "sbt-gzip" % "1.0.2") addSbtPlugin("com.iheart" %% "sbt-play-swagger" % "0.10.7-PLAY2.8") addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0") libraryDependencies += "com.typesafe.play" %% "play-json" % "2.8.1" + +ThisBuild / libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always