Move FromSbt / ToSbt helpers to separate module

appveyor.yml

@@ -18,8 +18,8 @@ build_script:
   - sbt ++2.11.11 clean compile coreJVM/publishLocal cli/publishLocal
   - sbt ++2.12.4 http-server/publishLocal
   - sbt ++2.10.6 clean compile
-  - sbt ++2.12.4 coreJVM/publishLocal cache/publishLocal extra/publishLocal # to make the scripted sbt 1.0 tests happy
+  - sbt ++2.12.4 coreJVM/publishLocal cache/publishLocal extra/publishLocal sbt-shared/publishLocal # to make the scripted sbt 1.0 tests happy
-  - sbt ++2.10.6 coreJVM/publishLocal cache/publishLocal extra/publishLocal # to make the scripted sbt 0.13 tests happy
+  - sbt ++2.10.6 coreJVM/publishLocal cache/publishLocal extra/publishLocal sbt-shared/publishLocal # to make the scripted sbt 0.13 tests happy
 test_script:
   - ps: Start-Job -filepath .\scripts\start-it-auth-server.ps1 -ArgumentList $pwd
   - ps: Start-Sleep -s 15 # wait for the first server to have downloaded its dependencies

build.sbt

@@ -217,8 +217,15 @@ lazy val doc = project
     tutTargetDirectory := baseDirectory.in(LocalRootProject).value
   )
 
+lazy val `sbt-shared` = project
+  .dependsOn(coreJvm, cache)
+  .settings(
+    plugin,
+    utest
+  )
+
 lazy val `sbt-coursier` = project
-  .dependsOn(coreJvm, cache, extra)
+  .dependsOn(coreJvm, cache, extra, `sbt-shared`)
   .settings(
     plugin,
     utest
@@ -307,6 +314,7 @@ lazy val jvm = project
     bootstrap,
     extra,
     cli,
+    `sbt-shared`,
     `sbt-coursier`,
     `sbt-pgp-coursier`,
     `sbt-shading`,
@@ -343,6 +351,7 @@ lazy val `sbt-plugins` = project
     coreJvm,
     cache,
     extra,
+    `sbt-shared`,
     `sbt-coursier`,
     `sbt-pgp-coursier`,
     `sbt-shading`
@@ -366,6 +375,7 @@ lazy val coursier = project
     bootstrap,
     extra,
     cli,
+    `sbt-shared`,
     `sbt-coursier`,
     `sbt-pgp-coursier`,
     `sbt-shading`,

project/Settings.scala

@@ -185,6 +185,9 @@ object Settings {
     )
   }
 
+  val sbt013Version = "0.13.8"
+  val sbt10Version = "1.0.2"
+
   lazy val plugin =
     javaScalaPluginShared ++
     divertThingsPlugin ++
@@ -205,8 +208,8 @@ object Settings {
       scalaVersion := appConfiguration.value.provider.scalaProvider.version, // required with sbt 0.13.16-M1, to avoid cyclic references
       sbtVersion := {
         scalaBinaryVersion.value match {
-          case "2.10" => "0.13.8"
+          case "2.10" => sbt013Version
-          case "2.12" => "1.0.2"
+          case "2.12" => sbt10Version
           case _ => sbtVersion.value
         }
       },

scripts/travis.sh

@@ -80,7 +80,7 @@ runSbtCoursierTests() {
 }
 
 runSbtShadingTests() {
-  sbt ++$SCALA_VERSION coreJVM/publishLocal cache/publishLocal extra/publishLocal sbt-coursier/publishLocal "sbt-shading/scripted sbt-shading/*"
+  sbt ++$SCALA_VERSION coreJVM/publishLocal cache/publishLocal extra/publishLocal sbt-shared/publishLocal sbt-coursier/publishLocal "sbt-shading/scripted sbt-shading/*"
   if [ "$SCALA_VERSION" = "2.10" ]; then
     sbt ++$SCALA_VERSION "sbt-shading/scripted sbt-shading-0.13/*"
   fi