diff --git a/.github/workflows/scala.yml b/.github/workflows/scala.yml index 1cbfce83f..f0588b981 100644 --- a/.github/workflows/scala.yml +++ b/.github/workflows/scala.yml @@ -19,7 +19,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v4.0.0 + uses: actions/setup-java@v4.2.1 with: java-version: ${{ matrix.java }} distribution: adopt diff --git a/build.sbt b/build.sbt index cc947ca27..4f31712c1 100644 --- a/build.sbt +++ b/build.sbt @@ -10,8 +10,8 @@ import com.typesafe.tools.mima.core._ def Scala211 = "2.11.12" def Scala212 = "2.12.19" -def Scala213 = "2.13.13" -def Scala3 = "3.3.2" +def Scala213 = "2.13.14" +def Scala3 = "3.3.3" addCommandAlias("SetScala211", s"++ ${Scala211}!") addCommandAlias("SetScala212", s"++ ${Scala212}!") @@ -20,7 +20,7 @@ addCommandAlias("SetScala3", s"++ ${Scala3}!") name := "scalate" organization := "org.scalatra.scalate" -version := "1.9.9-SNAPSHOT" +version := "1.10.0" scalaVersion := Scala213 crossScalaVersions := Seq(Scala3, Scala213, Scala212, Scala211) javacOptions ++= Seq("-source", "1.8") diff --git a/project/Dependencies.scala b/project/Dependencies.scala index d6b8f905c..c42957956 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -8,7 +8,7 @@ object Dependencies { if (scalaBinaryVersion.value == "2.11") { "org.scala-lang.modules" %% "scala-parser-combinators" % "1.1.1" } else { - "org.scala-lang.modules" %% "scala-parser-combinators" % "2.3.0" + "org.scala-lang.modules" %% "scala-parser-combinators" % "2.4.0" } ) @@ -17,7 +17,7 @@ object Dependencies { case Some((2, 11)) => "org.scala-lang.modules" %% "scala-xml" % "1.3.1" case _ => - "org.scala-lang.modules" %% "scala-xml" % "2.2.0" + "org.scala-lang.modules" %% "scala-xml" % "2.3.0" } ) @@ -30,7 +30,7 @@ object Dependencies { } ) - val scalaCollectionCompat = "org.scala-lang.modules" %% "scala-collection-compat" % "2.11.0" + val scalaCollectionCompat = "org.scala-lang.modules" %% "scala-collection-compat" % "2.12.0" val atmosphereJersey = "org.atmosphere" % "atmosphere-jersey" % "0.9.7" val javaxServlet = "javax.servlet" % "servlet-api" % "2.5" @@ -43,13 +43,13 @@ object Dependencies { val jettyWebapp = jettyServer.withName("jetty-webapp") val jettyUtil = jettyServer.withName("jetty-util") - val jRubyComplete = "org.jruby" % "jruby-complete" % "9.4.6.0" + val jRubyComplete = "org.jruby" % "jruby-complete" % "9.4.7.0" val junit = "junit" % "junit" % "4.13.2" - val karafShell = "org.apache.karaf.shell" % "org.apache.karaf.shell.console" % "4.4.5" + val karafShell = "org.apache.karaf.shell" % "org.apache.karaf.shell.console" % "4.4.6" val logbackClassic = "ch.qos.logback" % "logback-classic" % "1.3.14" val osgiCore = "org.osgi" % "org.osgi.core" % "6.0.0" val rhinoCoffeeScript = "tv.cntt" % "rhinocoffeescript" % "1.12.7" - val scalamd = ("org.scalatra.scalate" %% "scalamd" % "1.7.3").cross(CrossVersion.for3Use2_13) + val scalamd = ("org.scalatra.scalate" %% "scalamd" % "1.8.0").cross(CrossVersion.for3Use2_13) val scalaTest = Def.setting { Seq( "org.scalatest" %% "scalatest-funsuite" % "3.2.18", @@ -58,8 +58,8 @@ object Dependencies { ) } val seleniumDriver = "org.seleniumhq.selenium" % "selenium-htmlunit-driver" % "2.52.0" - val slf4jApi = "org.slf4j" % "slf4j-api" % "2.0.12" - val springMVC = "org.springframework" % "spring-webmvc" % "5.3.32" + val slf4jApi = "org.slf4j" % "slf4j-api" % "2.0.13" + val springMVC = "org.springframework" % "spring-webmvc" % "5.3.34" val scalaReflect: (String, String) => ModuleID = _ % "scala-reflect" % _ val snakeYaml = "org.yaml" % "snakeyaml" % "2.2" val wikitextConfluence = "org.fusesource.wikitext" % "confluence-core" % "1.4" diff --git a/project/MimaSettings.scala b/project/MimaSettings.scala index 0eb3f7a32..f2b72768a 100644 --- a/project/MimaSettings.scala +++ b/project/MimaSettings.scala @@ -23,8 +23,8 @@ object MimaSettings { // // NOTE: will start validating bin-compatibility since 1.9 - val previousVersions = (0 to 7).map(patch => s"1.9.$patch").toSet - // val previousVersions = Set.empty[String] + // val previousVersions = (0 to 7).map(patch => s"1.10.$patch").toSet + val previousVersions = Set.empty[String] val mimaSettings = Seq( ThisBuild / mimaBinaryIssueFilters ++= Seq( diff --git a/project/build.properties b/project/build.properties index 04267b14a..081fdbbc7 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.9 +sbt.version=1.10.0 diff --git a/project/plugins.sbt b/project/plugins.sbt index 7cd5c973d..6f3a6a7f5 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -4,7 +4,7 @@ addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.21") addSbtPlugin("com.github.sbt" % "sbt-unidoc" % "0.5.0") addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.3") addSbtPlugin("com.github.sbt" % "sbt-git" % "2.0.1") -addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0") +addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.12.0") addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.8.3") addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.4")