From 92b4e7d484287fe9440b7554c5eb7b1eab7b7b9b Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Wed, 28 Nov 2018 05:34:11 -0500 Subject: [PATCH] give up on publishing using JDK 1.6 Since we have `-target:jvm-1.6`, we should be ok. --- .java-version | 2 +- build.sbt | 2 +- project/Release.scala | 5 ----- project/plugins.sbt | 2 +- 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/.java-version b/.java-version index 810ee4e91..625934097 100644 --- a/.java-version +++ b/.java-version @@ -1 +1 @@ -1.6 +1.8 diff --git a/build.sbt b/build.sbt index dd0c5edec..8ff97ecf7 100644 --- a/build.sbt +++ b/build.sbt @@ -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 diff --git a/project/Release.scala b/project/Release.scala index 2c8d669fc..960bb38f3 100644 --- a/project/Release.scala +++ b/project/Release.scala @@ -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") - ) } diff --git a/project/plugins.sbt b/project/plugins.sbt index 64c25895d..b2a0bbf29 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -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")