bump: Crosscompile to Scala 2.13

Author: lolgab

.gitignore

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

build.sbt

@@ -1,11 +1,17 @@
+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" % "3.10.0" % Test)
+libraryDependencies ++= Seq(
+  "org.scala-lang.modules" %% "scala-collection-compat" % "2.1.2",
+  "org.specs2" %% "specs2-core" % "4.6.0" % Test
+)
 
 // Sonatype repository settings
 ThisBuild / credentials += Credentials(

project/build.properties

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

project/plugins.sbt

@@ -8,5 +8,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,12 +6,12 @@ if [ -n "$1" ]; then
     export CODACY_PROJECT_TOKEN="$1"
 fi
 
-sbt coverage test
-sbt coverageReport
-sbt coverageAggregate
+sbt +coverage +test
+sbt +coverageReport
+sbt +coverageAggregate
 
 if [ -z "$CODACY_PROJECT_TOKEN" ]; then
     echo "CODACY_PROJECT_TOKEN not found. Skipping send coverage to Codacy."
 else
-    sbt codacyCoverage
+    sbt +codacyCoverage
 fi

src/main/scala/com/codacy/plugins/api/languages/Language.scala

@@ -1,5 +1,7 @@
 package com.codacy.plugins.api.languages
 
+import scala.collection.compat._
+
 sealed abstract class Language(val extensions: Set[String],
                                val overriddenName: Option[String] = Option.empty[String],
                                val files: Set[String] = Set.empty[String]) {
@@ -11,21 +13,21 @@ sealed abstract class Language(val extensions: Set[String],
 
 object Languages {
 
-  lazy val extensionsByLanguage: Map[Language, Set[String]] = all.map { lang =>
+  lazy val extensionsByLanguage: Map[Language, Set[String]] = all.iterator.map { lang =>
     (lang, lang.extensions)
-  }(collection.breakOut)
+  }.toMap
 
-  lazy val filenamesByLanguage: Map[Language, Set[String]] = all.map { lang =>
+  lazy val filenamesByLanguage: Map[Language, Set[String]] = all.iterator.map { lang =>
     (lang, lang.files)
-  }(collection.breakOut)
+  }.toMap
 
-  lazy val languageByExtension: Map[String, Language] = all.flatMap { lang =>
+  lazy val languageByExtension: Map[String, Language] = all.iterator.flatMap { lang =>
     lang.extensions.map(extension => (extension.toLowerCase(), lang))
-  }(collection.breakOut)
+  }.toMap
 
-  lazy val languageByFilename: Map[String, Language] = all.flatMap { lang =>
+  lazy val languageByFilename: Map[String, Language] = all.iterator.flatMap { lang =>
     lang.files.map(file => (file.toLowerCase(), lang))
-  }(collection.breakOut)
+  }.toMap
 
   def extensions(language: Language): Option[Set[String]] = extensionsByLanguage.get(language)
 
@@ -37,10 +39,10 @@ object Languages {
     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.map {
+      val customExtensionsMap: Map[Language, Set[String]] = customExtensions.iterator.map {
         case (lang, exts) =>
-          (lang, exts.to[Set] ++ extensionsByLanguage.getOrElse(lang, Set.empty))
-      }(collection.breakOut)
+          (lang, exts.to(Set) ++ extensionsByLanguage.getOrElse(lang, Set.empty))
+      }.toMap
 
       customExtensionsMap.flatMap {
         case (lang, extensions) => extensions.map(extension => (extension.toLowerCase, lang))

src/test/scala/com.codacy.plugins.api.languages/LanguageSpec.scala

@@ -19,7 +19,7 @@ class LanguageSpec extends Specification with NoLanguageFeatures {
                     "src/main/scala/com/codacy/File1.py"),
                 Set(Languages.Scala, Languages.Java),
                 Map((Languages.Scala, Set(".sc"))))
-        .to[List]
+        .toList
 
       files should containTheSameElementsAs(expected)
     }