From e7682cdd3547440f0bd71bef62af0d97f2945b65 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Sun, 2 May 2021 22:05:10 -0400 Subject: [PATCH] Use sbt 1.5.1 --- build.sbt | 15 ++++++++------- project/HouseRulesPluglin.scala | 2 +- project/build.properties | 2 +- project/plugins.sbt | 2 +- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/build.sbt b/build.sbt index d4c93d13..e44d6521 100644 --- a/build.sbt +++ b/build.sbt @@ -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, ) @@ -54,7 +54,7 @@ lazy val ioRoot = (project in file(".")) .settings( commonSettings, name := "IO Root", - skip in publish := true, + publish / skip := true, onLoadMessage := { """ _ | (_)___ @@ -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 _ => @@ -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( @@ -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( diff --git a/project/HouseRulesPluglin.scala b/project/HouseRulesPluglin.scala index cf1eb9fb..ba7caac4 100644 --- a/project/HouseRulesPluglin.scala +++ b/project/HouseRulesPluglin.scala @@ -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) diff --git a/project/build.properties b/project/build.properties index dbae93bc..f0be67b9 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.4.9 +sbt.version=1.5.1 diff --git a/project/plugins.sbt b/project/plugins.sbt index 1cfbb9f6..5245d40c 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -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")