Skip to content

Commit e5bc3e1

Browse files
committed
bump: Orb and build
1 parent cf66285 commit e5bc3e1

File tree

4 files changed

+21
-38
lines changed

4 files changed

+21
-38
lines changed

.circleci/config.yml

Lines changed: 16 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,31 @@
11
version: 2.1
22

33
orbs:
4-
codacy: codacy/base@1.0.0
4+
codacy: codacy/base@10.0.2
55

66
workflows:
77
version: 2
88
compile_test_deploy:
99
jobs:
1010
- codacy/checkout_and_version:
1111
write_sbt_version: true
12-
- codacy/sbt:
13-
name: populate_cache
14-
cmd: sbt "set scalafmtUseIvy in ThisBuild := false;update"
15-
persist_to_workspace: true
16-
requires:
17-
- codacy/checkout_and_version
18-
- codacy/sbt:
19-
name: check_fmt
20-
cmd: sbt "scalafmt::test;test:scalafmt::test;sbt:scalafmt::test"
21-
requires:
22-
- populate_cache
23-
- codacy/sbt:
24-
name: compile
25-
cmd: |
26-
sbt +compile
27-
sbt +test:compile
28-
requires:
29-
- check_fmt
30-
- codacy/sbt:
12+
- codacy/sbt_docker:
3113
name: test
32-
cmd: |
33-
sbt "coverage;coverageReport;coverageAggregate"
34-
sbt +test
35-
36-
if [ -z "$CODACY_PROJECT_TOKEN" ]; then
37-
echo "CODACY_PROJECT_TOKEN not found. Skipping send coverage to Codacy."
38-
else
39-
sbt codacyCoverage
40-
fi
14+
steps:
15+
- run:
16+
name: Scalafmt sources
17+
command: sbt scalafmtCheckAll
18+
- run:
19+
name: Scalafmt sbt sources
20+
command: sbt scalafmtSbtCheck
21+
- run:
22+
name: Compile
23+
command: sbt +compile
24+
- run:
25+
name: Test
26+
command: sbt +test
4127
requires:
42-
- compile
28+
- codacy/checkout_and_version
4329
- codacy/sbt:
4430
name: publish
4531
cmd: |

project/plugins.sbt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
resolvers += Resolver.jcenterRepo
2-
3-
addSbtPlugin("com.codacy" % "codacy-sbt-plugin" % "17.1.5")
1+
addSbtPlugin("com.codacy" % "codacy-sbt-plugin" % "24.0.0")

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.codacy.plugins.api.languages
22

3-
sealed abstract class Language(val extensions: Set[String],
4-
val files: Set[String] = Set.empty[String]) {
3+
sealed abstract class Language(val extensions: Set[String], val files: Set[String] = Set.empty[String]) {
54
self: Product =>
65
val name: String = self.productPrefix
76

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,13 @@ object Pattern {
4141
type Category = Category.Value
4242
object Category extends Enumeration {
4343
val Security, CodeStyle, ErrorProne, Performance, Compatibility, UnusedCode, Complexity, BestPractice,
44-
Comprehensibility, Duplication, Documentation = Value
44+
Comprehensibility, Duplication, Documentation = Value
4545
}
4646

4747
type Subcategory = Subcategory.Value
4848
object Subcategory extends Enumeration {
4949
val XSS, InputValidation, FileAccess, HTTP, Cookies, UnexpectedBehaviour, MassAssignment, InsecureStorage,
50-
InsecureModulesLibraries, Visibility, CSRF, Android, MaliciousCode, Cryptography, CommandInjection, FirefoxOS, Auth,
51-
DoS, SQLInjection, Routes, Regex, SSL, Other = Value
50+
InsecureModulesLibraries, Visibility, CSRF, Android, MaliciousCode, Cryptography, CommandInjection, FirefoxOS,
51+
Auth, DoS, SQLInjection, Routes, Regex, SSL, Other = Value
5252
}
5353
}

0 commit comments

Comments
 (0)