diff --git a/main-actions/src/main/scala/sbt/Compiler.scala b/main-actions/src/main/scala/sbt/Compiler.scala index ee0efc8ea..899dfa55d 100644 --- a/main-actions/src/main/scala/sbt/Compiler.scala +++ b/main-actions/src/main/scala/sbt/Compiler.scala @@ -30,7 +30,7 @@ object Compiler { /** Inputs necessary to run the incremental compiler. */ // final case class Inputs(compilers: Compilers, config: Options, incSetup: IncSetup) - // /** The inputs for the compiler *and* the previous analysis of source dependecnies. */ + // /** The inputs for the compiler *and* the previous analysis of source dependencies. */ // final case class InputsWithPrevious(inputs: Inputs, previousAnalysis: PreviousAnalysis) // final case class Options(classpath: Seq[File], sources: Seq[File], classesDirectory: File, options: Seq[String], javacOptions: Seq[String], maxErrors: Int, sourcePositionMapper: Position => Position, order: CompileOrder) // final case class IncSetup(analysisMap: File => Option[Analysis], definesClass: DefinesClass, skip: Boolean, cacheFile: File, cache: GlobalsCache, incOptions: IncOptions) diff --git a/notes/0.13.8.markdown b/notes/0.13.8.markdown index 1f2b57c22..5b8f36a15 100644 --- a/notes/0.13.8.markdown +++ b/notes/0.13.8.markdown @@ -90,7 +90,7 @@ - Fixes sporadic ConcurrentModificationException from JUnitXmlTestsListener. [#1881][1881] by [@aerskine][@aerskine] - Fixes handling of ANSI CSI codes. [#1885][1885] by [@jsuereth][@jsuereth] - Exempt org.scala-lang:scala-actors-migration and org.scala-lang:scala-pickling from scala binary version checks. [#1818][1818]/[#1899][1899] by [@dwijnand][@dwijnand] -- Fixes cached resolution handling of internal depdendencies. [#1711][1711] by [@eed3si9n][@eed3si9n] +- Fixes cached resolution handling of internal dependencies. [#1711][1711] by [@eed3si9n][@eed3si9n] - Fixes cached resolution being too verbose. [#1752][1752] by [@eed3si9n][@eed3si9n] - Fixes cached resolution not evicting modules transitively. [#1760][1760] by [@eed3si9n][@eed3si9n] diff --git a/sbt/src/sbt-test/dependency-management/scala-organization/build.sbt b/sbt/src/sbt-test/dependency-management/scala-organization/build.sbt index 8d7522296..82a7dce27 100644 --- a/sbt/src/sbt-test/dependency-management/scala-organization/build.sbt +++ b/sbt/src/sbt-test/dependency-management/scala-organization/build.sbt @@ -16,7 +16,7 @@ resolvers += Resolver.file("buggy", (baseDirectory in LocalRootProject).value / libraryDependencies += "org.typelevel" %% "cats" % "0.6.0" -val checkDependencies = taskKey[Unit]("Checks that dependcies are correct.") +val checkDependencies = taskKey[Unit]("Checks that dependencies are correct.") checkDependencies := { val expected: Set[ModuleID] = Set( diff --git a/sbt/src/sbt-test/dependency-management/transitive-excludes/build.sbt b/sbt/src/sbt-test/dependency-management/transitive-excludes/build.sbt index 2776e4448..3bebeda6d 100644 --- a/sbt/src/sbt-test/dependency-management/transitive-excludes/build.sbt +++ b/sbt/src/sbt-test/dependency-management/transitive-excludes/build.sbt @@ -6,7 +6,7 @@ resolvers += { } libraryDependencies += "exclude.test" % "app" % "1.0.0" -val checkDependencies = taskKey[Unit]("Checks that dependcies are correct.") +val checkDependencies = taskKey[Unit]("Checks that dependencies are correct.") checkDependencies := { val hasBadJar = (fullClasspath in Compile).value.exists { jar => jar.data.getName contains "bottom-1.0.0.jar"}