From 648adf5691ef349ded55996b8c3fc49ff3510c46 Mon Sep 17 00:00:00 2001
From: Andriy Plokhotnyuk <plokhotnyuk@gmail.com>
Date: Tue, 28 Jul 2015 12:34:16 +0300
Subject: [PATCH] Update versions of dependencies and build plugins  + clean up
 of build configuration

---
 .travis.yml         |  2 +-
 build.sbt           |  8 ++++----
 pom.xml             | 18 +++++-------------
 project/plugins.sbt |  2 +-
 shippable.yml       |  2 +-
 5 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6dcd4c9..d13a3e0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: scala
 scala:
-  - 2.11.6
+  - 2.11.7
 jdk:
   - oraclejdk8
   - openjdk7
diff --git a/build.sbt b/build.sbt
index 05e017a..cdca8af 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,12 +1,12 @@
 name := "actors"
 version := "1.0-SNAPSHOT"
-scalaVersion := "2.11.6"
+scalaVersion := "2.11.7"
 resolvers ++= Seq("sonatype-staging" at "https://oss.sonatype.org/content/groups/staging")
 libraryDependencies ++= Seq(
-  "com.typesafe.akka" %% "akka-actor" % "2.3.11" % "test",
-  "net.liftweb" %% "lift-actor" % "3.0-M5" % "test",
+  "com.typesafe.akka" %% "akka-actor" % "2.4-M2" % "test",
+  "net.liftweb" %% "lift-actor" % "3.0-M6" % "test",
   "org.scala-lang" % "scala-actors" % scalaVersion.value % "test",
-  "org.scalaz" %% "scalaz-concurrent" % "7.1.1" % "test",
+  "org.scalaz" %% "scalaz-concurrent" % "7.1.3" % "test",
   "org.specs2" %% "specs2-junit" % "2.4.17" % "test"
 )
 val javaVersion = sys.props("java.runtime.version").take(3)
diff --git a/pom.xml b/pom.xml
index c5c71ed..8fe422f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <scala.version>2.11.6</scala.version>
+        <scala.version>2.11.7</scala.version>
         <benchmark.args>-server -Xms4096m -Xmx4096m -XX:NewSize=3584m -XX:MaxNewSize=3584m -Xss256k -XX:+UseG1GC -XX:+TieredCompilation -XX:+UseNUMA -XX:-UseBiasedLocking -XX:+AlwaysPreTouch</benchmark.args>
     </properties>
     <prerequisites>
@@ -37,13 +37,13 @@
         <dependency>
             <groupId>com.typesafe.akka</groupId>
             <artifactId>akka-actor_2.11</artifactId>
-            <version>2.3.11</version>
+            <version>2.4-M2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>net.liftweb</groupId>
             <artifactId>lift-actor_2.11</artifactId>
-            <version>3.0-M5</version>
+            <version>3.0-M6</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -55,7 +55,7 @@
         <dependency>
             <groupId>org.scalaz</groupId>
             <artifactId>scalaz-concurrent_2.11</artifactId>
-            <version>7.1.1</version>
+            <version>7.1.3</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -87,10 +87,9 @@
                 <plugin>
                     <groupId>net.alchim31.maven</groupId>
                     <artifactId>scala-maven-plugin</artifactId>
-                    <version>3.2.0</version>
+                    <version>3.2.2</version>
                     <configuration>
                         <scalaVersion>${scala.version}</scalaVersion>
-                        <charset>${project.build.sourceEncoding}</charset>
                         <args>
                             <arg>-target:jvm-${java.major.version}</arg>
                             <arg>-optimise</arg>
@@ -102,13 +101,6 @@
                             <arg>-Xfuture</arg>
                             <arg>-Xlint</arg>
                         </args>
-                        <jvmArgs>
-                            <jvmArg>-server</jvmArg>
-                            <jvmArg>-Xms512m</jvmArg>
-                            <jvmArg>-Xmx512m</jvmArg>
-                            <jvmArg>-Xss1m</jvmArg>
-                            <jvmArg>-XX:+TieredCompilation</jvmArg>
-                        </jvmArgs>
                     </configuration>
                     <executions>
                         <execution>
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 213a30b..e70340c 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,3 +1,3 @@
-addSbtPlugin("com.typesafe.sbt" % "sbt-license-report" % "1.0.1")
+addSbtPlugin("com.typesafe.sbt" % "sbt-license-report" % "1.1.0")
 
 addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.1.8")
diff --git a/shippable.yml b/shippable.yml
index accd4c3..cd64600 100644
--- a/shippable.yml
+++ b/shippable.yml
@@ -1,6 +1,6 @@
 language: scala
 scala:
-  - 2.11.6
+  - 2.11.7
 jdk:
   - oraclejdk8
   - openjdk7