diff --git a/project/Release.scala b/project/Release.scala index 11c5c2a0e..a7633e5e3 100644 --- a/project/Release.scala +++ b/project/Release.scala @@ -31,7 +31,7 @@ object Release extends Build { // Note - This will eitehr issue a failure or succeed. getCredentials(credentials.value, streams.value.log) } - ) ++ lameCredentialSettings + ) ++ lameCredentialSettings ++ javaVersionCheckSettings def snapshotPattern(version: String) = Resolver.localBasePattern.replaceAll("""\[revision\]""", version) def publishResolver: Project.Initialize[Option[Resolver]] = (remoteID, remoteBase) { (id, base) => diff --git a/project/Sbt.scala b/project/Sbt.scala index a72566412..5b2453dfb 100644 --- a/project/Sbt.scala +++ b/project/Sbt.scala @@ -290,7 +290,7 @@ object Sbt extends Build { def releaseSettings = Release.settings(nonRoots, proguard in Proguard) def rootSettings = releaseSettings ++ fullDocSettings ++ LaunchProguard.settings ++ LaunchProguard.specific(launchSub) ++ Util.publishPomSettings ++ otherRootSettings ++ proguardedLauncherSettings ++ Formatting.sbtFilesSettings ++ - Transform.conscriptSettings(launchSub) ++ Release.javaVersionCheckSettings + Transform.conscriptSettings(launchSub) def otherRootSettings = Seq( scripted <<= scriptedTask, scriptedUnpublished <<= scriptedUnpublishedTask,