Skip to content

Commit d989b42

Browse files
committed
Change sbt conf to cross-publish for 2.11 and 2.12
1 parent cc63013 commit d989b42

File tree

5 files changed

+42
-50
lines changed

5 files changed

+42
-50
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
language: scala
22
scala:
33
- 2.11.8
4+
- 2.12.1
45
jdk:
56
- oraclejdk8
67
script:

build.sbt

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
import Dependencies._
2+
import ReleaseTransformations._
3+
4+
lazy val root = (project in file("."))
5+
val appName = "finagle-metrics"
6+
7+
name := appName
8+
organization := "com.github.rlazoti"
9+
scalaVersion in ThisBuild := "2.12.1"
10+
crossScalaVersions := Seq("2.11.8", "2.12.1")
11+
releaseTagName := s"v${(version in ThisBuild).value}"
12+
releaseTagComment := s"[BUILD] Release ${(version in ThisBuild).value}"
13+
releaseCommitMessage := s"[BUILD] Set version to ${(version in ThisBuild).value}"
14+
15+
scalacOptions := Seq(
16+
"-deprecation",
17+
"-feature",
18+
"-unchecked",
19+
"-language:postfixOps",
20+
"-target:jvm-1.8")
21+
22+
javacOptions in compile ++= Seq(
23+
"-target", "8",
24+
"-source", "8")
25+
26+
releaseProcess := Seq[ReleaseStep](
27+
checkSnapshotDependencies,
28+
inquireVersions,
29+
runTest,
30+
setReleaseVersion,
31+
commitReleaseVersion,
32+
tagRelease,
33+
ReleaseStep(action = Command.process("publishSigned", _)),
34+
setNextVersion,
35+
commitNextVersion,
36+
ReleaseStep(action = Command.process("sonatypeReleaseAll", _)))
37+
38+
resolvers ++= appDependencyResolvers
39+
libraryDependencies ++= appDependencies

project/build.scala

Lines changed: 0 additions & 48 deletions
This file was deleted.

project/dependencies.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import sbt._
22

33
object Dependencies {
44

5-
val finagleVersion = "6.40.0"
5+
val finagleVersion = "6.41.0"
66
val metricsVersion = "3.1.2"
77

88
val finagleCore = "com.twitter" %% "finagle-core" % finagleVersion

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
addSbtPlugin("com.github.gseitz" % "sbt-release" % "0.8.5")
1+
addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.3")
22

33
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")
44

0 commit comments

Comments
 (0)