Merge pull request #36 from codacy/crosscompile-scala2.13

bump: Crosscompile to Scala 2.13

Author: lolgab

.circleci/config.yml

@@ -33,8 +33,8 @@ references:
   restore_build: &restore_build
     restore_cache:
       keys:
-        - sbt-build-1.0.0-{{ .Branch }}-{{ .Revision }}
-        - sbt-build-1.0.0
+        - sbt-build-1.0.1-{{ .Branch }}-{{ .Revision }}
+        - sbt-build-1.0.1
 
   setup_dependencies_key: &setup_dependencies_key
     run:
@@ -69,6 +69,7 @@ jobs:
           paths:
             - ~/.ivy2
             - ~/.sbt
+            - ~/.coursier/cache/v1
           key: sbt-ivy2-dependencies-1.0.0-{{ checksum "/tmp/dependencies.cache.tmp" }}
 
   compile:
@@ -102,15 +103,15 @@ jobs:
           working_directory: ~/
           command: |
             mkdir -p ~/coverage-reports/scoverage
-            cp -f ~/workdir/target/scala-2.11/coverage-report/cobertura.xml ~/coverage-reports/scoverage/results.xml
+            cp -f ~/workdir/target/scala-2.12/coverage-report/cobertura.xml ~/coverage-reports/scoverage/results.xml
       - store_test_results:
           path: ~/coverage-reports
       - store_artifacts:
-          path: ~/workdir/target/scala-2.11/coverage-report
+          path: ~/workdir/target/scala-2.12/coverage-report
       - store_artifacts:
-          path: ~/workdir/target/scala-2.11/scoverage-report
+          path: ~/workdir/target/scala-2.12/scoverage-report
       - store_artifacts:
-          path: ~/workdir/target/scala-2.11/scoverage-data
+          path: ~/workdir/target/scala-2.12/scoverage-data
 
   publish:
     <<: *default_java_job

.gitignore

@@ -1,9 +1,9 @@
 /RUNNING_PID
 /logs/
 /project/*-shim.sbt
-/project/project/
-/project/target/
-/target/
-/.idea/
+target
+.idea
+.metals
+.bloop
 /libexec/
 /bin/

.scalafmt.conf

@@ -1,3 +1,4 @@
+version = "2.0.1"
 style=IntelliJ
 project.excludeFilters = [".*\\.scala.html$", "components/pluginsEngineComponent/src/test/resources/.*", "target/.*"]
 maxColumn=120

build.sbt

@@ -1,11 +1,24 @@
+val scala211 = "2.11.12"
+val scala212 = "2.12.8"
+val scala213 = "2.13.0"
+
 name := "codacy-plugins-api"
-version := "1.0.0-SNAPSHOT"
 organization := "com.codacy"
 
-scalaVersion := "2.11.12"
-crossScalaVersions := Seq("2.10.6", scalaVersion.value, "2.12.4")
+scalaVersion := scala212
+crossScalaVersions := Seq(scala211, scala212, scala213)
+
+libraryDependencies ++= Seq(
+  "org.specs2" %% "specs2-core" % "4.6.0" % Test
+)
 
-libraryDependencies ++= Seq("org.specs2" %% "specs2-core" % "3.10.0" % Test)
+unmanagedSourceDirectories in Compile += {
+  val sourceDir = (sourceDirectory in Compile).value
+  CrossVersion.partialVersion(scalaVersion.value) match {
+    case Some((2, n)) if n >= 13 => sourceDir / "scala-2.13+"
+    case _                       => sourceDir / "scala-2.13-"
+  }
+}
 
 // Sonatype repository settings
 ThisBuild / credentials += Credentials(

project/build.properties

@@ -1 +1 @@
-sbt.version=1.2.3
+sbt.version=1.3.0

project/plugins.sbt

@@ -1,5 +1,3 @@
-import sbt._
-
 // Sonatype publishing
 addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.3")
 addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2-1")
@@ -8,5 +6,5 @@ addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2-1")
 addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.3.4")
 
 // Coverage
-addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.1")
+addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.0")
 addSbtPlugin("com.codacy" % "sbt-codacy-coverage" % "1.3.15")

scripts/compile.sh

@@ -2,5 +2,5 @@
 
 set -e
 
-sbt compile
-sbt test:compile
+sbt +compile
+sbt +test:compile

scripts/publish.sh

@@ -16,9 +16,7 @@ fi
 
 echo "Publishing version ${VERSION}"
 if [[ -n "$CI" ]] && [[ "$CURRENT_BRANCH" == "$PUBLISH_BRANCH" || "$CIRCLE_BRANCH" == "$PUBLISH_BRANCH" ]]; then
-  sbt ++2.10.6 'set version := "'"${VERSION}"'"' 'set pgpPassphrase := Some("'"$SONATYPE_GPG_PASSPHRASE"'".toCharArray)' publishSigned sonatypeRelease
-  sbt ++2.11.12 'set version := "'"${VERSION}"'"' 'set pgpPassphrase := Some("'"$SONATYPE_GPG_PASSPHRASE"'".toCharArray)' publishSigned sonatypeRelease
-  sbt ++2.12.4 'set version := "'"${VERSION}"'"' 'set pgpPassphrase := Some("'"$SONATYPE_GPG_PASSPHRASE"'".toCharArray)' publishSigned sonatypeRelease
+  sbt 'set version := "'"${VERSION}"'"' 'set pgpPassphrase := Some("'"$SONATYPE_GPG_PASSPHRASE"'".toCharArray)' +publishSigned sonatypeRelease
 else
   sbt 'set version := "'"${VERSION}"'"' +publishLocal
 fi

scripts/test.sh

@@ -6,7 +6,7 @@ if [ -n "$1" ]; then
     export CODACY_PROJECT_TOKEN="$1"
 fi
 
-sbt coverage test
+sbt coverage +test
 sbt coverageReport
 sbt coverageAggregate
 

src/main/scala-2.13+/com/codacy/plugins/api/languages/LanguageImpl.scala

@@ -0,0 +1,51 @@
+package com.codacy.plugins.api.languages
+
+import Languages._
+
+private[languages] object LanguagesImpl {
+  def extensionsByLanguageImpl: Map[Language, Set[String]] =
+    all.view.map { lang =>
+      (lang, lang.extensions)
+    }.to(Map)
+
+  def filenamesByLanguageImpl: Map[Language, Set[String]] =
+    all.view.map { lang =>
+      (lang, lang.files)
+    }.to(Map)
+
+  def languageByExtensionImpl: Map[String, Language] =
+    all.view.flatMap { lang =>
+      lang.extensions.map(extension => (extension.toLowerCase(), lang))
+    }.to(Map)
+
+  def languageByFilenameImpl: Map[String, Language] =
+    all.view.flatMap { lang =>
+      lang.files.map(file => (file.toLowerCase(), lang))
+    }.to(Map)
+
+  def forPathImpl(
+    filePath: String,
+    customExtensions: List[(Language, Seq[String])] = List.empty[(Language, Seq[String])]): Option[Language] = {
+    lazy val languageByCustomExtension: List[(String, Language)] = {
+      val customExtensionsMap: Map[Language, Set[String]] = customExtensions.view.map {
+        case (lang, exts) =>
+          (lang, exts.view.to(Set) ++ extensionsByLanguage.getOrElse(lang, Set.empty))
+      }.to(Map)
+
+      customExtensionsMap.view.flatMap {
+        case (lang, extensions) => extensions.map(extension => (extension.toLowerCase, lang))
+      }.to(List).sortBy {
+        case (ext, lang) => (lang.toString, ext)
+      }
+    }
+
+    filePath.split('/').lastOption.flatMap { filename =>
+      languageByCustomExtension.collectFirst { case (ext, lang) if filename.endsWith(ext) => lang }.orElse {
+        (for {
+          extension <- filename.split('.').lastOption
+          dottedExtension = s".$extension"
+        } yield languageByExtension.get(dottedExtension.toLowerCase)).flatten
+      }.orElse(languageByFilename.get(filename.toLowerCase))
+    }
+  }
+}