Skip to content

Commit 5229c5b

Browse files
committed
bump versions of stuff & generally modernize
note that this still leaves us on Scala 2.11 and Play 2.4 and Akka 2.3, though, so this only semi-modernizes us
1 parent 11fdf90 commit 5229c5b

File tree

7 files changed

+15
-13
lines changed

7 files changed

+15
-13
lines changed

Diff for: .gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/gui/logs/
12
target/
23
out/
34
.idea

Diff for: .travis.yml

+9-4
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ language: scala
22
script:
33
- sbt ++$TRAVIS_SCALA_VERSION compile
44
scala:
5-
- 2.11.7
5+
- 2.11.8
66
# we actually build and run on openjdk8 in production, see scala-jenkins-infra.
7-
# but (as of June 2015) Travis only supports Oracle Java 8, not OpenJDK 8
7+
# but (as of November 2016) Travis still only supports Oracle Java 8, not OpenJDK 8
88
jdk:
99
- oraclejdk8
1010
notifications:
@@ -13,11 +13,16 @@ notifications:
1313
1414
cache:
1515
directories:
16-
- $HOME/.m2/repository/
17-
- $HOME/.ivy2/cache/
16+
- $HOME/.ivy2/
1817
- $HOME/.sbt/cache/
18+
- $HOME/.sbt/boot/
19+
- $HOME/.sbt/launchers/
1920
env:
2021
global:
2122
- GIT_SSH=.travis/ssh_scabot
2223
after_success:
2324
- openssl aes-256-cbc -K $encrypted_046e6a226c09_key -iv $encrypted_046e6a226c09_iv -in .travis/scabot.pem.enc -out .travis/scabot.pem -d && git push --force [email protected]:/home/scabot/scabot master:master
25+
26+
before_cache:
27+
- find $HOME/.sbt -name "*.lock" | xargs rm
28+
- find $HOME/.ivy2 -name "ivydata-*.properties" | xargs rm

Diff for: LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2015-2016, Lightbend Inc. (formerly Typesafe Inc.)
1+
Copyright (c) 2015-2016, Lightbend Inc.
22
All rights reserved.
33

44
Redistribution and use in source and binary forms, with or without

Diff for: build.sbt

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,14 @@ name := "scabot"
22

33
organization in ThisBuild := "com.lightbend"
44
version in ThisBuild := "0.1.0"
5-
scalaVersion in ThisBuild := "2.11.7"
5+
scalaVersion in ThisBuild := "2.11.8"
66

77
scalacOptions in ThisBuild ++=
88
Seq("-feature", "-deprecation", "-Xfatal-warnings")
99

1010
lazy val deps: Seq[sbt.Def.Setting[_]] = Seq(
1111
libraryDependencies ++= Seq(
12-
"com.typesafe.akka" %% "akka-actor" % "2.3.14",
13-
"com.typesafe.akka" %% "akka-kernel" % "2.3.14",
12+
"com.typesafe.akka" %% "akka-actor" % "2.3.16",
1413
"io.spray" %% "spray-client" % "1.3.2",
1514
"io.spray" %% "spray-json" % "1.3.1"
1615
))

Diff for: gui/project/plugins.sbt

-1
This file was deleted.

Diff for: project/build.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version = 0.13.11
1+
sbt.version = 0.13.13

Diff for: project/plugins.sbt

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
logLevel := Level.Warn
2-
3-
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.4.0")
1+
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.4.8")

0 commit comments

Comments
 (0)