diff --git a/.travis.yml b/.travis.yml index aa43c6d..95c8365 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,7 @@ language: java env: - TRAVIS_SCALA_VERSION=2.11.11 - TRAVIS_SCALA_VERSION=2.12.8 + - TRAVIS_SCALA_VERSION=2.13.0 jdk: - oraclejdk8 @@ -24,6 +25,6 @@ before_script: script: - set -x && if [[ "$TRAVIS_SCALA_VERSION" == 2.11.* ]]; then testNative=trailNative/test; else testNative=""; fi && - curl -L -o csbt https://github.com/coursier/sbt-launcher/releases/download/v1.2.2/csbt && + curl -L -o csbt https://github.com/coursier/sbt-launcher/releases/download/v1.2.14/csbt && chmod +x csbt && - ./csbt --add-coursier=true ++$TRAVIS_SCALA_VERSION trailJVM/test trailJS/test $testNative + COURSIER_SBT_LAUNCHER_ADD_PLUGIN=true ./csbt ++$TRAVIS_SCALA_VERSION trailJVM/test trailJS/test $testNative diff --git a/README.md b/README.md index 83a2f9e..8083ea9 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # [![Build Status](https://travis-ci.org/sparsetech/trail.svg)](https://travis-ci.org/sparsetech/trail) [![Join the chat at https://gitter.im/sparsetech/trail](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/sparsetech/trail?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) -[![Maven Central](https://img.shields.io/maven-central/v/tech.sparse/trail_2.12.svg)](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22tech.sparse%22%20AND%20a%3A%22trail_2.12%22) +[![Maven Central](https://img.shields.io/maven-central/v/tech.sparse/trail_2.13.svg)](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22tech.sparse%22%20AND%20a%3A%22trail_2.13%22) Trail is a routing library for Scala. It is available for the JVM, Scala.js and Scala Native. @@ -30,7 +30,7 @@ val result = "/user/hello?show=false" match { ## Links * [Documentation](http://sparse.tech/docs/trail.html) -* [ScalaDoc](https://www.javadoc.io/doc/tech.sparse/trail_2.12/) +* [ScalaDoc](https://www.javadoc.io/doc/tech.sparse/trail_2.13/) ## Licence Trail is licensed under the terms of the Apache v2.0 licence. diff --git a/build.sbt b/build.sbt index b609667..88d6c61 100644 --- a/build.sbt +++ b/build.sbt @@ -4,15 +4,16 @@ import sbtcrossproject.CrossPlugin.autoImport.{crossProject, CrossType} val Leaf = "0.1.0" val Scala2_11 = "2.11.12" val Scala2_12 = "2.12.8" -val ScalaTest = "3.0.5" +val Scala2_13 = "2.13.0" +val ScalaTest = "3.0.8" val ScalaTestNative = "3.2.0-SNAP10" val SharedSettings = Seq( name := "trail", organization := "tech.sparse", - scalaVersion := Scala2_12, - crossScalaVersions := Seq(Scala2_12, Scala2_11), + scalaVersion := Scala2_13, + crossScalaVersions := Seq(Scala2_13, Scala2_12, Scala2_11), scalacOptions := Seq( "-unchecked", "-deprecation", diff --git a/project/plugins.sbt b/project/plugins.sbt index 05049e4..cc949ac 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -2,5 +2,5 @@ logLevel := Level.Warn addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.6.0") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "0.6.0") -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.26") -addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.3.8") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.28") +addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.3.9")