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

Merge pull request #5020 from eatkins/build-upgrade 

Build upgrade
This commit is contained in:
eugene yokota 2019-09-02 01:05:06 -04:00 committed by GitHub
parent ea778e9a5c 4e1074d175
commit 4d01ef449d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.sbt
View File

@ -13,6 +13,7 @@ ThisBuild / version := {
} }
ThisBuild / scalafmtOnCompile := !(Global / insideCI).value ThisBuild / scalafmtOnCompile := !(Global / insideCI).value
ThisBuild / Test / scalafmtOnCompile := !(Global / insideCI).value ThisBuild / Test / scalafmtOnCompile := !(Global / insideCI).value
ThisBuild / turbo := true
// ThisBuild settings take lower precedence, // ThisBuild settings take lower precedence,
// but can be shared across the multi projects. // but can be shared across the multi projects.
@ -665,7 +666,6 @@ lazy val mainProj = (project in file("main"))
sourceManaged in (Compile, generateContrabands) := baseDirectory.value / "src" / "main" / "contraband-scala", sourceManaged in (Compile, generateContrabands) := baseDirectory.value / "src" / "main" / "contraband-scala",
testOptions in Test += Tests testOptions in Test += Tests
.Argument(TestFrameworks.ScalaCheck, "-minSuccessfulTests", "1000"), .Argument(TestFrameworks.ScalaCheck, "-minSuccessfulTests", "1000"),
Test / classLoaderLayeringStrategy := ClassLoaderLayeringStrategy.Flat, // Delete this after 1.3.0-RC2.
mimaSettings, mimaSettings,
mimaBinaryIssueFilters ++= Vector( mimaBinaryIssueFilters ++= Vector(
// New and changed methods on KeyIndex. internal. // New and changed methods on KeyIndex. internal.

23
project/FixScalafmtPlugin.scala
View File

@ -1,23 +0,0 @@
import sbt._
import Keys._
import org.scalafmt.sbt.ScalafmtPlugin
import ScalafmtPlugin.autoImport._
object FixScalafmtPlugin extends AutoPlugin {
override def requires = ScalafmtPlugin
override def trigger = allRequirements
val ScalaFmtTag = ConcurrentRestrictions.Tag("scalafmt")
override def globalSettings: Seq[Def.Setting[_]] =
Seq(
concurrentRestrictions += Tags.limit(ScalaFmtTag, 1)
)
override def projectSettings: Seq[Def.Setting[_]] =
Seq(
scalafmtCheckAll := (scalafmtCheckAll.tag(ScalaFmtTag)).value,
Compile / scalafmtCheck := ((Compile / scalafmtCheck).tag(ScalaFmtTag)).value,
Test / scalafmtCheck := ((Test / scalafmtCheck).tag(ScalaFmtTag)).value,
)
}