Skip to content

Commit 1bc5387

Browse files
committed
Update plugin and dependency versions. Remove unused settings, imports, etc.
Plugin version updates: - scalastyle 0.3.2 -> 0.8.0 - pgp 1.0.0 -> 1.0.1 - release 0.8.5 -> 1.0.3 - scalajs 0.6.9 -> 0.6.12 Dependency version updates: - mockito 1.9.5 -> 1.10.19
1 parent c9d19f9 commit 1bc5387

File tree

2 files changed

+12
-20
lines changed

2 files changed

+12
-20
lines changed

project/Scoverage.scala

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,17 @@
1-
import sbt.Keys._
21
import sbt._
3-
import sbtrelease.ReleasePlugin
4-
import sbtrelease.ReleasePlugin.ReleaseKeys
2+
import sbt.Keys._
3+
import sbtrelease.ReleasePlugin.autoImport._
54
import com.typesafe.sbt.pgp.PgpKeys
5+
import org.scalajs.sbtplugin.ScalaJSPlugin.autoImport._
66
import org.scalajs.sbtplugin.cross.CrossProject
77
import org.scalajs.sbtplugin.cross.CrossType
8-
import org.scalajs.sbtplugin.ScalaJSPlugin
9-
import org.scalajs.sbtplugin.ScalaJSPlugin.autoImport._
108

119
object Scoverage extends Build {
1210

1311
val Org = "org.scoverage"
14-
val MockitoVersion = "1.9.5"
12+
val MockitoVersion = "1.10.19"
1513
val ScalatestVersion = "3.0.0"
1614

17-
lazy val LocalTest = config("local") extend Test
18-
1915
val appSettings = Seq(
2016
organization := Org,
2117
scalaVersion := "2.11.8",
@@ -25,13 +21,11 @@ object Scoverage extends Build {
2521
publishArtifact in Test := false,
2622
parallelExecution in Test := false,
2723
scalacOptions := Seq("-unchecked", "-deprecation", "-feature", "-encoding", "utf8"),
28-
resolvers := ("releases" at "https://oss.sonatype.org/service/local/staging/deploy/maven2") +: resolvers.value,
2924
concurrentRestrictions in Global += Tags.limit(Tags.Test, 1),
30-
javacOptions := Seq("-source", "1.6", "-target", "1.6"),
3125
publishTo <<= version {
3226
(v: String) =>
3327
val nexus = "https://oss.sonatype.org/"
34-
if (v.trim.endsWith("SNAPSHOT"))
28+
if (v.trim.endsWith("-SNAPSHOT"))
3529
Some(Resolver.sonatypeRepo("snapshots"))
3630
else
3731
Some("releases" at nexus + "service/local/staging/deploy/maven2")
@@ -60,9 +54,9 @@ object Scoverage extends Build {
6054
pomIncludeRepository := {
6155
_ => false
6256
}
63-
) ++ ReleasePlugin.releaseSettings ++ Seq(
64-
ReleaseKeys.crossBuild := true,
65-
ReleaseKeys.publishArtifactsAction := PgpKeys.publishSigned.value
57+
) ++ Seq(
58+
releaseCrossBuild := true,
59+
releasePublishArtifactsAction := PgpKeys.publishSigned.value
6660
)
6761

6862
lazy val root = Project("scalac-scoverage", file("."))

project/plugins.sbt

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
resolvers += Classpaths.sbtPluginReleases
1+
addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "0.8.0")
22

3-
addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "0.3.2")
3+
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.1")
44

5-
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")
5+
addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.3")
66

7-
addSbtPlugin("com.github.gseitz" % "sbt-release" % "0.8.5")
8-
9-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.9")
7+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.12")

0 commit comments

Comments
 (0)