Idea: Fix dependency resolution of platform dependencies

JavaScript and native dependencies were ignored because the two parameters `platformVersion` and `compilerVersion` had been mixed up. Add a `require()` to `resolveSubset()` in order to enforce that a valid set of dependencies is passed.
tindzk · Jan 27, 2019 · bbf0d70 · bbf0d70
1 parent 8e7acfc
commit bbf0d70
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 16 deletions.
diff --git a/src/main/scala/seed/artefact/Coursier.scala b/src/main/scala/seed/artefact/Coursier.scala
@@ -126,14 +126,22 @@ object Coursier {
 
   def resolveSubset(resolution: Resolution,
                     deps: Set[Dep],
-                    optionalArtefacts: Boolean): List[(Classifier, Artefact)] =
-    resolution.subset(coursierDependencies(deps))
-      .dependencyArtifacts(
-        Some(
-          overrideClassifiers(
-            sources = optionalArtefacts,
-            javaDoc = optionalArtefacts))
-      ).map(a => (a._2.classifier, a._3)).toList
+                    optionalArtefacts: Boolean): List[(Classifier, Artefact)] = {
+    val result =
+      resolution
+        .subset(coursierDependencies(deps))
+        .dependencyArtifacts(
+          Some(
+            overrideClassifiers(
+              sources = optionalArtefacts,
+              javaDoc = optionalArtefacts)))
+
+    require(deps.forall(d => result.map(_._1.module).exists(m =>
+      m.organization.value == d.organisation &&
+      m.name.value == d.artefact)), "Missing dependencies in artefact resolution")
+
+    result.map(a => (a._2.classifier, a._3)).toList
+  }
 
   def overrideClassifiers(sources: Boolean, javaDoc: Boolean): Seq[Classifier] =
     Seq(Classifier.empty) ++

diff --git a/src/main/scala/seed/generation/Idea.scala b/src/main/scala/seed/generation/Idea.scala
@@ -153,17 +153,17 @@ object Idea {
               collectJsDeps(build, module).map(dep =>
                 ArtefactResolution.dependencyFromDep(
                   dep, JavaScript,
-                  build.project.scalaVersion,
-                  build.project.scalaJsVersion.get)
+                  build.project.scalaJsVersion.get,
+                  build.project.scalaVersion)
               ).toSet,
               optionalArtefacts = true),
             resolvedTestDeps = module.test.toList.flatMap(test =>
               Coursier.localArtefacts(resolution,
                 collectJsDeps(build, test).map(dep =>
                   ArtefactResolution.dependencyFromDep(
                     dep, JavaScript,
-                    build.project.scalaVersion,
-                    build.project.scalaJsVersion.get)
+                    build.project.scalaJsVersion.get,
+                    build.project.scalaVersion)
                 ).toSet,
                 optionalArtefacts = true)),
             moduleDeps =
@@ -257,17 +257,17 @@ object Idea {
               collectNativeDeps(build, module).map(dep =>
                 ArtefactResolution.dependencyFromDep(
                   dep, Native,
-                  build.project.scalaVersion,
-                  build.project.scalaNativeVersion.get)
+                  build.project.scalaNativeVersion.get,
+                  build.project.scalaVersion)
               ).toSet,
               optionalArtefacts = true),
             resolvedTestDeps = module.test.toList.flatMap(test =>
               Coursier.localArtefacts(resolution,
                 collectNativeDeps(build, test).map(dep =>
                   ArtefactResolution.dependencyFromDep(
                     dep, Native,
-                    build.project.scalaVersion,
-                    build.project.scalaNativeVersion.get)
+                    build.project.scalaNativeVersion.get,
+                    build.project.scalaVersion)
                 ).toSet,
                 optionalArtefacts = true)),
             moduleDeps =

diff --git a/src/test/scala/seed/artefact/ArtefactResolutionSpec.scala b/src/test/scala/seed/artefact/ArtefactResolutionSpec.scala
@@ -0,0 +1,15 @@
+package seed.artefact
+
+import minitest.SimpleTestSuite
+import seed.model.Build.Dep
+import seed.model.Platform.JavaScript
+
+object ArtefactResolutionSpec extends SimpleTestSuite {
+  test("dependencyFromDep()") {
+    val scalaDep = Dep("org.scala-js", "scalajs-dom", "0.9.6")
+    val javaDep = ArtefactResolution.dependencyFromDep(
+      scalaDep, JavaScript, "0.6", "2.12")
+    assertEquals(javaDep,
+      Dep("org.scala-js", "scalajs-dom_sjs0.6_2.12", "0.9.6"))
+  }
+}
diff --git a/src/test/scala/seed/artefact/CoursierSpec.scala b/src/test/scala/seed/artefact/CoursierSpec.scala
@@ -0,0 +1,20 @@
+package seed.artefact
+
+import minitest.SimpleTestSuite
+import seed.model.Build
+import seed.model.Build.Dep
+
+object CoursierSpec extends SimpleTestSuite {
+  test("Resolve dependency") {
+    val dep = Dep("org.scala-js", "scalajs-dom_sjs0.6_2.12", "0.9.6")
+    val resolution = Coursier.resolveAndDownload(Set(dep),
+      Build.Resolvers(), Coursier.DefaultIvyPath,
+      Coursier.DefaultCachePath, optionalArtefacts = true)
+
+    val result =
+      Coursier.localArtefacts(resolution, Set(dep), optionalArtefacts = true)
+    assert(
+      result.exists(_.javaDocJar.nonEmpty) &&
+      result.exists(_.sourcesJar.nonEmpty))
+  }
+}