Skip to content

Commit

Permalink
bump scala version in build and plan
Browse files Browse the repository at this point in the history
  • Loading branch information
bjornregnell committed Aug 5, 2017
1 parent a2512bf commit 0e5cd9f
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 11 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ sudo: required
dist: trusty

language: scala
scala: 2.11.8
scala: 2.12.3

before_install:
- sudo apt-get update -q
- sudo apt-get install texlive-full texlive-latex-extra texlive-lang-all texlive-lang-swedish -y

script:
script:
- sbt build
8 changes: 4 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ lazy val hello = taskKey[Unit]("Prints welcome message")

hello := {
println("===== WELCOME to the sbt build of lunduniversity/introprog =====")
println("\nHAVE PATIENCE: build times can be > 280 sec on a fast machine... \n ")
println("\nHAVE PATIENCE: full build can take >500sec on a 2.5GHz machine...\n")
}

lazy val commonSettings = Seq(
organization := "se.lth.cs",
version := "16.1",
scalaVersion := "2.11.8"
version := "2017-snapshot",
scalaVersion := "2.12.3"
)

lazy val plan = (project in file("plan")).
Expand Down Expand Up @@ -81,7 +81,7 @@ pdf := {
println("\n=== The main doc with all stuff in one pdf optimized for screen:")
runPdfLatexCmd(texFile = file("compendium.tex"), workDir = file("compendium"))

println("\n=== Docs optimized for print, two times for xref aux info:")
println("\n=== Docs optimized for print, two times for external xref to work:")
runPdfLatexCmd(texFile = file("compendium1.tex"), workDir = file("compendium"))
runPdfLatexCmd(texFile = file("compendium2.tex"), workDir = file("compendium"))

Expand Down
7 changes: 3 additions & 4 deletions plan/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@ import sbt._
import Process._
import Keys._

lazy val plan = (project in file(".")).
lazy val plan = (project in file(".")).
settings(
name := "plan",
scalaVersion := "2.11.8",
scalaVersion := "2.12.3",
// https://github.com/typesafehub/sbteclipse/wiki/Using-sbteclipse#skipproject
EclipseKeys.skipProject := true
EclipseKeys.skipProject := true
)

2 changes: 1 addition & 1 deletion quiz/project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=0.13.15
sbt.version=0.13.16

0 comments on commit 0e5cd9f

Please sign in to comment.