diff --git a/.java-version b/.java-version
new file mode 100644
index 000000000..625934097
--- /dev/null
+++ b/.java-version
@@ -0,0 +1 @@
+1.8
diff --git a/.travis.yml b/.travis.yml
index d1d78a0d1..ff0899634 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,11 @@
 language: scala
+
 scala:
   - 2.11.8
+  - 2.12.1
+
+script:
+  - sbt -Dfile.encoding=UTF8 -J-XX:ReservedCodeCacheSize=256M "++$TRAVIS_SCALA_VERSION test"
+
 jdk:
   - oraclejdk8
diff --git a/build.sbt b/build.sbt
index 1ff4aaa3d..81b9b1519 100644
--- a/build.sbt
+++ b/build.sbt
@@ -4,19 +4,19 @@ import com.typesafe.tools.mima.core._, ProblemFilters._
 def baseVersion = "0.1.0"
 
 def commonSettings: Seq[Setting[_]] = Seq(
-  scalaVersion := scala211,
+  scalaVersion := scala212,
   // publishArtifact in packageDoc := false,
   resolvers += Resolver.typesafeIvyRepo("releases"),
   resolvers += Resolver.sonatypeRepo("snapshots"),
   resolvers += "bintray-sbt-maven-releases" at "https://dl.bintray.com/sbt/maven-releases/",
   // concurrentRestrictions in Global += Util.testExclusiveRestriction,
   testOptions += Tests.Argument(TestFrameworks.ScalaCheck, "-w", "1"),
-  javacOptions in compile ++= Seq("-target", "6", "-source", "6", "-Xlint", "-Xlint:-serial"),
+  javacOptions in compile ++= Seq("-Xlint", "-Xlint:-serial"),
   incOptions := incOptions.value.withNameHashing(true),
-  crossScalaVersions := Seq(scala211),
+  crossScalaVersions := Seq(scala211, scala212),
   resolvers += Resolver.sonatypeRepo("public"),
   scalacOptions += "-Ywarn-unused",
-  previousArtifact := None, // Some(organization.value %% moduleName.value % "1.0.0"),
+  mimaPreviousArtifacts := Set(), // Some(organization.value %% moduleName.value % "1.0.0"),
   publishArtifact in Compile := true,
   publishArtifact in Test := false
 )
@@ -48,7 +48,7 @@ lazy val lm = (project in file("librarymanagement")).
       ivy, jsch, scalaReflect.value, launcherInterface, sjsonnewScalaJson % Optional),
     libraryDependencies ++= scalaXml.value,
     resourceGenerators in Compile += Def.task(Util.generateVersionFile(version.value, resourceManaged.value, streams.value, (compile in Compile).value)).taskValue,
-    binaryIssueFilters ++= Seq(),
+    mimaBinaryIssueFilters ++= Seq(),
     contrabandFormatsForType in generateContrabands in Compile := DatatypeConfig.getFormats,
     // WORKAROUND sbt/sbt#2205 include managed sources in packageSrc
     mappings in (Compile, packageSrc) ++= {
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 5403ebe05..8117fe756 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -3,6 +3,7 @@ import Keys._
 
 object Dependencies {
   val scala211 = "2.11.8"
+  val scala212 = "2.12.1"
 
   private val ioVersion = "1.0.0-M9"
   private val utilVersion = "1.0.0-M17"
diff --git a/project/house.sbt b/project/house.sbt
index 555559b37..bad061ebe 100644
--- a/project/house.sbt
+++ b/project/house.sbt
@@ -1 +1 @@
-addSbtPlugin("org.scala-sbt" % "sbt-houserules" % "0.3.1")
+addSbtPlugin("org.scala-sbt" % "sbt-houserules" % "0.3.2")