luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge 0b33fa207f into df6c6c454e

This commit is contained in:
eugene yokota 2026-07-16 22:38:31 +05:00 committed by GitHub
parent df6c6c454e 0b33fa207f
commit a41e4f4ddd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
build.sbt
View File

@ -435,6 +435,13 @@ lazy val utilScripted = (project in file("internal") / "util-scripted")
name := "Util Scripted", name := "Util Scripted",
libraryDependencies += scalaParsers, libraryDependencies += scalaParsers,
mimaSettings, 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) .configure(addSbtIO)
/* **** Intermediate-level Modules **** */ /* **** Intermediate-level Modules **** */

8
buildfile/src/main/scala/sbt/internal/Eval.scala
View File

@ -107,8 +107,9 @@ class Eval(
val header = val header =
imports.strings.mkString("\n") + imports.strings.mkString("\n") +
s""" s"""
|object $moduleName { |@scala.annotation.nowarn("name=IllegalIdentifier")
| def $WrapValName${returnType} = {""".stripMargin |object `$moduleName` {
| def `$WrapValName`${returnType} = {""".stripMargin
val contents = s"""$header val contents = s"""$header
|$expression |$expression
| } | }
@ -170,7 +171,8 @@ class Eval(
val header = val header =
imports.strings.mkString("\n") + imports.strings.mkString("\n") +
s""" s"""
|object $moduleName {""".stripMargin |@scala.annotation.nowarn("name=IllegalIdentifier")
|object `$moduleName` {""".stripMargin
val contents = val contents =
s"""$header s"""$header
|${definitions.map(_._1).mkString("\n")} |${definitions.map(_._1).mkString("\n")}

2
internal/util-scripted/src/main/scala/sbt/internal/scripted/StatementHandler.scala
View File

@ -19,7 +19,7 @@ trait StatementHandler {
trait BasicStatementHandler extends StatementHandler { trait BasicStatementHandler extends StatementHandler {
final type State = Unit final type State = Unit
final def initialState = () final def initialState: State = ()
final def apply(command: String, arguments: List[String], state: Unit): Unit = final def apply(command: String, arguments: List[String], state: Unit): Unit =
apply(command, arguments) apply(command, arguments)

2
project/Dependencies.scala
View File

@ -3,7 +3,7 @@ import Keys.*
object Dependencies { object Dependencies {
// WARNING: Please Scala update versions in PluginCross.scala too // 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 scala212 = "2.12.21"
val baseScalaVersion = scala3 val baseScalaVersion = scala3
def nightlyVersion: Option[String] = def nightlyVersion: Option[String] =