Skip to content

Commit ca7549e

Browse files
author
Mathias Bogaert
committed
Cross compile for 2.12.0-RC1, add changelog.
1 parent 1002715 commit ca7549e

File tree

4 files changed

+13
-4
lines changed

4 files changed

+13
-4
lines changed

.travis.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ language: scala
44
scala:
55
- 2.11.8
66
- 2.12.0-M5
7+
- 2.12.0-RC1
78
env:
89
- JDK=oraclejdk8
910
- JDK=openjdk8
@@ -23,3 +24,7 @@ matrix:
2324
env: JDK=oraclejdk7
2425
- scala: 2.12.0-M5
2526
env: JDK=openjdk7
27+
- scala: 2.12.0-RC1
28+
env: JDK=oraclejdk7
29+
- scala: 2.12.0-RC1
30+
env: JDK=openjdk7

README.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ if (logger.isDebugEnabled) logger.debug(s"Some $expensive message!")
1717
## Prerequisites ##
1818

1919
* Java 6 or higher
20-
* Scala 2.11
20+
* Scala 2.11 or 2.12
2121
* Logging backend compatible with SLF4J
2222

2323
One logging backend can be [Logback](http://logback.qos.ch), you can add it to your sbt build definition (the most recent version can be found here: http://logback.qos.ch/download.html):
@@ -44,6 +44,10 @@ libraryDependencies += "com.typesafe.scala-logging" %% "scala-logging" % "3.4.0"
4444

4545
### What's new?
4646

47+
#### 3.5.0
48+
49+
- Bugfixes and upgrades, published for Scala 2.12.0-RC1
50+
4751
#### 3.4.0
4852

4953
- Fixes #38 - Logger.info() cannot be used with primitive types.
@@ -106,7 +110,7 @@ Provides logback encoders, layouts, and appenders to log in JSON format.
106110

107111
## Maintainer ##
108112

109-
The original author [Heiko Seeberger](https://twitter.com/hseeberger) stepped down Q1 2015, starting a new adventure at codecentric. Future maintenance is taken
113+
The original author [Heiko Seeberger](https://twitter.com/hseeberger) stepped down Q1 2015, starting a new adventure at codecentric. Future maintenance is taken
110114
over by [Mathias Bogaert](http://twitter.com/analytically).
111115

112116
## Contribution policy ##

project/Dependencies.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ object Version {
44
val logback = "1.1.7"
55
val mockito = "1.10.19"
66
val scala = "2.11.8"
7-
val crossScala = List(scala, "2.12.0-M5")
7+
val crossScala = List(scala, "2.12.0-M5", "2.12.0-RC1")
88
val scalaTest = "3.0.0"
99
val slf4j = "1.7.21"
1010
}

project/build.properties

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

0 commit comments

Comments
 (0)