Skip to content

Commit f4f0208

Browse files
committed
clean: Update dependencies :breaking:
1 parent 9fe321e commit f4f0208

File tree

4 files changed

+27
-41
lines changed

4 files changed

+27
-41
lines changed

build.sbt

Lines changed: 20 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
import Dependencies._
2+
import codacy.libs._
23

34
name := "codacy-coverage-reporter"
45

5-
organization := "com.codacy"
6-
76
scalaVersion := "2.11.12"
87

98
scalacOptions := Seq(
@@ -16,7 +15,11 @@ scalacOptions := Seq(
1615
"-Ypartial-unification"
1716
)
1817

19-
libraryDependencies ++= Seq(coverageParser, logback, log4s, caseApp, raptureJsonPlay, scalaTest, cats, javaxActivation)
18+
// Runtime dependencies
19+
libraryDependencies ++= Seq(coverageParser, caseApp, cats, logbackClassic, scalaLogging)
20+
21+
// Test dependencies
22+
libraryDependencies ++= Seq(scalatest).map(_ % "test")
2023

2124
mainClass in assembly := Some("com.codacy.CodacyCoverageReporter")
2225
assemblyMergeStrategy in assembly := {
@@ -27,38 +30,28 @@ assemblyMergeStrategy in assembly := {
2730
crossPaths := false
2831
artifact in (Compile, assembly) := {
2932
val art = (artifact in (Compile, assembly)).value
30-
art.copy(`classifier` = Some("assembly"))
33+
art.withClassifier(Some("assembly"))
3134
}
3235
addArtifact(artifact in (Compile, assembly), assembly)
3336

34-
organizationName := "Codacy"
35-
organizationHomepage := Some(new URL("https://www.codacy.com"))
37+
// HACK: Since we are only using the public resolvers we need to remove the private for it to not fail
38+
resolvers ~= {
39+
_.filterNot(_.name.toLowerCase.contains("codacy"))
40+
}
3641

37-
// this setting is not picked up properly from the plugin
42+
// HACK: This setting is not picked up properly from the plugin
3843
pgpPassphrase := Option(System.getenv("SONATYPE_GPG_PASSPHRASE")).map(_.toCharArray)
3944

40-
resolvers ~= { _.filterNot(_.name.toLowerCase.contains("codacy")) }
45+
description := "CLI to send coverage reports to Codacy through the API"
4146

42-
publicMvnPublish
47+
scmInfo := Some(
48+
ScmInfo(
49+
url("https://github.com/codacy/codacy-coverage-reporter"),
50+
"scm:git:git@github.com:codacy/codacy-coverage-reporter.git"
51+
)
52+
)
4353

44-
startYear := Some(2015)
45-
description := "Library for parsing coverage reports"
46-
licenses := Seq("The Apache Software License, Version 2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0.txt"))
47-
homepage := Some(url("http://www.github.com/codacy/codacy-coverage-reporter/"))
48-
pomExtra :=
49-
<scm>
50-
<url>https://github.com/codacy/codacy-coverage-reporter</url>
51-
<connection>scm:git:git@github.com:codacy/codacy-coverage-reporter.git</connection>
52-
<developerConnection>scm:git:https://github.com/codacy/codacy-coverage-reporter.git</developerConnection>
53-
</scm>
54-
<developers>
55-
<developer>
56-
<id>mrfyda</id>
57-
<name>Rafael</name>
58-
<email>rafael [at] codacy.com</email>
59-
<url>https://github.com/mrfyda</url>
60-
</developer>
61-
</developers>
54+
publicMvnPublish
6255

6356
fork in Test := true
6457
cancelable in Global := true

project/Dependencies.scala

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,10 @@ import sbt._
22

33
object Dependencies {
44

5-
val codacyScalaApi = "com.codacy" %% "codacy-api-scala" % "3.0.7"
6-
val coverageParser = "com.codacy" %% "coverage-parser" % "2.0.10"
7-
val caseApp = "com.github.alexarchambault" %% "case-app" % "1.2.0"
8-
val raptureJsonPlay = "com.propensive" %% "rapture-json-play" % "2.0.0-M8"
9-
val javaxActivation = "com.sun.activation" % "javax.activation" % "1.2.0"
5+
val coverageParser = "com.codacy" %% "coverage-parser" % "fixes-SNAPSHOT"
106

11-
val scalaTest = "org.scalatest" %% "scalatest" % "3.0.5" % "test"
7+
val caseApp = "com.github.alexarchambault" %% "case-app" % "1.2.0"
128

139
val cats = "org.typelevel" %% "cats-core" % "1.0.1"
1410

15-
val logback = "ch.qos.logback" % "logback-classic" % "1.2.3"
16-
val log4s = "org.log4s" %% "log4s" % "1.5.0"
17-
1811
}

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=0.13.17
1+
sbt.version=1.2.8

project/plugins.sbt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
resolvers += "Era7 maven releases" at "https://s3-eu-west-1.amazonaws.com/releases.era7.com"
2-
3-
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.13.0")
1+
resolvers := Seq(DefaultMavenRepository, Resolver.jcenterRepo, Resolver.sonatypeRepo("releases"))
42

53
addSbtPlugin("com.codacy" % "codacy-sbt-plugin" % "14.0.1")
64

5+
// Publish
6+
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.9")
7+
78
// Updates
89
addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.4.0")
910
addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.9.2")
10-

0 commit comments

Comments
 (0)