Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 22 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,25 @@
sudo: required
dist: trusty
language: scala
scala:
- 2.11.8
jdk:
- oraclejdk8
- oraclejdk7
- 2.12.0-M4
env:
- JDK=oraclejdk8
- JDK=openjdk8
- JDK=oraclejdk7
- JDK=openjdk7
before_script:
- jdk_switcher use $JDK
#https://github.com/travis-ci/travis-ci/issues/5227#issuecomment-165131913
- cat /etc/hosts # optionally check the content *before*
- sudo hostname "$(hostname | cut -c1-63)"
- sed -e "s/^\\(127\\.0\\.0\\.1.*\\)/\\1 $(hostname | cut -c1-63)/" /etc/hosts | sudo tee /etc/hosts
- cat /etc/hosts # optionally check the content *after*
matrix:
# scala 2.12 require java 8
exclude:
- scala: 2.12.0-M4
env: JDK=oraclejdk7
- scala: 2.12.0-M4
env: JDK=openjdk7
3 changes: 1 addition & 2 deletions project/Common.scala
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,11 @@ object Common {
// Core settings
organization := "com.typesafe.scala-logging",
scalaVersion := Version.scala,
crossScalaVersions := List(scalaVersion.value),
crossScalaVersions := Version.crossScala,
scalacOptions ++= List(
"-unchecked",
"-deprecation",
"-language:_",
"-target:jvm-1.6",
"-encoding", "UTF-8"
),
unmanagedSourceDirectories in Compile := List((scalaSource in Compile).value),
Expand Down
3 changes: 2 additions & 1 deletion project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ import sbt._

object Version {
val logback = "1.1.7"
val mockito = "1.9.5"
val mockito = "1.10.19"
val scala = "2.11.8"
val crossScala = List(scala, "2.12.0-M4")
val scalaTest = "2.2.6"
val slf4j = "1.7.21"
}
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")

addSbtPlugin("com.typesafe.sbt" % "sbt-scalariform" % "1.3.0")

addSbtPlugin("com.github.gseitz" % "sbt-release" % "0.8.3")
addSbtPlugin("com.github.gseitz" % "sbt-release" % "0.8.5")

addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.7.0")

Expand Down