From c481217f77c8e02991b423803f6cde98478a314d Mon Sep 17 00:00:00 2001
From: Alexandre Archambault <alexandre.archambault@gmail.com>
Date: Thu, 31 Dec 2015 01:26:09 +0100
Subject: [PATCH] Have the plugin module be compiled by default too

It shouldn't be viewed as a plugin, nor should it be published, in 2.11.
---
 build.sbt                                     | 32 ++++++++++++++++---
 .../coursier/CoursierPlugin.scala             |  0
 .../coursier/FromSbt.scala                    |  0
 .../coursier/InterProjectRepository.scala     |  0
 .../{scala => scala-2.10}/coursier/Keys.scala |  0
 .../coursier/MakeIvyXml.scala                 |  0
 .../coursier/Structure.scala                  |  0
 .../coursier/Tasks.scala                      |  0
 .../coursier/ToSbt.scala                      |  0
 9 files changed, 28 insertions(+), 4 deletions(-)
 rename plugin/src/main/{scala => scala-2.10}/coursier/CoursierPlugin.scala (100%)
 rename plugin/src/main/{scala => scala-2.10}/coursier/FromSbt.scala (100%)
 rename plugin/src/main/{scala => scala-2.10}/coursier/InterProjectRepository.scala (100%)
 rename plugin/src/main/{scala => scala-2.10}/coursier/Keys.scala (100%)
 rename plugin/src/main/{scala => scala-2.10}/coursier/MakeIvyXml.scala (100%)
 rename plugin/src/main/{scala => scala-2.10}/coursier/Structure.scala (100%)
 rename plugin/src/main/{scala => scala-2.10}/coursier/Tasks.scala (100%)
 rename plugin/src/main/{scala => scala-2.10}/coursier/ToSbt.scala (100%)

diff --git a/build.sbt b/build.sbt
index 0cec10f67..a45710c00 100644
--- a/build.sbt
+++ b/build.sbt
@@ -44,6 +44,27 @@ lazy val noPublishSettings = Seq(
   publishArtifact := false
 )
 
+lazy val noPublish211Settings = Seq(
+  publish := {
+    if (scalaVersion.value startsWith "2.10.")
+      publish.value
+    else
+      ()
+  },
+  publishLocal := {
+    if (scalaVersion.value startsWith "2.10.")
+      publishLocal.value
+    else
+      ()
+  },
+  publishArtifact := {
+    if (scalaVersion.value startsWith "2.10.")
+      publishArtifact.value
+    else
+      false
+  }
+)
+
 lazy val noPublish210Settings = Seq(
   publish := {
     if (scalaVersion.value startsWith "2.10.")
@@ -77,9 +98,9 @@ lazy val baseCommonSettings = Seq(
     "-target", "1.7"
   ),
   javacOptions in Keys.doc := Seq()
-)
+) ++ releaseSettings
 
-lazy val commonSettings = baseCommonSettings ++ releaseSettings ++ Seq(
+lazy val commonSettings = baseCommonSettings ++ Seq(
   scalaVersion := "2.11.7",
   crossScalaVersions := Seq("2.11.7", "2.10.6"),
   libraryDependencies ++= {
@@ -241,13 +262,16 @@ lazy val doc = project
 lazy val plugin = project
   .dependsOn(coreJvm, cache)
   .settings(baseCommonSettings)
+  .settings(noPublish211Settings)
   .settings(
     name := "coursier-sbt-plugin",
-    sbtPlugin := true
+    sbtPlugin := {
+      scalaVersion.value.startsWith("2.10.")
+    }
   )
 
 lazy val `coursier` = project.in(file("."))
-  .aggregate(coreJvm, coreJs, `fetch-js`, testsJvm, testsJs, cache, bootstrap, cli, web, doc)
+  .aggregate(coreJvm, coreJs, `fetch-js`, testsJvm, testsJs, cache, bootstrap, cli, plugin, web, doc)
   .settings(commonSettings)
   .settings(noPublishSettings)
   .settings(releaseSettings)
diff --git a/plugin/src/main/scala/coursier/CoursierPlugin.scala b/plugin/src/main/scala-2.10/coursier/CoursierPlugin.scala
similarity index 100%
rename from plugin/src/main/scala/coursier/CoursierPlugin.scala
rename to plugin/src/main/scala-2.10/coursier/CoursierPlugin.scala
diff --git a/plugin/src/main/scala/coursier/FromSbt.scala b/plugin/src/main/scala-2.10/coursier/FromSbt.scala
similarity index 100%
rename from plugin/src/main/scala/coursier/FromSbt.scala
rename to plugin/src/main/scala-2.10/coursier/FromSbt.scala
diff --git a/plugin/src/main/scala/coursier/InterProjectRepository.scala b/plugin/src/main/scala-2.10/coursier/InterProjectRepository.scala
similarity index 100%
rename from plugin/src/main/scala/coursier/InterProjectRepository.scala
rename to plugin/src/main/scala-2.10/coursier/InterProjectRepository.scala
diff --git a/plugin/src/main/scala/coursier/Keys.scala b/plugin/src/main/scala-2.10/coursier/Keys.scala
similarity index 100%
rename from plugin/src/main/scala/coursier/Keys.scala
rename to plugin/src/main/scala-2.10/coursier/Keys.scala
diff --git a/plugin/src/main/scala/coursier/MakeIvyXml.scala b/plugin/src/main/scala-2.10/coursier/MakeIvyXml.scala
similarity index 100%
rename from plugin/src/main/scala/coursier/MakeIvyXml.scala
rename to plugin/src/main/scala-2.10/coursier/MakeIvyXml.scala
diff --git a/plugin/src/main/scala/coursier/Structure.scala b/plugin/src/main/scala-2.10/coursier/Structure.scala
similarity index 100%
rename from plugin/src/main/scala/coursier/Structure.scala
rename to plugin/src/main/scala-2.10/coursier/Structure.scala
diff --git a/plugin/src/main/scala/coursier/Tasks.scala b/plugin/src/main/scala-2.10/coursier/Tasks.scala
similarity index 100%
rename from plugin/src/main/scala/coursier/Tasks.scala
rename to plugin/src/main/scala-2.10/coursier/Tasks.scala
diff --git a/plugin/src/main/scala/coursier/ToSbt.scala b/plugin/src/main/scala-2.10/coursier/ToSbt.scala
similarity index 100%
rename from plugin/src/main/scala/coursier/ToSbt.scala
rename to plugin/src/main/scala-2.10/coursier/ToSbt.scala