give up on publishing using JDK 1.6

Since we have `-target:jvm-1.6`, we should be ok.
This commit is contained in:
Eugene Yokota 2018-11-28 05:34:11 -05:00
parent ffa067e1ac
commit 92b4e7d484
4 changed files with 3 additions and 8 deletions

View File

@ -1 +1 @@
1.6
1.8

View File

@ -50,7 +50,7 @@ def commonSettings: Seq[Setting[_]] = Seq(
def minimalSettings: Seq[Setting[_]] =
commonSettings ++ customCommands ++
publishPomSettings ++ Release.javaVersionCheckSettings
publishPomSettings
def baseSettings: Seq[Setting[_]] =
minimalSettings ++ Seq(projectComponent) ++ baseScalacOptions ++ Licensed.settings ++ Formatting.settings

View File

@ -1,6 +1,5 @@
import sbt._
import Keys._
import com.typesafe.sbt.JavaVersionCheckPlugin.autoImport._
import _root_.bintray.BintrayPlugin.autoImport._
import _root_.bintray.InternalBintrayKeys._
@ -15,8 +14,4 @@ object Release {
repo.upload(bintrayPackage.value, version.value, launcherRemotePath.value, launcher.value, sLog.value)
}
)
def javaVersionCheckSettings = Seq(
javaVersionPrefix in javaVersionCheck := Some("1.6")
)
}

View File

@ -3,7 +3,7 @@ scalaVersion := "2.10.6"
addSbtPlugin("com.eed3si9n" % "sbt-doge" % "0.1.5")
addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.5.4")
addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "0.8.5")
addSbtPlugin("com.typesafe.sbt" % "sbt-javaversioncheck" % "0.1.0")
// addSbtPlugin("com.typesafe.sbt" % "sbt-javaversioncheck" % "0.1.0")
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")
addSbtPlugin("com.typesafe.sbt" % "sbt-scalariform" % "1.3.0") // 1.6.0 is out but is a hard upgrade
addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "0.8.2")