diff --git a/build.sbt b/build.sbt index 24200bc2..e3b5bb7d 100644 --- a/build.sbt +++ b/build.sbt @@ -34,6 +34,7 @@ lazy val root = (project in file(".")). ) lazy val app = (project in file("app")). + disablePlugins(BintrayPlugin). enablePlugins(ConscriptPlugin, BuildInfoPlugin, SonatypePublish). dependsOn(lib). settings( @@ -80,6 +81,7 @@ lazy val plugin = (project in file("plugin")). ) lazy val lib = (project in file("library")). + disablePlugins(BintrayPlugin). enablePlugins(SonatypePublish). settings( name := "giter8-lib", diff --git a/project/Publish.scala b/project/Publish.scala index 315a3c19..a0fd3b69 100644 --- a/project/Publish.scala +++ b/project/Publish.scala @@ -18,12 +18,12 @@ import sbt._ import sbt.Keys._ import bintray.{ BintrayKeys, BintrayPlugin } import com.typesafe.sbt.JavaVersionCheckPlugin +import JavaVersionCheckPlugin.autoImport._ /** * Publish to private bintray repository. */ object BintrayPublish extends AutoPlugin { - import JavaVersionCheckPlugin.autoImport._ override def trigger = allRequirements override def requires = plugins.JvmPlugin && BintrayPlugin && JavaVersionCheckPlugin @@ -44,14 +44,15 @@ object BintrayPublish extends AutoPlugin { * Publish to private bintray repository. */ object SonatypePublish extends AutoPlugin { - override def requires = plugins.JvmPlugin + override def requires = plugins.JvmPlugin && JavaVersionCheckPlugin override def projectSettings = Seq( publishTo := { val nexus = "https://oss.sonatype.org/" if (isSnapshot.value) Some("snapshots" at nexus + "content/repositories/snapshots") else Some("releases" at nexus + "service/local/staging/deploy/maven2") - } + }, + javaVersionPrefix in javaVersionCheck := Some("1.6") ) }