From 5bd162d5fec52bbbc8b9e31630207e5848fc554f Mon Sep 17 00:00:00 2001
From: Alexandre Archambault <alexandre.archambault@gmail.com>
Date: Mon, 12 Mar 2018 11:18:19 +0100
Subject: [PATCH] Tweak scalac options

---
 cache/js/src/main/scala/coursier/Platform.scala            | 1 -
 cache/jvm/src/main/scala/coursier/util/Schedulable.scala   | 2 --
 cli/src/main/scala-2.12/coursier/cli/Fetch.scala           | 2 --
 .../main/scala-2.12/coursier/cli/scaladex/Scaladex.scala   | 2 --
 core/shared/src/main/scala/coursier/Fetch.scala            | 2 --
 core/shared/src/main/scala/coursier/core/Repository.scala  | 1 -
 .../src/main/scala/coursier/core/ResolutionProcess.scala   | 1 -
 .../shared/src/main/scala/coursier/ivy/IvyRepository.scala | 2 --
 core/shared/src/main/scala/coursier/ivy/Pattern.scala      | 2 --
 .../src/main/scala/coursier/maven/MavenRepository.scala    | 2 --
 core/shared/src/main/scala/coursier/util/EitherT.scala     | 2 --
 core/shared/src/main/scala/coursier/util/Gather.scala      | 2 --
 core/shared/src/main/scala/coursier/util/Monad.scala       | 2 --
 .../scala/coursier/FallbackDependenciesRepository.scala    | 2 --
 project/Settings.scala                                     | 7 ++++++-
 .../src/main/scala/coursier/InterProjectRepository.scala   | 2 --
 sbt-coursier/src/main/scala/coursier/Structure.scala       | 2 --
 scalaz/shared/src/main/scala/coursier/interop/scalaz.scala | 2 --
 tests/jvm/src/test/scala/coursier/Platform.scala           | 1 -
 .../src/test/scala/coursier/test/TestRepository.scala      | 2 --
 20 files changed, 6 insertions(+), 35 deletions(-)

diff --git a/cache/js/src/main/scala/coursier/Platform.scala b/cache/js/src/main/scala/coursier/Platform.scala
index 06c75a581..2b3d0dbe2 100644
--- a/cache/js/src/main/scala/coursier/Platform.scala
+++ b/cache/js/src/main/scala/coursier/Platform.scala
@@ -4,7 +4,6 @@ import coursier.util.EitherT
 import org.scalajs.dom.raw.{Event, XMLHttpRequest}
 
 import scala.concurrent.{ExecutionContext, Future, Promise}
-import scala.language.implicitConversions
 import scala.scalajs.js
 import js.Dynamic.{global => g}
 import scala.scalajs.js.timers._
diff --git a/cache/jvm/src/main/scala/coursier/util/Schedulable.scala b/cache/jvm/src/main/scala/coursier/util/Schedulable.scala
index 16cb94735..488156057 100644
--- a/cache/jvm/src/main/scala/coursier/util/Schedulable.scala
+++ b/cache/jvm/src/main/scala/coursier/util/Schedulable.scala
@@ -2,8 +2,6 @@ package coursier.util
 
 import java.util.concurrent.{ExecutorService, Executors, ThreadFactory}
 
-import scala.language.higherKinds
-
 trait Schedulable[F[_]] extends Gather[F] {
   def schedule[A](pool: ExecutorService)(f: => A): F[A]
 }
diff --git a/cli/src/main/scala-2.12/coursier/cli/Fetch.scala b/cli/src/main/scala-2.12/coursier/cli/Fetch.scala
index 01fdf912b..caa1114c0 100644
--- a/cli/src/main/scala-2.12/coursier/cli/Fetch.scala
+++ b/cli/src/main/scala-2.12/coursier/cli/Fetch.scala
@@ -6,8 +6,6 @@ import java.io.File
 import caseapp._
 import coursier.cli.options.FetchOptions
 
-import scala.language.reflectiveCalls
-
 final class Fetch(options: FetchOptions, args: RemainingArgs) {
 
   val helper = new Helper(options.common, args.all, ignoreErrors = options.artifactOptions.force)
diff --git a/cli/src/main/scala-2.12/coursier/cli/scaladex/Scaladex.scala b/cli/src/main/scala-2.12/coursier/cli/scaladex/Scaladex.scala
index 31c1fea40..93b13d4b2 100644
--- a/cli/src/main/scala-2.12/coursier/cli/scaladex/Scaladex.scala
+++ b/cli/src/main/scala-2.12/coursier/cli/scaladex/Scaladex.scala
@@ -11,8 +11,6 @@ import coursier.util.{EitherT, Gather}
 import coursier.{Fetch, Module}
 import scalaz.concurrent.Task
 
-import scala.language.higherKinds
-
 object Scaladex {
 
   case class SearchResult(
diff --git a/core/shared/src/main/scala/coursier/Fetch.scala b/core/shared/src/main/scala/coursier/Fetch.scala
index 866e9b9a3..0ac1a81e0 100644
--- a/core/shared/src/main/scala/coursier/Fetch.scala
+++ b/core/shared/src/main/scala/coursier/Fetch.scala
@@ -2,8 +2,6 @@ package coursier
 
 import coursier.util.{EitherT, Gather, Monad}
 
-import scala.language.higherKinds
-
 object Fetch {
 
   type Content[F[_]] = Artifact => EitherT[F, String, String]
diff --git a/core/shared/src/main/scala/coursier/core/Repository.scala b/core/shared/src/main/scala/coursier/core/Repository.scala
index cdd9d5c69..955b35f7d 100644
--- a/core/shared/src/main/scala/coursier/core/Repository.scala
+++ b/core/shared/src/main/scala/coursier/core/Repository.scala
@@ -2,7 +2,6 @@ package coursier.core
 
 import coursier.Fetch
 
-import scala.language.higherKinds
 import coursier.core.compatibility.encodeURIComponent
 import coursier.util.{EitherT, Monad}
 
diff --git a/core/shared/src/main/scala/coursier/core/ResolutionProcess.scala b/core/shared/src/main/scala/coursier/core/ResolutionProcess.scala
index 827d78a41..274ffa100 100644
--- a/core/shared/src/main/scala/coursier/core/ResolutionProcess.scala
+++ b/core/shared/src/main/scala/coursier/core/ResolutionProcess.scala
@@ -4,7 +4,6 @@ package core
 import coursier.util.Monad
 
 import scala.annotation.tailrec
-import scala.language.higherKinds
 
 
 sealed abstract class ResolutionProcess {
diff --git a/core/shared/src/main/scala/coursier/ivy/IvyRepository.scala b/core/shared/src/main/scala/coursier/ivy/IvyRepository.scala
index f86336c96..05192d1b5 100644
--- a/core/shared/src/main/scala/coursier/ivy/IvyRepository.scala
+++ b/core/shared/src/main/scala/coursier/ivy/IvyRepository.scala
@@ -4,8 +4,6 @@ import coursier.Fetch
 import coursier.core._
 import coursier.util.{EitherT, Monad, WebPage}
 
-import scala.language.higherKinds
-
 final case class IvyRepository(
   pattern: Pattern,
   metadataPatternOpt: Option[Pattern],
diff --git a/core/shared/src/main/scala/coursier/ivy/Pattern.scala b/core/shared/src/main/scala/coursier/ivy/Pattern.scala
index d2eadc8b2..11a4a7bfe 100644
--- a/core/shared/src/main/scala/coursier/ivy/Pattern.scala
+++ b/core/shared/src/main/scala/coursier/ivy/Pattern.scala
@@ -4,8 +4,6 @@ import coursier.util.Traverse.TraverseOps
 import coursier.util.ValidationNel
 import fastparse.all._
 
-import scala.language.implicitConversions
-
 final case class PropertiesPattern(chunks: Seq[PropertiesPattern.ChunkOrProperty]) {
 
   def string: String = chunks.map(_.string).mkString
diff --git a/core/shared/src/main/scala/coursier/maven/MavenRepository.scala b/core/shared/src/main/scala/coursier/maven/MavenRepository.scala
index 3f3333165..4268e61fb 100644
--- a/core/shared/src/main/scala/coursier/maven/MavenRepository.scala
+++ b/core/shared/src/main/scala/coursier/maven/MavenRepository.scala
@@ -5,8 +5,6 @@ import coursier.core._
 import coursier.core.compatibility.encodeURIComponent
 import coursier.util.{EitherT, Monad, WebPage}
 
-import scala.language.higherKinds
-
 object MavenRepository {
   val SnapshotTimestamp = "(.*-)?[0-9]{8}\\.[0-9]{6}-[0-9]+".r
 
diff --git a/core/shared/src/main/scala/coursier/util/EitherT.scala b/core/shared/src/main/scala/coursier/util/EitherT.scala
index 9b72594f8..35e8ee7a4 100644
--- a/core/shared/src/main/scala/coursier/util/EitherT.scala
+++ b/core/shared/src/main/scala/coursier/util/EitherT.scala
@@ -1,7 +1,5 @@
 package coursier.util
 
-import scala.language.higherKinds
-
 final case class EitherT[F[_], L, R](run: F[Either[L, R]]) {
 
   def map[S](f: R => S)(implicit M: Monad[F]): EitherT[F, L, S] =
diff --git a/core/shared/src/main/scala/coursier/util/Gather.scala b/core/shared/src/main/scala/coursier/util/Gather.scala
index e23826847..d119a468f 100644
--- a/core/shared/src/main/scala/coursier/util/Gather.scala
+++ b/core/shared/src/main/scala/coursier/util/Gather.scala
@@ -1,7 +1,5 @@
 package coursier.util
 
-import scala.language.higherKinds
-
 trait Gather[F[_]] extends Monad[F] {
   def gather[A](elems: Seq[F[A]]): F[Seq[A]]
 }
diff --git a/core/shared/src/main/scala/coursier/util/Monad.scala b/core/shared/src/main/scala/coursier/util/Monad.scala
index 2e96f7e23..94f5d0f72 100644
--- a/core/shared/src/main/scala/coursier/util/Monad.scala
+++ b/core/shared/src/main/scala/coursier/util/Monad.scala
@@ -1,7 +1,5 @@
 package coursier.util
 
-import scala.language.higherKinds
-
 trait Monad[F[_]] {
   def point[A](a: A): F[A]
   def bind[A, B](elem: F[A])(f: A => F[B]): F[B]
diff --git a/extra/src/main/scala/coursier/FallbackDependenciesRepository.scala b/extra/src/main/scala/coursier/FallbackDependenciesRepository.scala
index 50ea1b297..405ad28a8 100644
--- a/extra/src/main/scala/coursier/FallbackDependenciesRepository.scala
+++ b/extra/src/main/scala/coursier/FallbackDependenciesRepository.scala
@@ -5,8 +5,6 @@ import java.net.{HttpURLConnection, URL, URLConnection}
 
 import coursier.util.{EitherT, Monad}
 
-import scala.language.higherKinds
-
 object FallbackDependenciesRepository {
 
   def exists(url: URL): Boolean = {
diff --git a/project/Settings.scala b/project/Settings.scala
index 5960d4fe3..27baf753d 100644
--- a/project/Settings.scala
+++ b/project/Settings.scala
@@ -39,7 +39,12 @@ object Settings {
           Seq()
       }
   
-      targetJvm ++ Seq("-feature", "-deprecation")
+      targetJvm ++ Seq(
+        "-feature",
+        "-deprecation",
+        "-language:higherKinds",
+        "-language:implicitConversions"
+      )
     },
     javacOptions ++= {
       scalaBinaryVersion.value match {
diff --git a/sbt-coursier/src/main/scala/coursier/InterProjectRepository.scala b/sbt-coursier/src/main/scala/coursier/InterProjectRepository.scala
index 23087d480..8a6baae31 100644
--- a/sbt-coursier/src/main/scala/coursier/InterProjectRepository.scala
+++ b/sbt-coursier/src/main/scala/coursier/InterProjectRepository.scala
@@ -2,8 +2,6 @@ package coursier
 
 import coursier.util.{EitherT, Monad}
 
-import scala.language.higherKinds
-
 final case class InterProjectRepository(projects: Seq[Project]) extends Repository {
 
   private val map = projects
diff --git a/sbt-coursier/src/main/scala/coursier/Structure.scala b/sbt-coursier/src/main/scala/coursier/Structure.scala
index 5128e554f..e8b09bd83 100644
--- a/sbt-coursier/src/main/scala/coursier/Structure.scala
+++ b/sbt-coursier/src/main/scala/coursier/Structure.scala
@@ -2,8 +2,6 @@ package coursier
 
 import sbt._
 
-import scala.language.implicitConversions
-
 // things from sbt-structure
 object Structure {
 
diff --git a/scalaz/shared/src/main/scala/coursier/interop/scalaz.scala b/scalaz/shared/src/main/scala/coursier/interop/scalaz.scala
index 40d4d039c..8dffb3206 100644
--- a/scalaz/shared/src/main/scala/coursier/interop/scalaz.scala
+++ b/scalaz/shared/src/main/scala/coursier/interop/scalaz.scala
@@ -2,8 +2,6 @@ package coursier.interop
 
 import coursier.util.{Gather, Monad}
 
-import scala.language.higherKinds
-
 object scalaz extends LowPriorityScalazImplicits {
 
   implicit def coursierMonadFromScalaz[F[_]](implicit M: _root_.scalaz.Monad[F]): Monad[F] =
diff --git a/tests/jvm/src/test/scala/coursier/Platform.scala b/tests/jvm/src/test/scala/coursier/Platform.scala
index 8e65c7298..dcfd3219a 100644
--- a/tests/jvm/src/test/scala/coursier/Platform.scala
+++ b/tests/jvm/src/test/scala/coursier/Platform.scala
@@ -6,7 +6,6 @@ import java.nio.charset.Charset
 import coursier.interop.scalaz._
 import coursier.util.EitherT
 
-import scala.language.implicitConversions
 import scala.util.{Failure, Success, Try}
 import scalaz.concurrent.Task
 
diff --git a/tests/shared/src/test/scala/coursier/test/TestRepository.scala b/tests/shared/src/test/scala/coursier/test/TestRepository.scala
index a0c016447..47284cee3 100644
--- a/tests/shared/src/test/scala/coursier/test/TestRepository.scala
+++ b/tests/shared/src/test/scala/coursier/test/TestRepository.scala
@@ -4,8 +4,6 @@ package test
 import coursier.core._
 import coursier.util.{EitherT, Monad}
 
-import scala.language.higherKinds
-
 final case class TestRepository(projects: Map[(Module, String), Project]) extends Repository {
   val source = new core.Artifact.Source {
     def artifacts(