From 92ed849eaa0c57f5e6bcc2a54a2a080ac44441be Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Fri, 22 Dec 2017 10:29:11 +0000 Subject: [PATCH] Remove import-excluding Predef.conforms As of Scala 2.11 Predef.conforms isn't implicit anymore (and it's deprecated), so import-excluding doesn't avoid the implicit (the implicit version is now Predef.$conforms). Also in Scala 2.13 Predef.conforms has been removed. --- main-actions/src/main/scala/sbt/Package.scala | 1 - main-actions/src/main/scala/sbt/RawCompileLike.scala | 1 - 2 files changed, 2 deletions(-) diff --git a/main-actions/src/main/scala/sbt/Package.scala b/main-actions/src/main/scala/sbt/Package.scala index 080667e6a..82ab1072f 100644 --- a/main-actions/src/main/scala/sbt/Package.scala +++ b/main-actions/src/main/scala/sbt/Package.scala @@ -7,7 +7,6 @@ package sbt -import scala.Predef.{ conforms => _, _ } import java.io.File import java.util.jar.{ Attributes, Manifest } import scala.collection.JavaConverters._ diff --git a/main-actions/src/main/scala/sbt/RawCompileLike.scala b/main-actions/src/main/scala/sbt/RawCompileLike.scala index f8b85e25c..56fc1b551 100644 --- a/main-actions/src/main/scala/sbt/RawCompileLike.scala +++ b/main-actions/src/main/scala/sbt/RawCompileLike.scala @@ -11,7 +11,6 @@ import scala.annotation.tailrec import java.io.File import sbt.internal.inc.{ RawCompiler, ScalaInstance } -import Predef.{ conforms => _, _ } import sbt.io.syntax._ import sbt.io.IO