From 170685f4e1afe548e9045f6b826170ea3d58ceb5 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Sun, 16 Jul 2017 15:00:08 -0400 Subject: [PATCH] Fixes dependency-management/update-sbt-classifiers --- main/src/main/scala/sbt/Defaults.scala | 3 ++- .../dependency-management/update-sbt-classifiers/build.sbt | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala index 8f8ef109d..ed0c2d64f 100755 --- a/main/src/main/scala/sbt/Defaults.scala +++ b/main/src/main/scala/sbt/Defaults.scala @@ -2169,7 +2169,8 @@ object Classpaths { // TODO: Should it be sbt's scalaModuleInfo? scalaModuleInfo.value, sbtDependency.value +: pluginIDs, - Vector(Configurations.Default), + // sbt is now on Maven Central, so this has changed from sbt 0.13. + Vector(Configurations.Default) ++ Configurations.default, classifiers.toVector ) } diff --git a/sbt/src/sbt-test/dependency-management/update-sbt-classifiers/build.sbt b/sbt/src/sbt-test/dependency-management/update-sbt-classifiers/build.sbt index 77e00de55..b4f691e86 100644 --- a/sbt/src/sbt-test/dependency-management/update-sbt-classifiers/build.sbt +++ b/sbt/src/sbt-test/dependency-management/update-sbt-classifiers/build.sbt @@ -1 +1 @@ -scalaVersion := "2.9.2" +scalaVersion := "2.11.11"