Skip to content

Commit

Permalink
Merge pull request #5 from Philippus/scala-2.11.x
Browse files Browse the repository at this point in the history
Cross-build for Scala 2.11.x and 2.12.x
  • Loading branch information
Philippus authored Dec 4, 2017
2 parents 71eab19 + a946f08 commit 9d6b325
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
language: scala
scala:
- 2.11.12
- 2.12.4
jdk:
- oraclejdk8
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ To view the emoji itself you will need an emoji library such as [Lightbend Emoji

## Installation

Add the following to your `build.sbt`:
Emoji-clock is published for Scala 2.11 and 2.12, but requires Java 8. To start using it add the following to your
`build.sbt`:

```
resolvers += Resolver.bintrayRepo("gn0s1s", "releases")
Expand Down
3 changes: 2 additions & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ startYear := Some(2017)
homepage := Some(url("https://github.com/philippus/emoji-clock"))
licenses += ("MIT", url("http://opensource.org/licenses/MIT"))

scalaVersion := "2.12.4"
crossScalaVersions := List("2.11.12", "2.12.4")
scalaVersion := crossScalaVersions.value.last

bintrayOrganization := Some("gn0s1s")
bintrayRepository := "releases"
Expand Down

0 comments on commit 9d6b325

Please sign in to comment.