From cffbe747ed380ba43b51f79da63e223e8e8bdcaf Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Fri, 1 Apr 2016 01:50:56 +0200 Subject: [PATCH] Minor refactoring --- .../main/scala/coursier/maven/MavenSource.scala | 17 ++++++++++++----- .../test/scala/coursier/test/CentralTests.scala | 4 ++-- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/core/shared/src/main/scala/coursier/maven/MavenSource.scala b/core/shared/src/main/scala/coursier/maven/MavenSource.scala index 0d47c9839..b5997ae42 100644 --- a/core/shared/src/main/scala/coursier/maven/MavenSource.scala +++ b/core/shared/src/main/scala/coursier/maven/MavenSource.scala @@ -149,12 +149,19 @@ case class MavenSource( } object MavenSource { + + val typeExtensions: Map[String, String] = Map( + "eclipse-plugin" -> "jar", + "hk2-jar" -> "jar", + "orbit" -> "jar", + "scala-jar" -> "jar", + "jar" -> "jar", + "bundle" -> "jar", + "doc" -> "jar", + "src" -> "jar" + ) def typeExtension(`type`: String): String = - `type` match { - // see similar things in sbt-maven-resolver/src/main/scala/sbt/mavenint/MavenRepositoryResolver.scala in SBT 0.13.8 - case "eclipse-plugin" | "hk2-jar" | "orbit" | "scala-jar" | "jar" | "bundle" | "doc" | "src" => "jar" - case other => other - } + typeExtensions.getOrElse(`type`, `type`) } \ No newline at end of file diff --git a/tests/shared/src/test/scala/coursier/test/CentralTests.scala b/tests/shared/src/test/scala/coursier/test/CentralTests.scala index 05f834f29..ec554a445 100644 --- a/tests/shared/src/test/scala/coursier/test/CentralTests.scala +++ b/tests/shared/src/test/scala/coursier/test/CentralTests.scala @@ -230,7 +230,7 @@ object CentralTests extends TestSuite { } 'packaging - { - * - { + 'aar - { // random aar-based module found on Central ensureArtifactHasExtension( Module("com.yandex.android", "speechkit"), @@ -239,7 +239,7 @@ object CentralTests extends TestSuite { ) } - * - { + 'bundle - { // has packaging bundle - ensuring coursier gives its artifact the .jar extension ensureArtifactHasExtension( Module("com.google.guava", "guava"),