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

Add Release.javaVersionCheckSettings to Release.settings

This commit is contained in:
Eugene Yokota 2014-07-31 15:18:39 -04:00
parent 0a00d0625a
commit d06bd002ff
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
project/Release.scala
View File

@ -31,7 +31,7 @@ object Release extends Build {
// Note - This will eitehr issue a failure or succeed. // Note - This will eitehr issue a failure or succeed.
getCredentials(credentials.value, streams.value.log) getCredentials(credentials.value, streams.value.log)
} }
) ++ lameCredentialSettings ) ++ lameCredentialSettings ++ javaVersionCheckSettings
def snapshotPattern(version: String) = Resolver.localBasePattern.replaceAll("""\[revision\]""", version) def snapshotPattern(version: String) = Resolver.localBasePattern.replaceAll("""\[revision\]""", version)
def publishResolver: Project.Initialize[Option[Resolver]] = (remoteID, remoteBase) { (id, base) => def publishResolver: Project.Initialize[Option[Resolver]] = (remoteID, remoteBase) { (id, base) =>

2
project/Sbt.scala
View File

@ -290,7 +290,7 @@ object Sbt extends Build {
def releaseSettings = Release.settings(nonRoots, proguard in Proguard) def releaseSettings = Release.settings(nonRoots, proguard in Proguard)
def rootSettings = releaseSettings ++ fullDocSettings ++ LaunchProguard.settings ++ LaunchProguard.specific(launchSub) ++ def rootSettings = releaseSettings ++ fullDocSettings ++ LaunchProguard.settings ++ LaunchProguard.specific(launchSub) ++
Util.publishPomSettings ++ otherRootSettings ++ proguardedLauncherSettings ++ Formatting.sbtFilesSettings ++ Util.publishPomSettings ++ otherRootSettings ++ proguardedLauncherSettings ++ Formatting.sbtFilesSettings ++
Transform.conscriptSettings(launchSub) ++ Release.javaVersionCheckSettings Transform.conscriptSettings(launchSub)
def otherRootSettings = Seq( def otherRootSettings = Seq(
scripted <<= scriptedTask, scripted <<= scriptedTask,
scriptedUnpublished <<= scriptedUnpublishedTask, scriptedUnpublished <<= scriptedUnpublishedTask,