Merge cache and fetch-js projects

appveyor.yml

@@ -17,8 +17,8 @@ install:
 build_script:
   - sbt ++2.11.12 clean compile coreJVM/publishLocal
   - sbt ++2.10.7 clean compile
-  - sbt ++2.12.4 coreJVM/publishLocal cache/publishLocal cli/publishLocal extra/publishLocal sbt-shared/publishLocal
-  - sbt ++2.10.7 coreJVM/publishLocal cache/publishLocal extra/publishLocal sbt-shared/publishLocal
+  - sbt ++2.12.4 coreJVM/publishLocal cacheJVM/publishLocal cli/publishLocal extra/publishLocal sbt-shared/publishLocal
+  - sbt ++2.10.7 coreJVM/publishLocal cacheJVM/publishLocal extra/publishLocal sbt-shared/publishLocal
 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

@@ -38,21 +38,9 @@ lazy val core = crossProject
 lazy val coreJvm = core.jvm
 lazy val coreJs = core.js
 
-lazy val `fetch-js` = project
-  .disablePlugins(ScriptedPlugin)
-  .enablePlugins(ScalaJSPlugin)
-  .dependsOn(coreJs)
-  .settings(
-    shared,
-    dontPublish,
-    coursierPrefix
-  )
-
 lazy val tests = crossProject
   .disablePlugins(ScriptedPlugin)
-  .dependsOn(core)
-  .jvmConfigure(_.dependsOn(cache % "test"))
-  .jsConfigure(_.dependsOn(`fetch-js` % "test"))
+  .dependsOn(core, cache % "test")
   .jsSettings(
     scalaJSStage.in(Global) := FastOptStage
   )
@@ -92,18 +80,26 @@ lazy val paths = project
     addDirectoriesSources
   )
 
-lazy val cache = project
+lazy val cache = crossProject
   .disablePlugins(ScriptedPlugin)
-  .dependsOn(coreJvm)
+  .dependsOn(core)
+  .jvmSettings(
+    addPathsSources
+  )
+  .jsSettings(
+    name := "fetch-js"
+  )
   .settings(
     shared,
     Mima.previousArtifacts,
     coursierPrefix,
     libs += Deps.scalazConcurrent,
-    Mima.cacheFilters,
-    addPathsSources
+    Mima.cacheFilters
   )
 
+lazy val cacheJvm = cache.jvm
+lazy val cacheJs = cache.js
+
 lazy val bootstrap = project
   .disablePlugins(ScriptedPlugin)
   .settings(
@@ -118,7 +114,7 @@ lazy val bootstrap = project
 lazy val extra = project
   .disablePlugins(ScriptedPlugin)
   .enablePlugins(ShadingPlugin)
-  .dependsOn(coreJvm, cache)
+  .dependsOn(coreJvm, cacheJvm)
   .settings(
     shared,
     coursierPrefix,
@@ -150,7 +146,7 @@ lazy val extra = project
   )
 
 lazy val cli = project
-  .dependsOn(coreJvm, cache, extra)
+  .dependsOn(coreJvm, cacheJvm, extra)
   .disablePlugins(ScriptedPlugin)
   .enablePlugins(PackPlugin, SbtProguard)
   .settings(
@@ -182,7 +178,7 @@ lazy val cli = project
 lazy val web = project
   .disablePlugins(ScriptedPlugin)
   .enablePlugins(ScalaJSPlugin)
-  .dependsOn(coreJs, `fetch-js`)
+  .dependsOn(coreJs, cacheJs)
   .settings(
     shared,
     dontPublish,
@@ -227,7 +223,7 @@ lazy val web = project
 
 lazy val readme = project
   .in(file("doc/readme"))
-  .dependsOn(coreJvm, cache)
+  .dependsOn(coreJvm, cacheJvm)
   .disablePlugins(ScriptedPlugin)
   .enablePlugins(TutPlugin)
   .settings(
@@ -238,7 +234,7 @@ lazy val readme = project
   )
 
 lazy val `sbt-shared` = project
-  .dependsOn(coreJvm, cache)
+  .dependsOn(coreJvm, cacheJvm)
   .disablePlugins(ScriptedPlugin)
   .settings(
     plugin,
@@ -259,7 +255,7 @@ lazy val `sbt-shared` = project
   )
 
 lazy val `sbt-coursier` = project
-  .dependsOn(coreJvm, cache, extra, `sbt-shared`)
+  .dependsOn(coreJvm, cacheJvm, extra, `sbt-shared`)
   .disablePlugins(ScriptedPlugin)
   .settings(
     plugin,
@@ -294,7 +290,7 @@ lazy val `sbt-shading` = project
   )
 
 lazy val okhttp = project
-  .dependsOn(cache)
+  .dependsOn(cacheJvm)
   .disablePlugins(ScriptedPlugin)
   .settings(
     shared,
@@ -310,7 +306,7 @@ lazy val jvm = project
     testsJvm,
     `proxy-tests`,
     paths,
-    cache,
+    cacheJvm,
     bootstrap,
     extra,
     cli,
@@ -332,7 +328,7 @@ lazy val js = project
   .disablePlugins(ScriptedPlugin)
   .aggregate(
     coreJs,
-    `fetch-js`,
+    cacheJs,
     testsJs,
     web
   )
@@ -348,7 +344,7 @@ lazy val `sbt-plugins` = project
   .disablePlugins(ScriptedPlugin)
   .aggregate(
     coreJvm,
-    cache,
+    cacheJvm,
     extra,
     `sbt-shared`,
     `sbt-coursier`,
@@ -367,12 +363,12 @@ lazy val coursier = project
   .aggregate(
     coreJvm,
     coreJs,
-    `fetch-js`,
     testsJvm,
     testsJs,
     `proxy-tests`,
     paths,
-    cache,
+    cacheJvm,
+    cacheJs,
     bootstrap,
     extra,
     cli,

cache/BUILD

@@ -5,5 +5,5 @@ scala_library(
         "3rdparty/jvm:scalaz-concurrent",
         "paths/src/main/java:paths",
     ],
-    sources = rglobs("*.scala"),
+    sources = rglobs("jvm/*.scala", "shared/*.scala"),
 )

cli/src/main/scala-2.12/BUILD

@@ -3,7 +3,7 @@ scala_library(
     dependencies = [
         "3rdparty/jvm:argonaut-shapeless",
         "3rdparty/jvm:caseapp",
-        "cache/src/main/scala:cache",
+        "cache:cache",
         "core:core",
         "extra/src/main/scala/coursier:fallback-deps-repo",
         "extra/src/main/scala/coursier/extra:extra",
@@ -22,7 +22,7 @@ scala_library(
     name = "util",
     dependencies = [
         "3rdparty/jvm:argonaut-shapeless",
-        "cache/src/main/scala:cache",
+        "cache:cache",
         "core:core",
     ],
     sources = globs("coursier/cli/util/*.scala"),

cli/src/test/scala-2.12/coursier/cli/BUILD

@@ -11,7 +11,7 @@ junit_tests(
 scala_library(
     name='lib',
     dependencies = [
-        "cache/src/main/scala:cache"
+        "cache:cache"
     ],
     sources = ["CliTestLib.scala"],
 )

extra/src/main/scala/coursier/BUILD

@@ -2,7 +2,7 @@ scala_library(
   name = "fallback-deps-repo",
   dependencies = [
     "core:core",
-    "cache/src/main/scala:cache",
+    "cache:cache",
   ],
   sources = globs("*.scala"),
 )

scripts/travis.sh

@@ -80,14 +80,14 @@ runSbtCoursierTests() {
 }
 
 runSbtShadingTests() {
-  sbt ++$SCALA_VERSION coreJVM/publishLocal cache/publishLocal extra/publishLocal sbt-shared/publishLocal sbt-coursier/publishLocal "sbt-shading/scripted sbt-shading/*"
+  sbt ++$SCALA_VERSION coreJVM/publishLocal cacheJVM/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
 }
 
 jsCompile() {
-  sbt ++$SCALA_VERSION js/compile js/test:compile coreJS/fastOptJS fetch-js/fastOptJS testsJS/test:fastOptJS js/test:fastOptJS
+  sbt ++$SCALA_VERSION js/compile js/test:compile coreJS/fastOptJS cacheJS/fastOptJS testsJS/test:fastOptJS js/test:fastOptJS
 }
 
 jvmCompile() {
@@ -131,7 +131,7 @@ validateReadme() {
 }
 
 checkBinaryCompatibility() {
-  sbt ++${SCALA_VERSION} coreJVM/mimaReportBinaryIssues cache/mimaReportBinaryIssues
+  sbt ++${SCALA_VERSION} coreJVM/mimaReportBinaryIssues cacheJVM/mimaReportBinaryIssues
 }
 
 testSbtCoursierJava6() {