diff --git a/.travis.yml b/.travis.yml index b73d6131..240d3658 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ +jdk: oraclejdk8 language: scala scala: -- 2.11.7 +- 2.12.2 diff --git a/README.md b/README.md index 0a408f52..a8799a34 100644 --- a/README.md +++ b/README.md @@ -1,27 +1,25 @@ # Doodle: Compositional Graphics -Copyright 2015 [Underscore](http://underscore.io). +Copyright 2015-2017 [Underscore](http://underscore.io). A Scala library for compositional vector graphics, -with a native back-end via Swing and Java2D, -and an HTML SVG backend via [Scala.js](http://www.scala-js.org/). +with a desktop back-end via Swing and Java2D, +and an HTML SVG back-end via [Scala.js](http://www.scala-js.org/). Distributed under the [Apache 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) license. [![Build Status](https://travis-ci.org/underscoreio/doodle.svg?branch=develop)](https://travis-ci.org/underscoreio/doodle) [![Join the chat at https://gitter.im/underscoreio/doodle](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/underscoreio/doodle?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) -# Using Doodle +# Using Doodle You can use Doodle in your own project by importing the JARs published to our [Bintray repository][bintray-training]. The current release is **`0.7.0`**. To use it add the following to your `build.sbt`: [bintray-training]: https://bintray.com/underscoreio/training/doodle ~~~ scala -scalaVersion := "2.11.8" // Doodle is compatible with Scala 2.11 only - +scalaVersion := "2.11.11" // Doodle is compatible with Scala 2.11 only resolvers += Resolver.bintrayRepo("underscoreio", "training") - libraryDependencies += "underscoreio" %% "doodle" % "0.7.0" ~~~ diff --git a/build.sbt b/build.sbt index 957cd481..0e829978 100644 --- a/build.sbt +++ b/build.sbt @@ -2,14 +2,14 @@ version in ThisBuild := "0.7.0" val catsVersion = "0.9.0" -scalaVersion in ThisBuild := "2.12.1" +scalaVersion in ThisBuild := "2.12.2" lazy val doodle = crossProject. crossType(DoodleCrossType). settings( name := "doodle", organization := "underscoreio", - scalaVersion := "2.12.1", + scalaVersion := "2.12.2", scalaOrganization := "org.typelevel", scalacOptions ++= Seq("-feature", "-Xfatal-warnings", "-deprecation", "-unchecked", "-Ywarn-unused-import", "-Ypartial-unification"), scalacOptions in (Compile, console) := Seq("-feature", "-Xfatal-warnings", "-deprecation", "-unchecked", "-Ypartial-unification"), diff --git a/project/build.properties b/project/build.properties index d91bf6c4..64317fda 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.13-RC2 +sbt.version=0.13.15