diff --git a/.mergify.yml b/.mergify.yml index ff95d1a..f9b20e7 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -10,7 +10,6 @@ pull_request_rules: actions: merge: method: merge - strict: smart - name: backport patches to 1.4.x branch conditions: diff --git a/project/build.properties b/project/build.properties index e64c208..3161d21 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.5.8 +sbt.version=1.6.1 diff --git a/src/main/scala/interplay/PlaySbtBuildBase.scala b/src/main/scala/interplay/PlaySbtBuildBase.scala index e812a0e..a805384 100644 --- a/src/main/scala/interplay/PlaySbtBuildBase.scala +++ b/src/main/scala/interplay/PlaySbtBuildBase.scala @@ -11,7 +11,7 @@ private[interplay] object PlaySbtBuildBase extends AutoPlugin { override def projectSettings = Seq( scalaVersion := ScalaVersions.scala212, crossScalaVersions := Seq(ScalaVersions.scala212), - pluginCrossBuild / sbtVersion := SbtVersions.sbt15, + pluginCrossBuild / sbtVersion := SbtVersions.sbt16, compile / javacOptions ++= Seq("-source", "1.8", "-target", "1.8"), doc / javacOptions := Seq("-source", "1.8") ) diff --git a/src/main/scala/interplay/Versions.scala b/src/main/scala/interplay/Versions.scala index 43f6d40..67a1ac8 100644 --- a/src/main/scala/interplay/Versions.scala +++ b/src/main/scala/interplay/Versions.scala @@ -2,10 +2,10 @@ package interplay object ScalaVersions { val scala212 = "2.12.15" - val scala213 = "2.13.7" + val scala213 = "2.13.8" val scala3 = "3.1.0" } object SbtVersions { - val sbt15 = "1.5.8" + val sbt16 = "1.6.1" }