diff --git a/src/main/scala/interplay/PlayLibraryBase.scala b/src/main/scala/interplay/PlayLibraryBase.scala index 8598ac2..f388d47 100644 --- a/src/main/scala/interplay/PlayLibraryBase.scala +++ b/src/main/scala/interplay/PlayLibraryBase.scala @@ -24,7 +24,7 @@ import interplay.Omnidoc.autoImport.omnidocTagPrefix omnidocTagPrefix := "", compile / javacOptions ++= Seq("-source", "1.8", "-target", "1.8"), doc / javacOptions := Seq("-source", "1.8"), - crossScalaVersions := Seq(scalaVersion.value, ScalaVersions.scala212), + crossScalaVersions := Seq(scalaVersion.value), // TODO: Add ScalaVersions.scala3 scalaVersion := sys.props.get("scala.version").getOrElse(ScalaVersions.scala213), ThisBuild / playCrossBuildRootProject := true ) diff --git a/src/main/scala/interplay/PlayRootProjectBase.scala b/src/main/scala/interplay/PlayRootProjectBase.scala index 4bfd71d..7a2f87c 100644 --- a/src/main/scala/interplay/PlayRootProjectBase.scala +++ b/src/main/scala/interplay/PlayRootProjectBase.scala @@ -16,9 +16,9 @@ object PlayRootProjectBase extends AutoPlugin { override def projectSettings = PlayNoPublishBase.projectSettings ++ Seq( crossScalaVersions := { if ((ThisBuild / playCrossBuildRootProject).?.value.exists(identity)) { - Seq(ScalaVersions.scala212, ScalaVersions.scala213) + Seq(ScalaVersions.scala213) // TODO: Add ScalaVersions.scala3 } else { - Seq(ScalaVersions.scala212) + Seq(ScalaVersions.scala213) } } ) diff --git a/src/main/scala/interplay/Versions.scala b/src/main/scala/interplay/Versions.scala index 144649c..5f73f9c 100644 --- a/src/main/scala/interplay/Versions.scala +++ b/src/main/scala/interplay/Versions.scala @@ -3,6 +3,7 @@ package interplay object ScalaVersions { val scala212 = "2.12.14" val scala213 = "2.13.6" + val scala3 = "3.0.1" } object SbtVersions {