From 6bae5563684f33706855c9992d9a75149746db39 Mon Sep 17 00:00:00 2001
From: Antoine Gourlay <antoine@gourlay.fr>
Date: Sat, 26 Jul 2014 18:48:53 +0200
Subject: [PATCH] bump scala version: 2.11.2

---
 .travis.yml | 2 +-
 build.sbt   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index cd9e108e..40d1bdad 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,7 @@ language: scala
 script:
   - sbt ++$TRAVIS_SCALA_VERSION clean update compile test
 scala:
-  - 2.11.1
+  - 2.11.2
 jdk:
   - openjdk6
   - openjdk7
diff --git a/build.sbt b/build.sbt
index ea3f2b52..4c513616 100644
--- a/build.sbt
+++ b/build.sbt
@@ -6,7 +6,7 @@ name                       := "scala-parser-combinators"
 
 version                    := "1.0.3-SNAPSHOT"
 
-scalaVersion               := "2.11.1"
+scalaVersion               := "2.11.2"
 
 snapshotScalaBinaryVersion := "2.11"
 
@@ -24,7 +24,7 @@ libraryDependencies += "com.novocode" % "junit-interface" % "0.10" % "test"
 
 MimaPlugin.mimaDefaultSettings
 
-MimaKeys.previousArtifact := Some(organization.value % s"${name.value}_2.11" % "1.0.1")
+MimaKeys.previousArtifact := Some(organization.value % s"${name.value}_2.11" % "1.0.2")
 
 // run mima during tests
 test in Test := {