From 3656389fffdcc697034924aa33da27604e86640e Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Mon, 15 May 2017 15:32:51 +0200 Subject: [PATCH] Only compile sbt-launcher module in 2.11 So that we don't have to wait on its dependencies to add preliminary support for scala 2.13 --- build.sbt | 16 +++++++++++----- .../coursier/sbtlauncher/AppConfiguration.scala | 0 .../coursier/sbtlauncher/AppProvider.scala | 0 .../coursier/sbtlauncher/ApplicationID.scala | 0 .../coursier/sbtlauncher/ComponentProvider.scala | 0 .../coursier/sbtlauncher/DummyGlobalLock.scala | 0 .../coursier/sbtlauncher/Launcher.scala | 0 .../coursier/sbtlauncher/MainApp.scala | 0 .../coursier/sbtlauncher/Repository.scala | 0 .../coursier/sbtlauncher/SbtConfig.scala | 0 .../coursier/sbtlauncher/ScalaProvider.scala | 0 11 files changed, 11 insertions(+), 5 deletions(-) rename sbt-launcher/src/main/{scala => scala-2.11}/coursier/sbtlauncher/AppConfiguration.scala (100%) rename sbt-launcher/src/main/{scala => scala-2.11}/coursier/sbtlauncher/AppProvider.scala (100%) rename sbt-launcher/src/main/{scala => scala-2.11}/coursier/sbtlauncher/ApplicationID.scala (100%) rename sbt-launcher/src/main/{scala => scala-2.11}/coursier/sbtlauncher/ComponentProvider.scala (100%) rename sbt-launcher/src/main/{scala => scala-2.11}/coursier/sbtlauncher/DummyGlobalLock.scala (100%) rename sbt-launcher/src/main/{scala => scala-2.11}/coursier/sbtlauncher/Launcher.scala (100%) rename sbt-launcher/src/main/{scala => scala-2.11}/coursier/sbtlauncher/MainApp.scala (100%) rename sbt-launcher/src/main/{scala => scala-2.11}/coursier/sbtlauncher/Repository.scala (100%) rename sbt-launcher/src/main/{scala => scala-2.11}/coursier/sbtlauncher/SbtConfig.scala (100%) rename sbt-launcher/src/main/{scala => scala-2.11}/coursier/sbtlauncher/ScalaProvider.scala (100%) diff --git a/build.sbt b/build.sbt index 313b35946..be20db5fe 100644 --- a/build.sbt +++ b/build.sbt @@ -194,11 +194,17 @@ lazy val `sbt-launcher` = project .settings( shared, generatePack, - libs ++= Seq( - Deps.caseApp, - Deps.sbtLauncherInterface, - Deps.typesafeConfig - ) + dontPublishIn("2.10", "2.12"), + libs ++= { + if (scalaBinaryVersion.value == "2.11") + Seq( + Deps.caseApp, + Deps.sbtLauncherInterface, + Deps.typesafeConfig + ) + else + Nil + } ) lazy val `http-server` = project diff --git a/sbt-launcher/src/main/scala/coursier/sbtlauncher/AppConfiguration.scala b/sbt-launcher/src/main/scala-2.11/coursier/sbtlauncher/AppConfiguration.scala similarity index 100% rename from sbt-launcher/src/main/scala/coursier/sbtlauncher/AppConfiguration.scala rename to sbt-launcher/src/main/scala-2.11/coursier/sbtlauncher/AppConfiguration.scala diff --git a/sbt-launcher/src/main/scala/coursier/sbtlauncher/AppProvider.scala b/sbt-launcher/src/main/scala-2.11/coursier/sbtlauncher/AppProvider.scala similarity index 100% rename from sbt-launcher/src/main/scala/coursier/sbtlauncher/AppProvider.scala rename to sbt-launcher/src/main/scala-2.11/coursier/sbtlauncher/AppProvider.scala diff --git a/sbt-launcher/src/main/scala/coursier/sbtlauncher/ApplicationID.scala b/sbt-launcher/src/main/scala-2.11/coursier/sbtlauncher/ApplicationID.scala similarity index 100% rename from sbt-launcher/src/main/scala/coursier/sbtlauncher/ApplicationID.scala rename to sbt-launcher/src/main/scala-2.11/coursier/sbtlauncher/ApplicationID.scala diff --git a/sbt-launcher/src/main/scala/coursier/sbtlauncher/ComponentProvider.scala b/sbt-launcher/src/main/scala-2.11/coursier/sbtlauncher/ComponentProvider.scala similarity index 100% rename from sbt-launcher/src/main/scala/coursier/sbtlauncher/ComponentProvider.scala rename to sbt-launcher/src/main/scala-2.11/coursier/sbtlauncher/ComponentProvider.scala diff --git a/sbt-launcher/src/main/scala/coursier/sbtlauncher/DummyGlobalLock.scala b/sbt-launcher/src/main/scala-2.11/coursier/sbtlauncher/DummyGlobalLock.scala similarity index 100% rename from sbt-launcher/src/main/scala/coursier/sbtlauncher/DummyGlobalLock.scala rename to sbt-launcher/src/main/scala-2.11/coursier/sbtlauncher/DummyGlobalLock.scala diff --git a/sbt-launcher/src/main/scala/coursier/sbtlauncher/Launcher.scala b/sbt-launcher/src/main/scala-2.11/coursier/sbtlauncher/Launcher.scala similarity index 100% rename from sbt-launcher/src/main/scala/coursier/sbtlauncher/Launcher.scala rename to sbt-launcher/src/main/scala-2.11/coursier/sbtlauncher/Launcher.scala diff --git a/sbt-launcher/src/main/scala/coursier/sbtlauncher/MainApp.scala b/sbt-launcher/src/main/scala-2.11/coursier/sbtlauncher/MainApp.scala similarity index 100% rename from sbt-launcher/src/main/scala/coursier/sbtlauncher/MainApp.scala rename to sbt-launcher/src/main/scala-2.11/coursier/sbtlauncher/MainApp.scala diff --git a/sbt-launcher/src/main/scala/coursier/sbtlauncher/Repository.scala b/sbt-launcher/src/main/scala-2.11/coursier/sbtlauncher/Repository.scala similarity index 100% rename from sbt-launcher/src/main/scala/coursier/sbtlauncher/Repository.scala rename to sbt-launcher/src/main/scala-2.11/coursier/sbtlauncher/Repository.scala diff --git a/sbt-launcher/src/main/scala/coursier/sbtlauncher/SbtConfig.scala b/sbt-launcher/src/main/scala-2.11/coursier/sbtlauncher/SbtConfig.scala similarity index 100% rename from sbt-launcher/src/main/scala/coursier/sbtlauncher/SbtConfig.scala rename to sbt-launcher/src/main/scala-2.11/coursier/sbtlauncher/SbtConfig.scala diff --git a/sbt-launcher/src/main/scala/coursier/sbtlauncher/ScalaProvider.scala b/sbt-launcher/src/main/scala-2.11/coursier/sbtlauncher/ScalaProvider.scala similarity index 100% rename from sbt-launcher/src/main/scala/coursier/sbtlauncher/ScalaProvider.scala rename to sbt-launcher/src/main/scala-2.11/coursier/sbtlauncher/ScalaProvider.scala