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

Merge pull request #8062 from eed3si9n/wip/scala-3.6.4

This commit is contained in:
eugene yokota 2025-03-10 09:37:42 -04:00 committed by GitHub
parent c00d65f4a3 de5c9b1869
commit ef6da07433
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lm-coursier/src/test/scala/lmcoursier/ResolutionSpec.scala
View File

@ -11,7 +11,7 @@ import sbt.librarymanagement.Resolver.{
JCenterRepository, JCenterRepository,
JavaNet2Repository JavaNet2Repository
} }
import sbt.librarymanagement.{ Resolver, UnresolvedWarningConfiguration, UpdateConfiguration } // import sbt.librarymanagement.{ Resolver, UnresolvedWarningConfiguration, UpdateConfiguration }
import sbt.librarymanagement.syntax.* import sbt.librarymanagement.syntax.*
final class ResolutionSpec extends AnyPropSpec with Matchers { final class ResolutionSpec extends AnyPropSpec with Matchers {

2
lm-ivy/src/main/scala/sbt/internal/librarymanagement/Ivy.scala
View File

@ -40,7 +40,6 @@ import scala.collection.immutable.ArraySeq
import scala.util.{ Success, Failure } import scala.util.{ Success, Failure }
import sbt.util.* import sbt.util.*
import sbt.librarymanagement.{ ModuleDescriptorConfiguration as InlineConfiguration, * } import sbt.librarymanagement.{ ModuleDescriptorConfiguration as InlineConfiguration, * }
import sbt.librarymanagement.Platform
import sbt.librarymanagement.ivy.* import sbt.librarymanagement.ivy.*
import sbt.librarymanagement.syntax.* import sbt.librarymanagement.syntax.*
@ -54,7 +53,6 @@ import ivyint.{
} }
import sjsonnew.JsonFormat import sjsonnew.JsonFormat
import sjsonnew.support.murmurhash.Hasher import sjsonnew.support.murmurhash.Hasher
import sbt.librarymanagement.ModuleSettings
final class IvySbt( final class IvySbt(
val configuration: IvyConfiguration, val configuration: IvyConfiguration,

2
main/src/main/scala/sbt/Defaults.scala
View File

@ -139,8 +139,6 @@ import xsbti.compile.{
TastyFiles, TastyFiles,
TransactionalManagerType TransactionalManagerType
} }
import sbt.internal.IncrementalTest
import sbt.internal.RunUtil
object Defaults extends BuildCommon { object Defaults extends BuildCommon {
final val CacheDirectoryName = "cache" final val CacheDirectoryName = "cache"

2
project/Dependencies.scala
View File

@ -4,7 +4,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 scala213 = "2.13.16" val scala213 = "2.13.16"
val scala3 = "3.6.3" val scala3 = "3.6.4"
val checkPluginCross = settingKey[Unit]("Make sure scalaVersion match up") val checkPluginCross = settingKey[Unit]("Make sure scalaVersion match up")
val baseScalaVersion = scala3 val baseScalaVersion = scala3
def nightlyVersion: Option[String] = def nightlyVersion: Option[String] =

2
sbt-app/src/sbt-test/actions/input-task-dyn/build.sbt
View File

@ -5,7 +5,7 @@ import complete.Parser
val runFoo = inputKey[Unit]("Runs Foo with passed arguments") val runFoo = inputKey[Unit]("Runs Foo with passed arguments")
val check = taskKey[Unit]("") val check = taskKey[Unit]("")
scalaVersion := "3.6.3" scalaVersion := "3.6.4"
lazy val root = (project in file(".")). lazy val root = (project in file(".")).
settings( settings(

0
sbt-app/src/sbt-test/dependency-management/custom-config/pending → sbt-app/src/sbt-test/dependency-management/custom-config/test
View File

2
server-test/src/server-test/client/build.sbt
View File

@ -1,4 +1,4 @@
scalaVersion := "3.6.3" scalaVersion := "3.6.4"
TaskKey[Unit]("willSucceed") := println("success") TaskKey[Unit]("willSucceed") := println("success")