diff --git a/MIGRATION.md b/MIGRATION.md index eeeef930d..8435b3448 100644 --- a/MIGRATION.md +++ b/MIGRATION.md @@ -13,3 +13,4 @@ Migration notes - Renames early command feature from `--` to `early()`. - Log options `-error`, `-warn`, `-info`, `-debug` are added as shorthand for `"early(error)"` etc. - `sbt.Process` and `sbt.ProcessExtra` are gone. Use `scala.sys.process` instead. +- `incOptions.value.withNameHashing(...)` option is removed. diff --git a/sbt/src/sbt-test/source-dependencies/backtick-quoted-names/build.sbt b/sbt/src/sbt-test/source-dependencies/backtick-quoted-names/build.sbt deleted file mode 100644 index 8a38ef414..000000000 --- a/sbt/src/sbt-test/source-dependencies/backtick-quoted-names/build.sbt +++ /dev/null @@ -1 +0,0 @@ -incOptions := incOptions.value.withNameHashing(true) diff --git a/sbt/src/sbt-test/source-dependencies/macro-annotation/build.sbt b/sbt/src/sbt-test/source-dependencies/macro-annotation/build.sbt index 4243856d5..12a8459cc 100644 --- a/sbt/src/sbt-test/source-dependencies/macro-annotation/build.sbt +++ b/sbt/src/sbt-test/source-dependencies/macro-annotation/build.sbt @@ -5,8 +5,7 @@ val commonSettings = Seq( scalaVersion := "2.11.4", resolvers += Resolver.sonatypeRepo("snapshots"), resolvers += Resolver.sonatypeRepo("releases"), - addCompilerPlugin("org.scalamacros" % "paradise" % paradiseVersion cross CrossVersion.full), - incOptions := incOptions.value.withNameHashing(true) + addCompilerPlugin("org.scalamacros" % "paradise" % paradiseVersion cross CrossVersion.full) ) lazy val root = (project in file(".")). diff --git a/sbt/src/sbt-test/source-dependencies/macro/build.sbt b/sbt/src/sbt-test/source-dependencies/macro/build.sbt index 1e81806a5..264dd3d57 100644 --- a/sbt/src/sbt-test/source-dependencies/macro/build.sbt +++ b/sbt/src/sbt-test/source-dependencies/macro/build.sbt @@ -1,7 +1,6 @@ val defaultSettings = Seq( scalaVersion := "2.10.6", - libraryDependencies += scalaVersion("org.scala-lang" % "scala-reflect" % _ ).value //, - //incOptions := incOptions.value.withNameHashing(true) + libraryDependencies += scalaVersion("org.scala-lang" % "scala-reflect" % _ ).value ) lazy val root = (project in file(".")). diff --git a/sbt/src/sbt-test/source-dependencies/same-file-used-names/build.sbt b/sbt/src/sbt-test/source-dependencies/same-file-used-names/build.sbt deleted file mode 100644 index 8a38ef414..000000000 --- a/sbt/src/sbt-test/source-dependencies/same-file-used-names/build.sbt +++ /dev/null @@ -1 +0,0 @@ -incOptions := incOptions.value.withNameHashing(true) diff --git a/sbt/src/sbt-test/source-dependencies/type-alias/build.sbt b/sbt/src/sbt-test/source-dependencies/type-alias/build.sbt index c5a1099aa..00edfde1d 100644 --- a/sbt/src/sbt-test/source-dependencies/type-alias/build.sbt +++ b/sbt/src/sbt-test/source-dependencies/type-alias/build.sbt @@ -1,3 +1 @@ logLevel in compile := Level.Debug - -incOptions := incOptions.value.withNameHashing(true)