luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4470 from eed3si9n/wip/publish-using-jdk8 

[0.13] give up on publishing using JDK 1.6
This commit is contained in:
eugene yokota 2018-11-29 01:35:04 -05:00 committed by GitHub
parent ffa067e1ac 92b4e7d484
commit 7782839fee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.java-version
View File

@ -1 +1 @@
1.6
1.8

2
build.sbt
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

5
project/Release.scala
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")
)
}

2
project/plugins.sbt
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")