mirror of https://github.com/sbt/sbt.git
[2.x] Scala 3.9.0-RC3
This commit is contained in:
parent
d3141f1391
commit
0b33fa207f
|
|
@ -435,6 +435,13 @@ lazy val utilScripted = (project in file("internal") / "util-scripted")
|
|||
name := "Util Scripted",
|
||||
libraryDependencies += scalaParsers,
|
||||
mimaSettings,
|
||||
mimaBinaryIssueFilters ++= Vector(
|
||||
exclude[DirectMissingMethodProblem](
|
||||
"sbt.internal.scripted.BasicStatementHandler.initialState"
|
||||
),
|
||||
exclude[IncompatibleResultTypeProblem]("sbt.internal.scripted.CommentHandler.initialState"),
|
||||
exclude[IncompatibleResultTypeProblem]("sbt.internal.scripted.FileCommands.initialState"),
|
||||
),
|
||||
)
|
||||
.configure(addSbtIO)
|
||||
/* **** Intermediate-level Modules **** */
|
||||
|
|
|
|||
|
|
@ -107,8 +107,9 @@ class Eval(
|
|||
val header =
|
||||
imports.strings.mkString("\n") +
|
||||
s"""
|
||||
|object $moduleName {
|
||||
| def $WrapValName${returnType} = {""".stripMargin
|
||||
|@scala.annotation.nowarn("name=IllegalIdentifier")
|
||||
|object `$moduleName` {
|
||||
| def `$WrapValName`${returnType} = {""".stripMargin
|
||||
val contents = s"""$header
|
||||
|$expression
|
||||
| }
|
||||
|
|
@ -170,7 +171,8 @@ class Eval(
|
|||
val header =
|
||||
imports.strings.mkString("\n") +
|
||||
s"""
|
||||
|object $moduleName {""".stripMargin
|
||||
|@scala.annotation.nowarn("name=IllegalIdentifier")
|
||||
|object `$moduleName` {""".stripMargin
|
||||
val contents =
|
||||
s"""$header
|
||||
|${definitions.map(_._1).mkString("\n")}
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ trait StatementHandler {
|
|||
|
||||
trait BasicStatementHandler extends StatementHandler {
|
||||
final type State = Unit
|
||||
final def initialState = ()
|
||||
final def initialState: State = ()
|
||||
|
||||
final def apply(command: String, arguments: List[String], state: Unit): Unit =
|
||||
apply(command, arguments)
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ import Keys.*
|
|||
|
||||
object Dependencies {
|
||||
// WARNING: Please Scala update versions in PluginCross.scala too
|
||||
val scala3 = "3.8.4"
|
||||
val scala3 = "3.9.0-RC3"
|
||||
val scala212 = "2.12.21"
|
||||
val baseScalaVersion = scala3
|
||||
def nightlyVersion: Option[String] =
|
||||
|
|
|
|||
Loading…
Reference in New Issue