mirror of https://github.com/sbt/sbt.git
Bump sbt
This commit is contained in:
parent
c571b466ee
commit
91bf2649b2
|
|
@ -37,7 +37,7 @@ jobs:
|
|||
run: |
|
||||
case ${{ matrix.jobtype }} in
|
||||
1)
|
||||
sbt -v -Dfile.encoding=UTF8 scalafmtCheckAll whitesourceCheckPolicies +test +packagedArtifacts
|
||||
sbt -v -Dfile.encoding=UTF8 scalafmtCheckAll +test +packagedArtifacts
|
||||
;;
|
||||
*)
|
||||
echo unknown jobtype
|
||||
|
|
|
|||
|
|
@ -4,3 +4,4 @@ __pycache__
|
|||
|
||||
scripted-test/src/sbt-test/*/*/project/build.properties
|
||||
scripted-test/src/sbt-test/*/*/project/plugins.sbt
|
||||
metals.sbt
|
||||
|
|
|
|||
21
build.sbt
21
build.sbt
|
|
@ -6,7 +6,8 @@ val _ = {
|
|||
//https://github.com/sbt/contraband/issues/122
|
||||
sys.props += ("line.separator" -> "\n")
|
||||
}
|
||||
|
||||
Global / semanticdbEnabled := true
|
||||
Global / semanticdbVersion := "4.5.9"
|
||||
ThisBuild / version := {
|
||||
val old = (ThisBuild / version).value
|
||||
nightlyVersion match {
|
||||
|
|
@ -118,8 +119,7 @@ lazy val lmCore = (project in file("core"))
|
|||
scalaReflect.value,
|
||||
scalaCompiler.value,
|
||||
launcherInterface,
|
||||
gigahorseOkhttp,
|
||||
okhttpUrlconnection,
|
||||
gigahorseApacheHttp,
|
||||
sjsonnewScalaJson.value % Optional,
|
||||
scalaTest % Test,
|
||||
scalaCheck % Test,
|
||||
|
|
@ -260,7 +260,9 @@ lazy val lmCore = (project in file("core"))
|
|||
"sbt.librarymanagement.ResolverFunctions.validateArtifact"
|
||||
),
|
||||
exclude[IncompatibleResultTypeProblem]("sbt.librarymanagement.*.validateProtocol"),
|
||||
exclude[DirectMissingMethodProblem]("sbt.internal.librarymanagement.cross.CrossVersionUtil.TransitionDottyVersion"),
|
||||
exclude[DirectMissingMethodProblem](
|
||||
"sbt.internal.librarymanagement.cross.CrossVersionUtil.TransitionDottyVersion"
|
||||
),
|
||||
exclude[DirectMissingMethodProblem]("sbt.librarymanagement.ScalaArtifacts.dottyID"),
|
||||
exclude[DirectMissingMethodProblem]("sbt.librarymanagement.ScalaArtifacts.DottyIDPrefix"),
|
||||
exclude[DirectMissingMethodProblem]("sbt.librarymanagement.ScalaArtifacts.toolDependencies*"),
|
||||
|
|
@ -387,16 +389,5 @@ def customCommands: Seq[Setting[_]] = Seq(
|
|||
}
|
||||
)
|
||||
|
||||
inThisBuild(
|
||||
Seq(
|
||||
whitesourceProduct := "Lightbend Reactive Platform",
|
||||
whitesourceAggregateProjectName := "sbt-lm-master",
|
||||
whitesourceAggregateProjectToken := "9bde4ccbaab7401a91f8cda337af84365d379e13abaf473b85cb16e3f5c65cb6",
|
||||
whitesourceIgnoredScopes += "scalafmt",
|
||||
whitesourceFailOnError := sys.env.contains("WHITESOURCE_PASSWORD"), // fail if pwd is present
|
||||
whitesourceForceCheckAllDependencies := true,
|
||||
)
|
||||
)
|
||||
|
||||
def inCompileAndTest(ss: SettingsDefinition*): Seq[Setting[_]] =
|
||||
Seq(Compile, Test) flatMap (inConfig(_)(Def.settings(ss: _*)))
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
sbt.version=1.5.1
|
||||
sbt.version=1.6.2
|
||||
|
|
|
|||
|
|
@ -3,6 +3,5 @@ addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2")
|
|||
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.8.1")
|
||||
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.0.2")
|
||||
addSbtPlugin("org.scala-sbt" % "sbt-contraband" % "0.5.1")
|
||||
addSbtPlugin("com.lightbend" % "sbt-whitesource" % "0.1.14")
|
||||
|
||||
scalacOptions += "-language:postfixOps"
|
||||
|
|
|
|||
Loading…
Reference in New Issue