Merge branch 'topic/0.4.0_sbt1.0.0-M6' into wip/cross

# Conflicts: # .travis.yml
sbt · Jun 11, 2017 · 4ae76a7 · 4ae76a7
2 parents b0d9e37 + 25f8f0e
commit 4ae76a7
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,4 @@
 language: scala
 sudo: false
-script: sbt test
+script: sbt ++2.12.2 ^^1.0.0-M6 test
 jdk: oraclejdk8
diff --git a/build.sbt b/build.sbt
@@ -35,9 +35,3 @@ lazy val root = (project in file("."))
       "org.slf4j" % "slf4j-nop" % "1.7.7"), // https://github.com/softprops/bintray-sbt/issues/26
     resolvers += Resolver.sonatypeRepo("releases")
   )
-  .settings(
-    scalaVersion := "2.12.2",
-    sbtVersion in Global := "1.0.0-M5",
-    scalaCompilerBridgeSource :=
-      ("org.scala-sbt" % "compiler-interface" % "0.13.15" % "component").sources
-  )
diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.15
+sbt.version=0.13.16-M1