Skip to content

Commit 45419d2

Browse files
committed
Upgrade sbt plugsins and support Scala 2.11 and 2.12
1 parent 08c13f4 commit 45419d2

File tree

5 files changed

+247
-179
lines changed

5 files changed

+247
-179
lines changed

build.sbt

Lines changed: 25 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,38 @@
1-
organization := "org.fluentd"
1+
import ReleaseTransformations._
22

3+
organization := "org.fluentd"
34
name := "fluent-logger-scala"
45

5-
version := "0.6.1-SNAPSHOT"
6-
76
publishMavenStyle := true
8-
9-
scalaVersion := "2.11.8"
10-
11-
crossScalaVersions := Seq("2.10.6", scalaVersion.value)
12-
13-
resolvers ++= Seq(
14-
"Sonatype Repository" at "http://oss.sonatype.org/content/repositories/releases"
15-
)
16-
7+
scalaVersion := "2.12.1"
8+
crossScalaVersions := Seq("2.11.8", scalaVersion.value)
179
scalacOptions ++= Seq("-deprecation", "-feature", "-language:implicitConversions")
18-
1910
logBuffered in Test := false
20-
2111
libraryDependencies ++= Seq(
2212
"org.fluentd" % "fluent-logger" % "0.3.2",
23-
"org.json4s" %% "json4s-native" % "3.4.0",
13+
"org.json4s" %% "json4s-native" % "3.5.0",
2414
"junit" % "junit" % "4.12" % Test,
25-
"org.xerial" % "fluentd-standalone" % "0.1.2" % Test,
26-
"org.scalatest" %% "scalatest" % "3.0.0" % Test
15+
"org.xerial" %% "fluentd-standalone" % "0.14.11" % Test,
16+
"org.scalatest" %% "scalatest" % "3.0.1" % Test
17+
)
18+
19+
// Release settings
20+
releaseTagName := { (version in ThisBuild).value }
21+
releaseProcess := Seq[ReleaseStep](
22+
checkSnapshotDependencies,
23+
inquireVersions,
24+
runClean,
25+
runTest,
26+
setReleaseVersion,
27+
commitReleaseVersion,
28+
tagRelease,
29+
ReleaseStep(action = Command.process("publishSigned", _), enableCrossBuild = true),
30+
setNextVersion,
31+
commitNextVersion,
32+
ReleaseStep(action = Command.process("sonatypeReleaseAll", _), enableCrossBuild = true),
33+
pushChanges
2734
)
35+
releaseCrossBuild := true
2836

2937
pomExtra := (
3038
<url>https://github.com/fluent/fluent-logger-scala</url>

project/build.properties

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

project/plugin.sbt

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
1-
2-
addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.6.0")
3-
4-
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "0.5.1")
5-
1+
addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.3")
2+
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "1.1")
63
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")
7-
4+
addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-M14-7")
85
addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.7.5")
96

107
scalacOptions ++= Seq("-deprecation", "-feature")

0 commit comments

Comments
 (0)