From 74a5efed51554d85b05b18673ed9367d063b6027 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20G=C3=B3mez?= Date: Thu, 30 Jun 2016 12:07:56 +0200 Subject: [PATCH 1/2] Use toolchain with the same version as the content --- build.sbt | 4 ++-- project/plugins.sbt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.sbt b/build.sbt index 963b82d9..945c2f65 100644 --- a/build.sbt +++ b/build.sbt @@ -13,8 +13,8 @@ lazy val stdlib = (project in file(".")) libraryDependencies ++= Seq( "com.chuusai" %% "shapeless" % "2.2.5", "org.scalatest" %% "scalatest" % "2.2.4", - "org.scala-exercises" %% "exercise-compiler" % "0.1.+" changing(), - "org.scala-exercises" %% "definitions" % "0.1.+" changing(), + "org.scala-exercises" %% "exercise-compiler" % version.value, + "org.scala-exercises" %% "definitions" % version.value, "org.scalacheck" %% "scalacheck" % "1.12.5", "com.github.alexarchambault" %% "scalacheck-shapeless_1.12" % "0.3.1" ), diff --git a/project/plugins.sbt b/project/plugins.sbt index 16267c08..f354b1be 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,2 +1,2 @@ -addSbtPlugin("org.scala-exercises" % "sbt-exercise" % "0.1.+", "0.13", "2.10") +addSbtPlugin("org.scala-exercises" % "sbt-exercise" % "0.1.1", "0.13", "2.10") addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0") From 852896ed385477459170edeb684e60a6bed0854b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20G=C3=B3mez?= Date: Thu, 30 Jun 2016 12:30:50 +0200 Subject: [PATCH 2/2] Don't install compiler from source --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 81942be5..d5d0bac0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,8 +4,6 @@ scala: jdk: - oraclejdk8 script: - - git clone https://github.com/scala-exercises/site.git site - - pushd site; sbt 'definitions/publishLocal' 'runtime/publishLocal' 'compiler/publishLocal' 'sbt-exercise/publishLocal' ; popd - sbt test after_success: - bash deploy.sh