Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 9c1ea1f

Browse filesBrowse files
authored
Merge pull request #26 from zaneli/update_libs
Update Scala, sbt and lib versions
2 parents aa09045 + d40f21b commit 9c1ea1f
Copy full SHA for 9c1ea1f

File tree

Expand file treeCollapse file tree

3 files changed

+10
-13
lines changed
Filter options
Expand file treeCollapse file tree

3 files changed

+10
-13
lines changed

‎.travis.yml

Copy file name to clipboardExpand all lines: .travis.yml
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
language: scala
22
scala:
33
- 2.10.6
4-
- 2.11.7
4+
- 2.11.8
55

66
sudo: false
77

‎build.sbt

Copy file name to clipboardExpand all lines: build.sbt
+8-11Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ version := "0.6.1-SNAPSHOT"
66

77
publishMavenStyle := true
88

9-
scalaVersion := "2.11.7"
9+
scalaVersion := "2.11.8"
1010

1111
crossScalaVersions := Seq("2.10.6", scalaVersion.value)
1212

@@ -20,16 +20,13 @@ logBuffered in Test := false
2020

2121
libraryDependencies ++= Seq(
2222
"org.fluentd" % "fluent-logger" % "0.3.2",
23-
"junit" % "junit" % "4.12" % "test",
24-
"org.slf4j" % "slf4j-api" % "1.7.13",
25-
"org.slf4j" % "slf4j-simple" % "1.7.13" % "test",
26-
"org.xerial" % "fluentd-standalone" % "0.1.2"
27-
)
28-
29-
libraryDependencies ++= Seq(
30-
"org.json4s" %% "json4s-native" % "3.3.0",
31-
"org.scalatest" %% "scalatest" % "2.2.6" % "test",
32-
"org.scala-lang" % "scala-actors" % scalaVersion.value % "test"
23+
"junit" % "junit" % "4.12" % Test,
24+
"org.slf4j" % "slf4j-api" % "1.7.21",
25+
"org.slf4j" % "slf4j-simple" % "1.7.21" % Test,
26+
"org.xerial" % "fluentd-standalone" % "0.1.2",
27+
"org.json4s" %% "json4s-native" % "3.4.0",
28+
"org.scalatest" %% "scalatest" % "3.0.0" % Test,
29+
"org.scala-lang" % "scala-actors" % scalaVersion.value % Test
3330
)
3431

3532
pomExtra := (

‎project/build.properties

Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=0.13.9
1+
sbt.version=0.13.12

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.