Update to SBT 0.13.7

Author: baffles

project/Build.scala

@@ -29,16 +29,16 @@ import com.earldouglas.xsbtwebplugin._
 	import WebappPlugin._
 import Distributor.{ Keys => DistribKeys, distribSettings }
 import DependencyFetcher.dependencyFetcherSettings
-import sbtassembly.Plugin._
-	import AssemblyKeys._
+import sbtassembly.AssemblyPlugin._
+import sbtassembly.AssemblyKeys._
 
 object BuildDef extends Build with VersionSystem {
 
 	lazy val liftDependencies = Seq(lift_webkit, servletApi, logback, slf4j)
 	lazy val testDependencies = Seq(junit, specs, scalatest)
 	lazy val libDependencies = Seq(akka, reactive, commons.io, concLinkedHashMap, juniversalchardet, dependencyCheckCore) ++ asm ++ jackson ++ jna
 	lazy val dbDependencies = Seq(slick, h2)
-	
+
 	val baseCompilerSettings = Seq(
 		scalacOptions := List("-deprecation", "-unchecked", "-feature", "-target:jvm-1.6"),
 		scalaVersion := "2.10.4"
@@ -49,16 +49,16 @@ object BuildDef extends Build with VersionSystem {
 		version := "1.1.1",
 		releaseDate := "5/28/2014"
 	)
-	
+
 	val webappProjectSettings = WebPlugin.webSettings ++ Seq (
 		libraryDependencies ++= Seq(jettyWebapp, jettyOrbit)
 	)
 
 	val Bytefrog = file("bytefrog")
 	lazy val BytefrogAgent = ProjectRef(Bytefrog, "Agent")
 	lazy val BytefrogHQ = ProjectRef(Bytefrog, "HQ")
-	
-	/* This project contains the main application's source code (Lift App). 
+
+	/* This project contains the main application's source code (Lift App).
 	 */
 	lazy val Core = Project("CodePulse", file("codepulse"))
 		.dependsOn(BytefrogHQ)
@@ -75,4 +75,6 @@ object BuildDef extends Build with VersionSystem {
 			libraryDependencies ++= libDependencies,
 			libraryDependencies ++= dbDependencies
 		)
+
+	lazy val root = Project("root", file(".")).aggregate(Core)
 }

project/DependencyFetcher.scala

@@ -249,7 +249,7 @@ object DependencyFetcher extends BuildExtra {
 	}
 
 	object Settings {
-		def fetchDependenciesTask(dependencyList: TaskKey[Seq[Dependency]]): Initialize[Task[Unit]] = (dependencyList in Dependencies, streams) map { (deps, streams) =>
+		def fetchDependenciesTask(dependencyList: TaskKey[Seq[Dependency]]): Def.Initialize[Task[Unit]] = (dependencyList in Dependencies, streams) map { (deps, streams) =>
 			val log = streams.log
 
 			deps foreach {

project/Distributor.scala

@@ -25,14 +25,14 @@ import com.earldouglas.xsbtwebplugin.PluginKeys._
 import sbt.classpath.ClasspathUtilities
 import Project.Initialize
 
-import sbtassembly.Plugin.AssemblyKeys.assembly
+import sbtassembly.AssemblyKeys.assembly
 
 import java.nio.file.{ Files, StandardCopyOption }
 
 import com.avi.sbt.betterzip.BetterZip.{ Entry => ZipEntry, _ }
 
 /** In charge of packaging up the node-webkit packages for distribution.
-  * 
+  *
   * @author robertf
   */
 object Distributor extends BuildExtra {
@@ -44,7 +44,7 @@ object Distributor extends BuildExtra {
 
 		val rootZipFolder = SettingKey[String]("root-zip-folder")
 		val webappFolder = SettingKey[String]("webapp-folder")
-		
+
 		val distCommon = SettingKey[File]("dist-common")
 		val distJettyConf = SettingKey[File]("dist-jetty-conf")
 
@@ -57,20 +57,20 @@ object Distributor extends BuildExtra {
 	}
 
 	import Keys._
-	
+
 	object Settings {
 
 		/** Each task of this type generates a listing of File->Path, where the File is
 		  * a file in the filesystem that will be packaged in a zip/war/jar, and the Path
 		  * is that file's path once it is packaged.
 		  */
-		type FileMappingTask = Initialize[Task[Seq[(ZipEntry)]]]
+		type FileMappingTask = Def.Initialize[Task[Seq[(ZipEntry)]]]
 
 		def embeddedWar(conf: Configuration): FileMappingTask = (packageWar in conf, webappFolder in Distribution) map { (war, path) =>
 			Seq(war -> (path + "webapps/root.war"))
 		}
 
-		def webappClassesTask: Initialize[Task[Seq[(File, String)]]] = (warContents in Distribution) map { (contents) =>
+		def webappClassesTask: Def.Initialize[Task[Seq[(File, String)]]] = (warContents in Distribution) map { (contents) =>
 			val classPath = """WEB-INF[\\/]classes[\\/](.*)""".r
 
 			contents flatMap {
@@ -82,7 +82,7 @@ object Distributor extends BuildExtra {
 			}
 		}
 
-		def buildJarTask: Initialize[Task[File]] = (webappClasses in Distribution, crossTarget, name, version) map { (classes, ct, name, version) =>
+		def buildJarTask: Def.Initialize[Task[File]] = (webappClasses in Distribution, crossTarget, name, version) map { (classes, ct, name, version) =>
 			val jarToMake = ct / (name + '-' + version + "-webapp-classes.jar")
 			IO.jar(classes, jarToMake, new java.util.jar.Manifest)
 			jarToMake
@@ -100,36 +100,36 @@ object Distributor extends BuildExtra {
 			})
 		}
 
-		def jettyDist(platform: String): FileMappingTask = (jetty in Dependencies, distJettyConf in Distribution, rootZipFolder in Distribution, webappFolder in Distribution) map { (jetty, confDir, rootZipFolder, webappFolder) => 
+		def jettyDist(platform: String): FileMappingTask = (jetty in Dependencies, distJettyConf in Distribution, rootZipFolder in Distribution, webappFolder in Distribution) map { (jetty, confDir, rootZipFolder, webappFolder) =>
 			if (!jetty.exists)
 				sys.error("Missing jetty. Please run `fetch-package-dependencies` or download and place in " + jetty + ".")
 
 			val jettyExclusions = List(
 				"demo-base/", "etc/", "start.d/", "start.ini"
 			).map(webappFolder + _)
 
-			val jettyFiles = jetty.*** x rebase(jetty, webappFolder) map {
+			val jettyFiles = jetty.*** pair rebase(jetty, webappFolder) map {
 				// replace \ in paths with /, for easier matching below
 				case (src, dest) => (src, dest.replace('\\', '/'))
 			} filter {
 				case (_, path) if jettyExclusions exists { path startsWith _ } => println("Excluding " + path); false
 				case _ => true
 			}
 
-			val jettyConf = confDir.*** x rebase(confDir, webappFolder)
+			val jettyConf = confDir.*** pair rebase(confDir, webappFolder)
 
 			appResource(platform, rootZipFolder, jettyFiles ++ jettyConf)
 		}
 
 		def embeddedAppFiles(platform: String): FileMappingTask = (distCommon in Distribution, rootZipFolder in Distribution) map { (appFolder, rootZipFolder) =>
-			appResource(platform, rootZipFolder, appFolder.*** x rebase(appFolder, rootZipFolder))
+			appResource(platform, rootZipFolder, appFolder.*** pair rebase(appFolder, rootZipFolder))
 		}
 
 		def nodeWebkitRuntime(platform: String, nwkKey: SettingKey[File]): FileMappingTask = (nwkKey in Dependencies, resourcer in Dependencies, rootZipFolder in Distribution, distCommon in Distribution, target, version) map { (nwk, resourcer, rootZipFolder, appFolder, target, version) =>
 			if (!nwk.exists)
 				sys.error("Missing node-webkit for " + platform + ". Please run `fetch-package-dependencies` or download and place in " + nwk + ".")
 
-			val nwkFiles: Seq[ZipEntry] = nwk.*** x rebase(nwk, rootZipFolder) map {
+			val nwkFiles: Seq[ZipEntry] = nwk.*** pair rebase(nwk, rootZipFolder) map {
 				// replace \ in paths with /, for easier matching below
 				case (src, dest) => (src, dest.replace('\\', '/'))
 			}
@@ -169,7 +169,7 @@ object Distributor extends BuildExtra {
 							Some(ZipEntry(customizedFile, "codepulse/codepulse.exe", mode))
 
 						case e @ ZipEntry(_, path, _) if inclusions contains path => Some(e)
-						
+
 						case ZipEntry(_, path, _) if path endsWith "/" => None // silent
 						case ZipEntry(_, path, _) => println("Excluding " + path); None
 					}
@@ -217,7 +217,7 @@ object Distributor extends BuildExtra {
 
 						case ZipEntry(file, path, mode) if path startsWith "codepulse/node-webkit.app" =>
 							Some(ZipEntry(file, rewritePath(path), mode))
-						
+
 						case ZipEntry(_, path, _) if path endsWith "/" => None // silent
 						case ZipEntry(_, path, _) => println("Excluding " + path); None
 					}
@@ -240,7 +240,7 @@ object Distributor extends BuildExtra {
 			if (!jre.exists)
 				sys.error("Missing JRE for " + platform + ". Please run `fetch-package-dependencies` or download and place in " + jre + ".")
 
-			val jreFiles: Seq[ZipEntry] = appResource(platform, rootZipFolder, jre.*** x rebase(jre, jreDest)) map {
+			val jreFiles: Seq[ZipEntry] = appResource(platform, rootZipFolder, jre.*** pair rebase(jre, jreDest)) map {
 				// replace \ in paths with /, for easier matching below
 				case (src, dest) => (src, dest.replace('\\', '/'))
 			}
@@ -296,7 +296,7 @@ object Distributor extends BuildExtra {
 
 						case e @ ZipEntry(_, path, _) if !(exclusions contains path) && !exclusionDirs.exists(path.startsWith) =>
 							Some(e)
-						
+
 						case ZipEntry(_, path, _) if path endsWith "/" => None // silent
 						case ZipEntry(_, path, _) => println("Excluding " + path); None
 					}
@@ -308,7 +308,7 @@ object Distributor extends BuildExtra {
 						"bin/rmid", "bin/rmiregistry", "bin/tnameserv", "bin/keytool", "bin/policytool", "bin/orbd", "bin/servertool",
 						"bin/ControlPanel", "bin/javaws",
 						"lib/javafx.properties", "lib/jfxrt.jar", "lib/security/javafx.policy",
-						"lib/i386/fxavcodecplugin-52.so", "lib/i386/fxavcodecplugin-53.so", "lib/i386/fxplugins.so", "lib/i386/libglass.so", "lib/i386/libgstplugins-lite.so", "lib/i386/libgstreamer-lite.so", "lib/i386/libjavafx-font.so", "lib/i386/libjavafx-iio.so", "lib/i386/libjfxmedia.so", "lib/i386/libjfxwebkit.so", "lib/i386/libprism-es2.so", 
+						"lib/i386/fxavcodecplugin-52.so", "lib/i386/fxavcodecplugin-53.so", "lib/i386/fxplugins.so", "lib/i386/libglass.so", "lib/i386/libgstplugins-lite.so", "lib/i386/libgstreamer-lite.so", "lib/i386/libjavafx-font.so", "lib/i386/libjavafx-iio.so", "lib/i386/libjfxmedia.so", "lib/i386/libjfxwebkit.so", "lib/i386/libprism-es2.so",
 						"THIRDPARTYLICENSEREADME-JAVAFX.txt", "Welcome.html"
 					).map(base + _).toSet
 
@@ -322,7 +322,7 @@ object Distributor extends BuildExtra {
 
 						case e @ ZipEntry(_, path, _) if !(exclusions contains path) && !exclusionDirs.exists(path.startsWith) =>
 							Some(e)
-						
+
 						case ZipEntry(_, path, _) if path endsWith "/" => None // silent
 						case ZipEntry(_, path, _) => println("Excluding " + path); None
 					}
@@ -365,18 +365,18 @@ object Distributor extends BuildExtra {
 				out
 			}
 		)}
-	
-	lazy val distribSettings: Seq[Setting[_]] = 
+
+	lazy val distribSettings: Seq[Setting[_]] =
 		Seq(
 			rootZipFolder in Distribution := "codepulse/",
 			webappFolder in Distribution <<= (rootZipFolder in Distribution) { _ + "backend/" },
-			
+
 			distCommon in Distribution := file("distrib/common"),
 			distJettyConf in Distribution := file("distrib/jetty-conf"),
-			
+
 			webappClasses in Distribution <<= webappClassesTask,
 			webappClassesJar in Distribution <<= buildJarTask
-		) ++ 
+		) ++
 		inConfig(DefaultConf) { warContents in Distribution <<= com.earldouglas.xsbtwebplugin.WarPlugin.packageWarTask(DefaultClasspathConf) } ++
 		packageEmbeddedSettingsIn("win32", nwkWindows, jreWindows, packageEmbeddedWin32)(Compile) ++
 		packageEmbeddedSettingsIn("osx", nwkOsx, jreOsx, packageEmbeddedOsx)(Compile) ++

project/build.properties

@@ -1 +1 @@
-sbt.version = 0.12.4
+sbt.version = 0.13.7

project/plugins.sbt

@@ -1,16 +1,14 @@
-//webplugin
-addSbtPlugin("com.earldouglas" % "xsbt-web-plugin" % "0.5.0")
+// webplugin
+addSbtPlugin("com.earldouglas" % "xsbt-web-plugin" % "0.9.0")
 
-//eclipse plugin
-addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "2.1.1")
+// sbt-eclipse
+addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "2.5.0")
 
 //IntelliJ IDEA plugin
 addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.6.0")
 
 //sbt-dependency-graph
 addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.7.4")
 
-// Resolver for the sbt-assembly plugin
-resolvers += Resolver.url("artifactory", url("http://scalasbt.artifactoryonline.com/scalasbt/sbt-plugin-releases"))(Resolver.ivyStylePatterns)
-
-addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.8.5")
+// sbt-assembly
+addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.12.0")

project/project/Build.scala

@@ -26,5 +26,5 @@ object PluginDef extends Build {
 		sbt.Keys.libraryDependencies += "org.apache.commons" % "commons-compress" % "1.6",
 		sbt.Keys.libraryDependencies += "commons-io" % "commons-io" % "2.1"
 	)
-	lazy val betterzipPlugin = file("sbt-betterzip")
+	lazy val betterzipPlugin = RootProject(file("sbt-betterzip"))
 }

project/sbt-betterzip/sbt-betterzip.sbt

@@ -4,10 +4,6 @@ organization := "com.secdec"
 
 version := "0.1"
 
-scalaVersion := "2.9.2"
-
-crossScalaVersions := Seq("2.9.1", "2.9.2")
-
 sbtPlugin := true
 
 libraryDependencies += "org.apache.commons" % "commons-compress" % "1.6"

project/sbt-betterzip/src/main/scala/com/avi/sbt/betterzip/BetterZip.scala

@@ -23,6 +23,8 @@ import sbt.ErrorHandling.translate
 import sbt.Using._
 
 import scala.annotation.tailrec
+import scala.language.implicitConversions
+
 import java.io.File
 
 import org.apache.commons.compress.archivers.zip.{ AsiExtraField, ZipArchiveEntry, ZipArchiveOutputStream }