From 6f28f08b78ba8cdeb9766247c5cfc15138c8d057 Mon Sep 17 00:00:00 2001 From: Josh Suereth Date: Wed, 4 Jun 2014 08:50:46 -0400 Subject: [PATCH] One more fix to release script. * Ensure completion is appropriately cross versioned * The publish launcher task should not try to publish the useless root project. --- project/Sbt.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/project/Sbt.scala b/project/Sbt.scala index f22136d94..6d97d15be 100644 --- a/project/Sbt.scala +++ b/project/Sbt.scala @@ -98,7 +98,7 @@ object Sbt extends Build { // Utilities related to reflection, managing Scala versions, and custom class loaders lazy val classpathSub = testedBaseProject(utilPath / "classpath", "Classpath") dependsOn (launchInterfaceSub, interfaceSub, ioSub) settings (scalaCompiler) // Command line-related utilities. - lazy val completeSub = testedBaseProject(utilPath / "complete", "Completion") dependsOn (collectionSub, controlSub, ioSub) settings (jline) + lazy val completeSub = testedBaseProject(utilPath / "complete", "Completion") dependsOn (collectionSub, controlSub, ioSub) settings (jline) settings (Util.crossBuild: _*) // logging lazy val logSub = testedBaseProject(utilPath / "log", "Logging") dependsOn (interfaceSub, processSub) settings (jline) // Relation @@ -304,7 +304,7 @@ object Sbt extends Build { moduleName := "sbt-launch", autoScalaLibrary := false, description := "sbt application launcher", - publishLauncher <<= publish, + publishLauncher <<= Release.deployLauncher, packageBin in Compile <<= (proguard in Proguard, Transform.conscriptConfigs).map((x, y) => x) )