Merge pull request #67 from codacy/remove-overriddenName-from-language

Remove overridden name from language

Author: lolgab

.circleci/config.yml

@@ -1,45 +1,31 @@
 version: 2.1
 
 orbs:
-  codacy: codacy/base@1.0.0
+  codacy: codacy/base@10.0.2
 
 workflows:
   version: 2
   compile_test_deploy:
     jobs:
       - codacy/checkout_and_version:
           write_sbt_version: true
-      - codacy/sbt:
-          name: populate_cache
-          cmd: sbt "set scalafmtUseIvy in ThisBuild := false;update"
-          persist_to_workspace: true
-          requires:
-            - codacy/checkout_and_version
-      - codacy/sbt:
-          name: check_fmt
-          cmd: sbt "scalafmt::test;test:scalafmt::test;sbt:scalafmt::test"
-          requires:
-            - populate_cache
-      - codacy/sbt:
-          name: compile
-          cmd: |
-            sbt +compile
-            sbt +test:compile
-          requires:
-            - check_fmt
-      - codacy/sbt:
+      - codacy/sbt_docker:
           name: test
-          cmd: |
-            sbt "coverage;coverageReport;coverageAggregate"
-            sbt +test
-
-            if [ -z "$CODACY_PROJECT_TOKEN" ]; then
-                echo "CODACY_PROJECT_TOKEN not found. Skipping send coverage to Codacy."
-            else
-                sbt codacyCoverage
-            fi
+          steps:
+            - run:
+                name: Scalafmt sources
+                command: sbt scalafmtCheckAll
+            - run:
+                name: Scalafmt sbt sources
+                command: sbt scalafmtSbtCheck
+            - run:
+                name: Compile
+                command: sbt +compile
+            - run:
+                name: Test
+                command: sbt +test
           requires:
-            - compile
+            - codacy/checkout_and_version
       - codacy/sbt:
           name: publish
           cmd: |

build.sbt

@@ -1,6 +1,6 @@
 val scala211 = "2.11.12"
 val scala212 = "2.12.10"
-val scala213 = "2.13.1"
+val scala213 = "2.13.10"
 
 name := "codacy-plugins-api"
 organization := "com.codacy"
@@ -9,7 +9,7 @@ scalaVersion := scala212
 
 crossScalaVersions := Seq(scala211, scala212, scala213)
 
-libraryDependencies ++= Seq("org.specs2" %% "specs2-core" % "4.8.3" % Test)
+libraryDependencies ++= Seq("wordspec", "shouldmatchers").map(m => "org.scalatest" %% s"scalatest-$m" % "3.2.14" % Test)
 
 unmanagedSourceDirectories in Compile += {
   val sourceDir = (sourceDirectory in Compile).value

project/build.properties

@@ -1 +1 @@
-sbt.version=1.3.6
+sbt.version=1.8.0

project/plugins.sbt

@@ -1,3 +1 @@
-resolvers += Resolver.jcenterRepo
-
-addSbtPlugin("com.codacy" % "codacy-sbt-plugin" % "17.1.5")
+addSbtPlugin("com.codacy" % "codacy-sbt-plugin" % "24.0.0")

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

@@ -1,10 +1,8 @@
 package com.codacy.plugins.api.languages
 
-sealed abstract class Language(val extensions: Set[String],
-                               val overriddenName: Option[String] = Option.empty[String],
-                               val files: Set[String] = Set.empty[String]) {
+sealed abstract class Language(val extensions: Set[String], val files: Set[String] = Set.empty[String]) {
   self: Product =>
-  val name: String = overriddenName.getOrElse(self.productPrefix)
+  val name: String = self.productPrefix
 
   override def toString: String = name
 }
@@ -80,7 +78,7 @@ object Languages {
                                Perl,
                                CSharp,
                                VisualBasic,
-                               ObjectiveC,
+                               `Objective C`,
                                FSharp,
                                Cobol,
                                Fortran,
@@ -225,7 +223,7 @@ object Languages {
   case object VisualBasic extends Language(extensions = Set(".vb"))
 
   // Support startdate: November 2020
-  case object ObjectiveC extends Language(overriddenName = Some("Objective C"), extensions = Set(".m"))
+  case object `Objective C` extends Language(extensions = Set(".m"))
 
   // Support startdate: March 2021
   case object YAML extends Language(extensions = Set(".yaml", ".yml"))

src/main/scala/com/codacy/plugins/api/results/Pattern.scala

@@ -41,13 +41,13 @@ object Pattern {
   type Category = Category.Value
   object Category extends Enumeration {
     val Security, CodeStyle, ErrorProne, Performance, Compatibility, UnusedCode, Complexity, BestPractice,
-    Comprehensibility, Duplication, Documentation = Value
+      Comprehensibility, Duplication, Documentation = Value
   }
 
   type Subcategory = Subcategory.Value
   object Subcategory extends Enumeration {
     val XSS, InputValidation, FileAccess, HTTP, Cookies, UnexpectedBehaviour, MassAssignment, InsecureStorage,
-    InsecureModulesLibraries, Visibility, CSRF, Android, MaliciousCode, Cryptography, CommandInjection, FirefoxOS, Auth,
-    DoS, SQLInjection, Routes, Regex, SSL, Other = Value
+      InsecureModulesLibraries, Visibility, CSRF, Android, MaliciousCode, Cryptography, CommandInjection, FirefoxOS,
+      Auth, DoS, SQLInjection, Routes, Regex, SSL, Other = Value
   }
 }

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

@@ -1,9 +1,10 @@
 package com.codacy.plugins.api.languages
 
-import org.specs2.control.NoLanguageFeatures
-import org.specs2.mutable.Specification
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.OptionValues
+import org.scalatest.wordspec.AnyWordSpec
 
-class LanguageSpec extends Specification with NoLanguageFeatures {
+class LanguageSpec extends AnyWordSpec with Matchers with OptionValues {
   "Languages" should {
     "filter by language" in {
       val expected = Seq("src/main/scala/com/codacy/File1.scala",
@@ -21,14 +22,15 @@ class LanguageSpec extends Specification with NoLanguageFeatures {
                 Map((Languages.Scala, Set(".sc"))))
         .toList
 
-      files should containTheSameElementsAs(expected)
+      files should contain theSameElementsAs expected
     }
 
     "forPath" in {
-      Languages.forPath("src/main/scala/com/codacy/File1.scala") should beEqualTo(Some(Languages.Scala))
-      Languages.forPath("src/main/scala/com/codacy/File1.sc", List((Languages.Scala, Seq(".sc")))) should beEqualTo(
-        Some(Languages.Scala))
-      Languages.forPath("src/File3.mjs") should beEqualTo(Some(Languages.Javascript))
+      Languages.forPath("src/main/scala/com/codacy/File1.scala").value shouldBe Languages.Scala
+      Languages
+        .forPath("src/main/scala/com/codacy/File1.sc", List((Languages.Scala, Seq(".sc"))))
+        .value shouldBe Languages.Scala
+      Languages.forPath("src/File3.mjs").value shouldBe Languages.Javascript
     }
   }
 }