diff --git a/app/models/project/Page.scala b/app/models/project/Page.scala index 03bb2b374..1aca611ae 100644 --- a/app/models/project/Page.scala +++ b/app/models/project/Page.scala @@ -9,7 +9,7 @@ import db.impl.OrePostgresDriver.api._ import db.impl.access.ProjectBase import db.impl.model.common.Named import db.impl.schema.PageTable -import db.{DbRef, InsertFunc, Model, ModelQuery, ModelService, ObjId, ObjectTimestamp} +import db._ import discourse.OreDiscourseApi import ore.OreConfig import ore.project.ProjectOwned @@ -19,7 +19,7 @@ import java.util import cats.data.OptionT import cats.effect.IO import com.google.common.base.Preconditions._ -import com.vladsch.flexmark.ast.{MailLink, Node} +import com.vladsch.flexmark.ast.MailLink import com.vladsch.flexmark.ext.anchorlink.AnchorLinkExtension import com.vladsch.flexmark.ext.autolink.AutolinkExtension import com.vladsch.flexmark.ext.gfm.strikethrough.StrikethroughExtension @@ -30,6 +30,7 @@ import com.vladsch.flexmark.ext.wikilink.WikiLinkExtension import com.vladsch.flexmark.html.renderer._ import com.vladsch.flexmark.html.{HtmlRenderer, LinkResolver, LinkResolverFactory} import com.vladsch.flexmark.parser.Parser +import com.vladsch.flexmark.util.ast.Node import com.vladsch.flexmark.util.options.MutableDataSet import slick.lifted.TableQuery diff --git a/build.sbt b/build.sbt index ec7baa15b..0164b1277 100755 --- a/build.sbt +++ b/build.sbt @@ -68,10 +68,10 @@ lazy val doobieVersion = "0.6.0" libraryDependencies ++= Seq(ehcache, ws, guice) -lazy val flexmarkVersion = "0.34.58" +lazy val flexmarkVersion = "0.40.4" lazy val bouncycastleVersion = "1.60" lazy val playSlickVersion = "3.0.3" -lazy val slickPgVersion = "0.16.3" +lazy val slickPgVersion = "0.17.0" libraryDependencies ++= Seq( "org.spongepowered" % "play-discourse" % "3.0.2", @@ -83,7 +83,7 @@ libraryDependencies ++= Seq( "com.github.tminglei" %% "slick-pg_play-json" % slickPgVersion, "com.fasterxml.jackson.core" % "jackson-databind" % "2.8.11.3", "com.typesafe.scala-logging" %% "scala-logging" % "3.9.2", - "io.sentry" % "sentry-logback" % "1.7.15", + "io.sentry" % "sentry-logback" % "1.7.16", "org.bouncycastle" % "bcprov-jdk15on" % bouncycastleVersion, "org.bouncycastle" % "bcpkix-jdk15on" % bouncycastleVersion, "org.bouncycastle" % "bcpg-jdk15on" % bouncycastleVersion, @@ -106,8 +106,8 @@ libraryDependencies ++= Seq( "org.webjars.npm" % "jquery" % "2.2.4", "org.webjars.npm" % "font-awesome" % "4.7.0", "org.webjars.npm" % "filesize" % "3.6.1", - "org.webjars.npm" % "moment" % "2.22.2", - "org.webjars.npm" % "clipboard" % "2.0.1", + "org.webjars.npm" % "moment" % "2.23.0", + "org.webjars.npm" % "clipboard" % "2.0.4", "org.webjars.npm" % "chart.js" % "2.7.3" ) diff --git a/project/build.properties b/project/build.properties index 72f902892..c0bab0494 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.2.7 +sbt.version=1.2.8 diff --git a/project/plugins.sbt b/project/plugins.sbt index 461ca881b..75c3600be 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -3,7 +3,7 @@ evictionWarningOptions in update := EvictionWarningOptions.default.withWarnTrans resolvers += "Typesafe repository" at "http://repo.typesafe.com/typesafe/releases/" -addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.20") +addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.21") addSbtPlugin("org.irundaia.sbt" % "sbt-sassify" % "1.4.12") addSbtPlugin("com.typesafe.sbt" % "sbt-digest" % "1.1.3") addSbtPlugin("com.typesafe.sbt" % "sbt-gzip" % "1.0.2")