Skip to content

Commit

Permalink
Merge pull request sbt#316 from eed3si9n/wip/use1.5.1
Browse files Browse the repository at this point in the history
Use sbt 1.5.1
  • Loading branch information
eed3si9n committed May 3, 2021
2 parents 2a390d9 + e7682cd commit 85a492e
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 10 deletions.
15 changes: 8 additions & 7 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ ThisBuild / publishTo := {

def commonSettings: Seq[Setting[_]] = Seq(
scalaVersion := scala212,
javacOptions in compile ++= Seq("-Xlint", "-Xlint:-serial"),
compile / javacOptions ++= Seq("-Xlint", "-Xlint:-serial"),
crossScalaVersions := Seq(scala212, scala213),
headerLicense := (ThisBuild / headerLicense).value,
)
Expand All @@ -54,7 +54,7 @@ lazy val ioRoot = (project in file("."))
.settings(
commonSettings,
name := "IO Root",
skip in publish := true,
publish / skip := true,
onLoadMessage := {
""" _
| (_)___
Expand Down Expand Up @@ -84,8 +84,8 @@ val io = (project in file("io"))
libraryDependencies ++= Seq(jna, jnaPlatform),
Test / fork := System.getProperty("sbt.test.fork", "false") == "true",
Test / testForkedParallel := true,
sourceManaged in (Compile, generateContrabands) := baseDirectory.value / "src" / "main" / "contraband-scala",
initialCommands in console += "\nimport sbt.io._, syntax._",
Compile / generateContrabands / sourceManaged := baseDirectory.value / "src" / "main" / "contraband-scala",
console / initialCommands += "\nimport sbt.io._, syntax._",
mimaPreviousArtifacts := (CrossVersion partialVersion scalaVersion.value match {
case Some((2, n)) if n >= 13 => Set.empty
case _ =>
Expand All @@ -101,6 +101,7 @@ val io = (project in file("io"))
"1.2.0",
"1.3.0",
"1.4.0",
"1.5.0",
) map (version => organization.value %% moduleName.value % version)
}),
mimaBinaryIssueFilters ++= Seq(
Expand Down Expand Up @@ -156,9 +157,9 @@ val io = (project in file("io"))
),
BuildInfoPlugin.buildInfoDefaultSettings, // avoids BuildInfo generated in Compile scope
addBuildInfoToConfig(Test),
buildInfoKeys in Test := Seq[BuildInfoKey](target),
buildInfoPackage in Test := "sbt.internal.io",
buildInfoUsePackageAsPath in Test := true,
Test / buildInfoKeys := Seq[BuildInfoKey](target),
Test / buildInfoPackage := "sbt.internal.io",
Test / buildInfoUsePackageAsPath := true,
)

inThisBuild(
Expand Down
2 changes: 1 addition & 1 deletion project/HouseRulesPluglin.scala
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ object HouseRulesPlugin extends AutoPlugin {
scalacOptions += "-Ywarn-value-discard",
scalacOptions ++= "-Ywarn-unused-import".ifScala(v => 11 <= v && v <= 12).value.toList
) ++ Seq(Compile, Test).flatMap(
c => scalacOptions in (c, console) --= Seq("-Ywarn-unused-import", "-Xlint")
c => (c / console / scalacOptions) --= Seq("-Ywarn-unused-import", "-Xlint")
)

private def scalaPartV = Def setting (CrossVersion partialVersion scalaVersion.value)
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.4.9
sbt.version=1.5.1
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.0.0")
addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2")
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.6.1")
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.eed3si9n" % "sbt-buildinfo" % "0.9.0")
Expand Down

0 comments on commit 85a492e

Please sign in to comment.