diff --git a/.gitignore b/.gitignore
index 2532f2ba..2f7896d1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-/project/project/
target/
diff --git a/.travis.yml b/.travis.yml
index 3f73a7c4..fd7a3d4f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,7 @@ language: scala
jdk:
# - openjdk6
- - oraclejdk7
+ - oraclejdk8
sudo: false
@@ -11,9 +11,9 @@ env:
- JVM_OPTS="-Xms1024m -Xmx1024m -XX:ReservedCodeCacheSize=128m -XX:MaxPermSize=256m"
script:
- - sbt "^ test"
- - sbt "^ publishLocal"
- - sbt "^ it:test"
+ - sbt "test"
+ - sbt "publishLocal"
+ - sbt "it:test"
notifications:
email:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b115ff23..4f4feab3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,24 @@
# dbuild release notes
+### 0.9.7
+
+- This release is compatible with sbt 1.0.0-M4. The source
+ code and the build files have been reorganized, and
+ moved to the .sbt format. The supported sbt versions are
+ 1.0.0-M4 and 0.13.*; support for the old 0.12.4 has
+ been removed.
+
+- Fixes for issues #190, #158, #188
+
+- The dbuild sbt plugin .pom no longer directly refers to
+ sbt jars, but uses those provided by the running sbt
+ environment. Fixes scala/community-builds#384.
+
+### 0.9.6
+
+- Fixed the "deploy" option when the target is a Bintray
+ repository.
+
### 0.9.5
- It is now possible to use different versions of the JDK on the
diff --git a/README.md b/README.md
index ae18bcec..c76127a4 100644
--- a/README.md
+++ b/README.md
@@ -12,15 +12,9 @@ though each of them may evolve independently.
You can find the complete dbuild documentation at the
[dbuild web site](http://typesafehub.github.com/dbuild).
-To recompile, publish, etc., just type the following in the root project:
-
- ^command
-
-where command is one of compile, clean, test, publish, publishLocal, etc.
-
To create a dbuild release (if you belong to the Typesafe organization on Bintray):
-1. Type "^release" (please do not use "^publish", as some additional preparation is necessary)
+1. Type "release" (please do not use "^publish", as some additional preparation is necessary)
2. Check https://bintray.com/typesafe/ivy-releases/dbuild/view to ensure files are as expected (Optional)
3. Type "root/bintrayRelease" to make the release public
@@ -43,8 +37,13 @@ Bintray yet, you can use:
set every publishTo := Some(Resolver.url("somelabel", new URL("http://artifactoryhost/artifactory/repository/"))(Resolver.ivyStylePatterns))
set every credentials := Seq(Credentials(Path.userHome / "some" / "path" / "credentials-file"))
-Then, proceed with "^release" as usual to issue the snapshot to your Artifactory server.
+Then, proceed with "release" as usual to issue the snapshot to your Artifactory server.
+IMPORTANT: the publishing process needs to be repeated twice, changing
+project/build.properties in the meantime, in order to publish artifacts
+for both sbt 0.13/scala 2.10 and sbt 1.0/scala 2.11 (currently 1.0.0-M4)
+All the artifacts are published for 2.10, while only those relevant to
+the sbt plugin are published for 2.11.
## Get Involved
diff --git a/adapter/src/main/scala-2.10/Adapter.scala b/adapter/src/main/scala-2.10/Adapter.scala
new file mode 100644
index 00000000..121a9cb5
--- /dev/null
+++ b/adapter/src/main/scala-2.10/Adapter.scala
@@ -0,0 +1,55 @@
+package sbt.dbuild.hack {
+object DbuildHack {
+ val Load = sbt.Load
+}
+}
+
+package com.typesafe.dbuild.adapter {
+import java.io.File
+
+object LoggingInterface {
+ val Level = sbt.Level
+ type Logger = sbt.Logger
+ type LogEvent = sbt.LogEvent
+ val ControlEvent = sbt.ControlEvent
+ val StackTrace = sbt.StackTrace
+ type BasicLogger = sbt.BasicLogger
+}
+
+import LoggingInterface.Level._
+trait StreamLoggerAdapter {
+ def log(level: Value, message: => String): Unit
+ def log(label: String, message: String): Unit
+ def err(s: => String): Unit = log(Error, s)
+ def out(s: => String): Unit = log(Info.toString, s)
+}
+
+object Adapter {
+ val IO = sbt.IO
+ val Path = sbt.Path
+ type RichFile = sbt.RichFile
+ type FileFilter = sbt.FileFilter
+ def toFF = sbt.FileFilter.globFilter _
+ val DirectoryFilter = sbt.DirectoryFilter
+ type ExactFilter = sbt.ExactFilter
+ type NameFilter = sbt.NameFilter
+ type FileRepository = sbt.FileRepository
+ type Logger = sbt.Logger
+ import Path._
+ def allPaths(f:File) = sbt.PathFinder(f).***
+ val syntax = new {}
+ val syntaxio = syntax
+ type ModuleID = sbt.ModuleID
+ type Artifact = sbt.Artifact
+ type ProjectResolver = sbt.ProjectResolver
+ type ScalaInstance = sbt.ScalaInstance
+ lazy val ScalaInstance = sbt.ScalaInstance
+ lazy val Load = sbt.dbuild.hack.DbuildHack.Load
+ val applyCross: (String, Option[String => String]) => String =
+ sbt.CrossVersion.applyCross
+ def defaultID(base: File, prefix: String = "default") =
+ sbt.Build.defaultID(base, prefix)
+ def scalaInstance(libraryJar: File, compilerJar: File, launcher: xsbti.Launcher, extraJars: File*): ScalaInstance =
+ ScalaInstance(libraryJar, compilerJar, launcher, extraJars:_*)
+}
+}
diff --git a/adapter/src/main/scala-2.11/Adapter.scala b/adapter/src/main/scala-2.11/Adapter.scala
new file mode 100644
index 00000000..2a3542fb
--- /dev/null
+++ b/adapter/src/main/scala-2.11/Adapter.scala
@@ -0,0 +1,86 @@
+package sbt.dbuild.hack {
+object DbuildHack {
+ val Load = sbt.internal.Load
+ val applyCross: (String, Option[String => String]) => String =
+ sbt.librarymanagement.CrossVersion.applyCross
+ val defaultID: (java.io.File,String) => String =
+ sbt.internal.BuildDef.defaultID
+}
+}
+package com.typesafe.dbuild.adapter {
+import java.io.File
+
+object LoggingInterface {
+ val Level = sbt.util.Level
+ type Logger = sbt.util.Logger
+ type LogEvent = sbt.util.LogEvent
+ val ControlEvent = sbt.util.ControlEvent
+ val StackTrace = sbt.internal.util.StackTrace
+ type BasicLogger = sbt.internal.util.BasicLogger
+}
+
+trait StreamLoggerAdapter
+
+object Adapter {
+ val IO = sbt.io.IO
+ val Path = sbt.io.Path
+ type RichFile = sbt.io.RichFile
+ type FileFilter = sbt.io.FileFilter
+ def toFF = sbt.io.FileFilter.globFilter _
+ val DirectoryFilter = sbt.io.DirectoryFilter
+ type ExactFilter = sbt.io.ExactFilter
+ type NameFilter = sbt.io.NameFilter
+ type FileRepository = sbt.librarymanagement.FileRepository
+ type Logger = sbt.util.Logger
+ def allPaths(f:File) = sbt.io.PathFinder(f).allPaths
+ val syntaxio = sbt.io.syntax
+ val syntax = sbt.syntax
+ type ModuleID = sbt.librarymanagement.ModuleID
+ type Artifact = sbt.librarymanagement.Artifact
+ type ProjectResolver = sbt.internal.librarymanagement.ProjectResolver
+ type ScalaInstance = sbt.internal.inc.ScalaInstance
+ val ScalaInstance = sbt.internal.inc.ScalaInstance
+ val Load = sbt.dbuild.hack.DbuildHack.Load
+ val applyCross = sbt.dbuild.hack.DbuildHack.applyCross
+ def defaultID(base: File, prefix: String = "default") =
+ sbt.dbuild.hack.DbuildHack.defaultID(base, prefix)
+
+// these bits are inappropriately copied from zinc v1.0.0-X1, where they
+// are private now, and exactly from:
+// internal/zinc-classpath/src/main/scala/sbt/internal/inc/ScalaInstance.scala
+ private val VersionPrefix = "version "
+ private def fastActualVersion(scalaLoader: ClassLoader): String =
+ {
+ val stream = scalaLoader.getResourceAsStream("compiler.properties")
+ try {
+ val props = new java.util.Properties
+ props.load(stream)
+ props.getProperty("version.number")
+ } finally stream.close()
+ }
+ import java.net.{ URL, URLClassLoader }
+ private def scalaLoader(launcher: xsbti.Launcher): Seq[File] => ClassLoader = jars =>
+ new URLClassLoader(jars.map(_.toURI.toURL).toArray[URL], launcher.topLoader)
+ private def actualVersion(scalaLoader: ClassLoader)(label: String) =
+ try fastActualVersion(scalaLoader)
+ catch { case e: Exception => slowActualVersion(scalaLoader)(label) }
+ private def slowActualVersion(scalaLoader: ClassLoader)(label: String) =
+ {
+ val v = try { Class.forName("scala.tools.nsc.Properties", true, scalaLoader).getMethod("versionString").invoke(null).toString }
+ catch { case cause: Exception => throw new sbt.internal.inc.InvalidScalaInstance("Scala instance doesn't exist or is invalid: " + label, cause) }
+ if (v.startsWith(VersionPrefix)) v.substring(VersionPrefix.length) else v
+ }
+//
+// The code below was deprecated and has been removed from ScalaInstance in zinc 1.0.x,
+// however it may work for us.
+//
+// TODO: use one of the currently supported variants of ScalaInstance.apply()
+//
+ def scalaInstance(libraryJar: File, compilerJar: File, launcher: xsbti.Launcher, extraJars: File*): ScalaInstance = {
+ val classLoader = scalaLoader(launcher)
+ val loader = classLoader(libraryJar :: compilerJar :: extraJars.toList)
+ val version = actualVersion(loader)(" (library jar " + libraryJar.getAbsolutePath + ")")
+ new ScalaInstance(VersionPrefix, loader, libraryJar, compilerJar, extraJars.toArray, None)
+ }
+}
+}
diff --git a/build.sbt b/build.sbt
new file mode 100644
index 00000000..f336e1c6
--- /dev/null
+++ b/build.sbt
@@ -0,0 +1,228 @@
+import Dependencies._
+
+def MyVersion: String = "0.9.7-RC1"
+
+def SubProj(name: String) = (
+ Project(name, file(if (name=="root") "." else name))
+ configs( IntegrationTest )
+ settings( Defaults.itSettings : _*)
+ settings(
+ version := MyVersion,
+ organization := "com.typesafe.dbuild",
+ selectScalaVersion,
+ libraryDependencies += specs2,
+ resolvers += Resolver.typesafeIvyRepo("releases"),
+ resolvers += "Typesafe Repository" at "http://repo.typesafe.com/typesafe/releases/",
+ publishMavenStyle := false,
+ licenses += ("Apache-2.0", url("http://opensource.org/licenses/Apache-2.0")),
+ bintrayReleaseOnPublish := false,
+ bintrayOrganization := Some("typesafe"),
+ bintrayRepository := "ivy-releases",
+ bintrayPackage := "dbuild"
+ )
+)
+
+import RemoteDepHelper._
+
+def skip211 = Seq(
+ skip in compile := scalaVersion.value.startsWith("2.11"),
+ sources in doc in Compile :=
+ { if((skip in compile).value) List() else (sources in doc in Compile).value }
+ )
+
+def selectScalaVersion =
+ scalaVersion := {
+ val sb = (sbtVersion in sbtPlugin).value
+ if (sb.startsWith("0.13")) "2.10.6" else "2.11.8"
+ }
+
+lazy val root = (
+ SubProj("root")
+ aggregate(adapter, graph, hashing, logging, actorLogging, proj, actorProj, deploy,
+ core, plugin, build, support, supportGit, repo, metadata, docs, dist, indexmeta)
+ settings(publish := (), publishLocal := (), version := MyVersion)
+ //settings(CrossPlugin.crossBuildingSettings:_*)
+ //settings(CrossBuilding.crossSbtVersions := Seq("0.13","1.0.0-M4"), selectScalaVersion)
+ settings(commands += Command.command("release") { state =>
+ "clean" :: "publish" :: state
+ })
+)
+
+// This subproject only has dynamically
+// generated source files, used to adapt
+// the source file to sbt 0.13/1.0
+lazy val adapter = (
+ SubProj("adapter")
+ dependsOnSbtProvided(sbtLogging, sbtIo, sbtLaunchInt, sbtIvy, sbtSbt)
+ dependsOnRemote(zincProvidedIf211:_*)
+ settings(sourceGenerators in Compile += task {
+ val dir = (sourceManaged in Compile).value
+ val fileName = "Default.scala"
+ val file = dir / fileName
+ val sv = scalaVersion.value
+ val v = sbtVersion.value
+ if(!dir.isDirectory) dir.mkdirs()
+ IO.write(file, (
+"""
+package com.typesafe.dbuild.adapter
+object Defaults {
+ val version = "%s"
+ val org = "%s"
+ val hash = "%s"
+}
+""" format (version.value, organization.value, scala.sys.process.Process("git log --pretty=format:%H -n 1").lines.head))
+
+)
+ Seq(file)
+ })
+)
+
+lazy val graph = (
+ SubProj("graph")
+)
+
+lazy val hashing = (
+ SubProj("hashing")
+ dependsOnRemote(typesafeConfig)
+)
+
+lazy val indexmeta = (
+ SubProj("indexmeta")
+)
+
+lazy val logging = (
+ SubProj("logging")
+ dependsOn(adapter,graph)
+ dependsOnSbtProvided(sbtLogging, sbtIo, sbtLaunchInt)
+)
+
+lazy val actorLogging = (
+ SubProj("actorLogging")
+ dependsOn(logging)
+ dependsOnRemote(akkaActor)
+ dependsOnSbtProvided(sbtLogging, sbtIo, sbtLaunchInt)
+ settings(skip211:_*)
+)
+
+lazy val metadata = (
+ SubProj("metadata")
+ dependsOn(graph, hashing, indexmeta, deploy)
+ dependsOnRemote(jackson, typesafeConfig, commonsLang, jacks)
+)
+
+lazy val repo = (
+ SubProj("repo")
+ dependsOn(adapter, metadata, logging)
+ dependsOnRemote(mvnAether, dispatch, aether, aetherApi, aetherSpi, aetherUtil, aetherImpl, aetherConnectorBasic, aetherFile, aetherHttp, aetherWagon, mvnAether)
+ dependsOnSbtProvided(sbtIo, sbtLaunchInt, sbtLogging)
+)
+
+lazy val core = (
+ SubProj("core")
+ dependsOnRemote(javaMail)
+ dependsOn(adapter,metadata, graph, hashing, logging, repo)
+ dependsOnSbtProvided(sbtIo, sbtLogging)
+)
+
+lazy val proj = (
+ SubProj("proj")
+ dependsOn(core, repo, logging)
+ dependsOnRemote(javaMail, commonsIO)
+ dependsOnSbtProvided(sbtIo, sbtIvy)
+)
+
+lazy val actorProj = (
+ SubProj("actorProj")
+ dependsOn(core, actorLogging, proj)
+ dependsOnSbtProvided(sbtIo, sbtIvy)
+ settings(skip211:_*)
+)
+
+lazy val support = (
+ SubProj("support")
+ dependsOn(core, repo, metadata, proj % "compile->compile;it->compile", logging % "it")
+ dependsOnRemote(mvnEmbedder, mvnWagon, javaMail, aether, aetherApi, aetherSpi, aetherUtil,
+ aetherImpl, aetherConnectorBasic, aetherFile, aetherHttp, slf4jSimple, ivy)
+ dependsOnSbtProvided(sbtLaunchInt, sbtIvy)
+ settings(SbtSupport.buildSettings:_*)
+ settings(SbtSupport.settings:_*)
+ settings(
+ // We hook the testLoader of it to make sure all the it tasks have a legit sbt plugin to use.
+ // Technically, this just pushes every project. We could outline just the plugin itself, but for now
+ // we don't care that much.
+ testLoader in IntegrationTest := {
+ val ignore = publishLocal.all(ScopeFilter(inAggregates(LocalRootProject, includeRoot=false))).value
+ (testLoader in IntegrationTest).value
+ },
+ parallelExecution in IntegrationTest := false
+ )
+)
+
+// A separate support project for git/jgit
+lazy val supportGit = (
+ SubProj("supportGit")
+ dependsOn(core, repo, metadata, proj, support)
+ dependsOnRemote(mvnEmbedder, mvnWagon, javaMail, jgit)
+ dependsOnSbtProvided(sbtLaunchInt, sbtIvy)
+ settings(SbtSupport.buildSettings:_*)
+ settings(SbtSupport.settings:_*)
+ settings(skip211:_*)
+)
+
+// SBT plugin
+lazy val plugin = (
+ SubProj("plugin")
+ settings(sbtPlugin := true)
+ dependsOn(adapter, support, metadata)
+ dependsOnSbtProvided(sbtIo)
+)
+
+lazy val dist = (
+ SubProj("dist")
+ settings(Packaging.settings(build,repo):_*)
+)
+
+lazy val deploy = (
+ SubProj("deploy")
+ dependsOn(adapter)
+ dependsOnRemote(jackson, typesafeConfig, commonsLang, aws, uriutil, dispatch, commonsIO, jsch, jacks)
+ dependsOnSbtProvided(sbtLogging, sbtIo)
+)
+
+lazy val build = (
+ SubProj("build")
+ dependsOn(actorProj, support, supportGit, repo, metadata, deploy, proj)
+ dependsOnRemote(aws, uriutil, dispatch, jsch, oro, scallop, commonsLang)
+ dependsOnRemote(gpgLibIf210:_*)
+ dependsOnSbt(sbtLaunchInt, sbtLauncher, sbtLogging, sbtIo, sbtIvy, sbtSbt)
+ settings(skip211:_*)
+ settings(SbtSupport.settings:_*)
+ settings(
+ // We hook the testLoader of it to make sure all the it tasks have a legit sbt plugin to use.
+ // Technically, this just pushes every project. We could outline just the plugin itself, but for now
+ // we don't care that much.
+ testLoader in IntegrationTest := {
+ val ignore = publishLocal.all(ScopeFilter(inAggregates(LocalRootProject, includeRoot=false))).value
+ (testLoader in IntegrationTest).value
+ },
+ parallelExecution in IntegrationTest := false
+ )
+)
+
+lazy val docs:sbt.Project = (
+ SubProj("docs")
+ settings(DocsSupport.settings:_*)
+/*
+ settings(makeSite := Def.sequential(
+ task {
+ val file = (sourceDirectory in sphynx).value / "version.py"
+ val sv = scalaVersion.value
+ val v = sbtVersion.value
+ IO.write(sourceDirectory.value, ("release = '%s'\n" format (version.value)))
+ Seq(file)
+ },
+ makeSite.value
+ ))
+*/
+)
+
diff --git a/build/src/it/scala/com/typesafe/dbuild/build/RewireSpec.scala b/build/src/it/scala/com/typesafe/dbuild/build/RewireSpec.scala
index fe59bb7e..b579ef3b 100644
--- a/build/src/it/scala/com/typesafe/dbuild/build/RewireSpec.scala
+++ b/build/src/it/scala/com/typesafe/dbuild/build/RewireSpec.scala
@@ -28,7 +28,7 @@ object RewireSpec extends Specification {
| check-missing: [false, false, false]
| cross-version: standard
| space: test
- | sbt-version: "0.13.7-M1"
+ | sbt-version: "0.13.8"
| extraction-version: "2.11.1"
| projects: [
| {
diff --git a/build/src/main/scala/com/typesafe/dbuild/build/Comparison.scala b/build/src/main/scala/com/typesafe/dbuild/build/Comparison.scala
index c891390d..3944e2d3 100644
--- a/build/src/main/scala/com/typesafe/dbuild/build/Comparison.scala
+++ b/build/src/main/scala/com/typesafe/dbuild/build/Comparison.scala
@@ -1,7 +1,9 @@
package com.typesafe.dbuild.build
import sbt._
-import Path._
+import com.typesafe.dbuild.adapter.Adapter
+import Adapter.{IO,allPaths}
+import Adapter.syntaxio._
import com.typesafe.dbuild.model._
import com.typesafe.dbuild.logging.Logger
import java.io.File
@@ -13,6 +15,7 @@ import java.util.jar.JarFile
import java.util.jar.JarEntry
import java.io.FileInputStream
import org.apache.oro.text.regex
+import com.typesafe.dbuild.model.SeqStringH._
class Comparison(options: GeneralOptions, log: Logger) extends OptionTask(log) {
def id = "Comparison"
@@ -191,4 +194,4 @@ object JarFiles {
}
}
-}
\ No newline at end of file
+}
diff --git a/build/src/main/scala/com/typesafe/dbuild/build/DeployBuild.scala b/build/src/main/scala/com/typesafe/dbuild/build/DeployBuild.scala
index 9c467cde..ef0f1835 100644
--- a/build/src/main/scala/com/typesafe/dbuild/build/DeployBuild.scala
+++ b/build/src/main/scala/com/typesafe/dbuild/build/DeployBuild.scala
@@ -1,7 +1,10 @@
package com.typesafe.dbuild.build
import sbt._
-import Path._
+import com.typesafe.dbuild.adapter.Adapter
+import Adapter.IO
+import Adapter.syntaxio._
+import Adapter.allPaths
import com.typesafe.dbuild.model._
import com.typesafe.dbuild.repo.core._
import java.io.File
@@ -122,7 +125,7 @@ class DeployBuild(options: GeneralOptions, log: Logger) extends OptionTask(log)
new PGPSecretKeyRing(new java.io.FileInputStream(secretRingFile)).getSecretKey
}
if (secretKey == null) sys.error("The key was not found in the pgp keyring.")
- (dir.***).get.filter(f => !f.isDirectory && isNotChecksum(f.getName)) foreach { f =>
+ (allPaths(dir)).get.filter(f => !f.isDirectory && isNotChecksum(f.getName)) foreach { f =>
SecretKey(secretKey).sign(f, new File(f.getAbsolutePath() + ".asc"), passPhrase.toArray)
}
}
diff --git a/build/src/main/scala/com/typesafe/dbuild/build/LocalBuildMain.scala b/build/src/main/scala/com/typesafe/dbuild/build/LocalBuildMain.scala
index 2a7b7106..aefa6a87 100644
--- a/build/src/main/scala/com/typesafe/dbuild/build/LocalBuildMain.scala
+++ b/build/src/main/scala/com/typesafe/dbuild/build/LocalBuildMain.scala
@@ -2,9 +2,9 @@ package com.typesafe.dbuild.build
import java.io.File
import akka.actor.{ ActorSystem, Props }
-import akka.dispatch.Await
+import scala.concurrent.Await
import akka.util.Timeout
-import akka.util.duration._
+import scala.concurrent.duration._
import com.typesafe.dbuild.model._
import com.typesafe.dbuild.model.Utils.{ readValue, writeValue }
import com.typesafe.dbuild.repo.core._
@@ -12,7 +12,6 @@ import com.typesafe.dbuild.model.ClassLoaderMadness
import com.typesafe.dbuild.project.dependencies.Extractor
import com.typesafe.dbuild.support.BuildSystemCore
import akka.pattern.ask
-import akka.util.duration._
import com.typesafe.dbuild.repo.core.GlobalDirs.checkForObsoleteDirs
import com.typesafe.dbuild.support
import com.typesafe.dbuild.logging
@@ -55,11 +54,11 @@ class LocalBuildMain(repos: List[xsbti.Repository], options: BuildRunOptions) {
def build(conf: DBuildConfiguration, confName: String, buildTarget: Option[String]): BuildOutcome = {
implicit val timeout: Timeout = Timeouts.dbuildTimeout
val result = builder ? RunLocalBuild(conf, confName, buildTarget)
- Await.result(result.mapTo[BuildOutcome], akka.util.Duration.Inf)
+ Await.result(result.mapTo[BuildOutcome], Duration.Inf)
}
def dispose(): Unit = {
implicit val timeout: Timeout = 5.minutes
- Await.result((logMgr ? "exit").mapTo[String], akka.util.Duration.Inf)
+ Await.result((logMgr ? "exit").mapTo[String], Duration.Inf)
system.shutdown() // pro forma, as all loggers should already be stopped at this point
try {
system.awaitTermination(4.minute)
diff --git a/build/src/main/scala/com/typesafe/dbuild/build/Notifications.scala b/build/src/main/scala/com/typesafe/dbuild/build/Notifications.scala
index cdefe7e8..3b6a5fb4 100644
--- a/build/src/main/scala/com/typesafe/dbuild/build/Notifications.scala
+++ b/build/src/main/scala/com/typesafe/dbuild/build/Notifications.scala
@@ -11,6 +11,9 @@ import RecipientType._
import com.typesafe.dbuild.deploy.Creds.loadCreds
import com.typesafe.dbuild.model.TemplateFormatter
import dispatch.classic.{ Logger => _, _ }
+import com.typesafe.dbuild.model.SeqNotificationH._
+import com.typesafe.dbuild.model.SeqSelectorElementH._
+import com.typesafe.dbuild.model.SeqStringH._
//
// Ideally, the ConsoleNotification should become the mechanism by which the entire log of the
diff --git a/build/src/main/scala/com/typesafe/dbuild/build/OptionTask.scala b/build/src/main/scala/com/typesafe/dbuild/build/OptionTask.scala
index 5444d022..dbfd67d4 100644
--- a/build/src/main/scala/com/typesafe/dbuild/build/OptionTask.scala
+++ b/build/src/main/scala/com/typesafe/dbuild/build/OptionTask.scala
@@ -7,6 +7,7 @@ import Logger.prepareLogMsg
import com.typesafe.dbuild.model._
import java.io.File
import com.typesafe.dbuild.repo.core.{ LocalRepoHelper, Repository }
+import com.typesafe.dbuild.model.SeqStringH._
/**
* Defines a task that will run before or after the build, defined somewhere
diff --git a/build/src/main/scala/com/typesafe/dbuild/build/SbtBuildMain.scala b/build/src/main/scala/com/typesafe/dbuild/build/SbtBuildMain.scala
index b8640921..8c1ed6ca 100644
--- a/build/src/main/scala/com/typesafe/dbuild/build/SbtBuildMain.scala
+++ b/build/src/main/scala/com/typesafe/dbuild/build/SbtBuildMain.scala
@@ -13,7 +13,7 @@ import com.typesafe.config.ConfigValueFactory
import com.typesafe.dbuild.model.Utils.readValueT
import com.typesafe.dbuild.utils.Time.timed
import collection.immutable.SortedMap
-import com.typesafe.dbuild.repo.core.Defaults
+import com.typesafe.dbuild.adapter.Defaults
import com.typesafe.config.{ ConfigSyntax, ConfigFactory, ConfigParseOptions }
import org.rogach.scallop._
import org.rogach.scallop.exceptions.ScallopException
@@ -23,6 +23,8 @@ import java.util.TimeZone
import collection.JavaConverters._
import scala.collection.JavaConversions._
import com.typesafe.config.ConfigRenderOptions
+import com.typesafe.dbuild.model.SeqDBCH._
+import com.typesafe.dbuild.model.SeqStringH._
/**
* These options are created by SbtBuildMain, and are propagated to most stages of building, as
diff --git a/build/src/main/scala/com/typesafe/dbuild/build/SimpleBuildActor.scala b/build/src/main/scala/com/typesafe/dbuild/build/SimpleBuildActor.scala
index 1f2847a7..7850d181 100644
--- a/build/src/main/scala/com/typesafe/dbuild/build/SimpleBuildActor.scala
+++ b/build/src/main/scala/com/typesafe/dbuild/build/SimpleBuildActor.scala
@@ -11,8 +11,9 @@ import com.typesafe.dbuild.hashing
import com.typesafe.dbuild.graph
import akka.actor.{ Actor, ActorRef, Props }
import akka.pattern.{ ask, pipe }
-import akka.dispatch.{ Future, Futures, Promise }
-import akka.util.duration._
+import scala.concurrent.duration._
+import scala.concurrent.{ Future, Promise, ExecutionContext }
+import ExecutionContext.Implicits.global
import akka.util.Timeout
import com.typesafe.dbuild.project.build.ActorPatterns.forwardingErrorsToFutures
import sbt.Path._
@@ -20,6 +21,7 @@ import java.io.File
import com.typesafe.dbuild.repo.core.GlobalDirs
import org.apache.maven.execution.BuildFailure
import Logger.prepareLogMsg
+import com.typesafe.dbuild.model.SeqDBCH._
case class RunDBuild(conf: DBuildConfiguration, confName: String,
buildTarget: Option[String], logger: Logger, options: BuildRunOptions)
@@ -156,7 +158,7 @@ class SimpleBuildActor(extractor: ActorRef, builder: ActorRef, repository: Repos
case Right(o) => o
}
- nest(RepeatableDBuildConfig.fromExtractionOutcome(extractionOutcome)) { fullBuild =>
+ nest(RepeatableDBuildConfigH.fromExtractionOutcome(extractionOutcome)) { fullBuild =>
// what we call "RepeatableDBuildConfig" is actually only the portion of data that
// affect the build. Further options that do /not/ affect the build, but control dbuild in
// other ways (notifications, resolvers, etc), are in the GeneralOptions.
diff --git a/build/src/main/scala/com/typesafe/dbuild/build/Timeouts.scala b/build/src/main/scala/com/typesafe/dbuild/build/Timeouts.scala
index 41acd7a4..9e68fec9 100644
--- a/build/src/main/scala/com/typesafe/dbuild/build/Timeouts.scala
+++ b/build/src/main/scala/com/typesafe/dbuild/build/Timeouts.scala
@@ -2,11 +2,11 @@ package com.typesafe.dbuild.build
import akka.actor.{ Actor, ActorRef, Props, Scheduler }
import akka.pattern.{ ask, pipe }
-import akka.util.duration._
+import scala.concurrent.duration._
import akka.util.Timeout
-import akka.util.Duration
-import akka.util.NonFatal
-import akka.dispatch.{ ExecutionContext, Promise, Future }
+import scala.util.control.NonFatal
+import scala.concurrent.{ ExecutionContext, Promise, Future }
+import ExecutionContext.Implicits.global
object Timeouts {
// overall timeout for the entire dbuild to complete;
@@ -35,14 +35,14 @@ object Timeouts {
* Returns a [[akka.dispatch.Future]] that will be completed with the success or failure of the provided value
* after the specified duration.
*/
- def after[T](duration: Duration, using: Scheduler)(value: ⇒ Future[T])(implicit ec: ExecutionContext): Future[T] =
+ def after[T](duration: FiniteDuration, using: Scheduler)(value: ⇒ Future[T])(implicit ec: ExecutionContext): Future[T] =
if (duration.isFinite() && duration.length < 1) value else {
val p = Promise[T]()
val c = using.scheduleOnce(duration) {
- p completeWith { try value catch { case NonFatal(t) ⇒ Promise.failed(t) } }
+ p completeWith { try value catch { case NonFatal(t) ⇒ Promise.failed(t).future } }
}
- p onComplete { _ ⇒ c.cancel() }
- p
+ p.future onComplete { _ ⇒ c.cancel() }
+ p.future
}
assert((extractionTimeout.duration + 5.minutes) < extractionPhaseTimeout.duration,
"extractionTimeout must be a bit shorter than extractionPhaseTimeout")
diff --git a/core/src/main/scala/com/typesafe/dbuild/project/BuildSystem.scala b/core/src/main/scala/com/typesafe/dbuild/project/BuildSystem.scala
index 751d8e0e..0b4cc75b 100644
--- a/core/src/main/scala/com/typesafe/dbuild/project/BuildSystem.scala
+++ b/core/src/main/scala/com/typesafe/dbuild/project/BuildSystem.scala
@@ -3,7 +3,7 @@ package com.typesafe.dbuild.project
import com.typesafe.dbuild.model._
import com.typesafe.dbuild.logging.Logger
import java.io.File
-import sbt.Path._
+import com.typesafe.dbuild.adapter.Adapter.Path._
case class BuildData(log: Logger, debug: Boolean)
@@ -101,4 +101,4 @@ object BuildSystem {
}
build.flatMap {b => b.projects.map { expandProject(_, b) }}
}
-}
\ No newline at end of file
+}
diff --git a/deploy/src/main/scala/com/typesafe/dbuild/deploy/Deploy.scala b/deploy/src/main/scala/com/typesafe/dbuild/deploy/Deploy.scala
index fcc8a5ee..03570245 100644
--- a/deploy/src/main/scala/com/typesafe/dbuild/deploy/Deploy.scala
+++ b/deploy/src/main/scala/com/typesafe/dbuild/deploy/Deploy.scala
@@ -1,7 +1,6 @@
package com.typesafe.dbuild.deploy
import sbt._
-import Path._
import java.io.File
import java.net.URI
import com.amazonaws.services.s3.AmazonS3Client
@@ -11,12 +10,15 @@ import com.amazonaws.ClientConfiguration
import com.amazonaws.Protocol
import dispatch.classic.{ Logger => _, _ }
import org.omg.PortableInterceptor.SUCCESSFUL
-import sbt.Logger
import Creds.loadCreds
-import com.jcraft.jsch.{ IO => sshIO, _ }
+import com.jcraft.jsch.{ IO => sshIO, Logger => _, _ }
import java.util.Date
import com.jcraft.jsch.ChannelSftp
+import com.typesafe.dbuild.adapter.Adapter
+import Adapter.{IO,Logger,allPaths}
+import Adapter.syntaxio._
import com.lambdaworks.jacks.JacksMapper
+import Adapter.Path._
/**
* A generic (S3, http, https, etc) deploy location.
@@ -133,7 +135,7 @@ abstract class IterativeDeploy[T](options: DeployInfo) extends Deploy[T](options
// - finally, the checksums are uploaded after the main artifacts
//
- val allFiles = (dir.***).get.filter(f => !f.isDirectory)
+ val allFiles = allPaths(dir).get.filter(f => !f.isDirectory)
val poms = allFiles.filter(f => f.getName.endsWith("-SNAPSHOT.pom"))
//
// we fold over the poms, reducing the set of files until we are left with just
@@ -144,7 +146,7 @@ abstract class IterativeDeploy[T](options: DeployInfo) extends Deploy[T](options
val thisDir = pomFile.getParentFile()
if (thisDir == null) sys.error("Unexpected: file has not parent in deploy")
// select the files in this directory (but not in subdirectories)
- val theseFiles = (thisDir.***).get.filter(f => !f.isDirectory && f.getParentFile() == thisDir)
+ val theseFiles = allPaths(thisDir).get.filter(f => !f.isDirectory && f.getParentFile() == thisDir)
// if there is a matching jar, upload the jar first
val jarFile = new java.io.File(pomFile.getPath().replaceAll("\\.[^\\.]*$", ".jar"))
val thisSeq = if (theseFiles contains jarFile) {
@@ -285,7 +287,7 @@ class DeployHTTP(log: Logger, options: DeployInfo) extends IterativeDeploy[Unit]
protected def deployItem(handler: Unit, relative: String, file: File, uri: URI) = {
import dispatch._
val sender =
- url(uri.toString).PUT.as(credentials.user, credentials.pass) <<< (file, "application/octet-stream")
+ dispatch.classic.url(uri.toString).PUT.as(credentials.user, credentials.pass) <<< (file, "application/octet-stream")
val response = (new Http with NoLogging)(sender >- { str =>
Deploy.readSomePath[ArtifactoryResponse](str)
})
@@ -331,7 +333,7 @@ class DeployBintray(log: Logger, options: DeployInfo) extends DeployHTTP(log, op
val path = target.getPath
val dest = new java.net.URI(bintrayBase + (if (path.head == '/') path.tail else path) + "/publish")
val sender =
- url(dest.toString).POST.as(credentials.user, credentials.pass)
+ dispatch.classic.url(dest.toString).POST.as(credentials.user, credentials.pass)
val response = (new Http with NoLogging)(sender >- { str =>
Deploy.readSomePath[ArtifactoryResponse](str)
})
diff --git a/dist/src/universal/samples/akka-on-2.10.x.dbuild b/dist/src/universal/samples/akka-on-2.10.x.dbuild
deleted file mode 100644
index 0db6f639..00000000
--- a/dist/src/universal/samples/akka-on-2.10.x.dbuild
+++ /dev/null
@@ -1,27 +0,0 @@
-build.projects:[
- {
- name: "scala",
- system: "scala",
- uri: "git://github.com/scala/scala.git#2.10.x"
- }, {
- name: "scalacheck",
- system: "sbt",
- uri: "git://github.com/jsuereth/scalacheck.git#origin/master"
- },{
- name: "specs2-scalaz",
- system: "sbt",
- uri: "git://github.com/jsuereth/specs2-scalaz.git#origin/community"
- },{
- name: "specs2",
- system: "sbt",
- uri: "git://github.com/jsuereth/specs2.git#origin/community"
- },{
- name: "scala-stm",
- system: "sbt",
- uri: "git://github.com/nbronson/scala-stm.git#master"
- },{
- name:"akka",
- system:"sbt",
- uri:"git://github.com/akka/akka.git#master"
- }
-]
diff --git a/dist/src/universal/samples/ivyExample.dbuild b/dist/src/universal/samples/ivyExample.dbuild
deleted file mode 100644
index 2eb2ab9e..00000000
--- a/dist/src/universal/samples/ivyExample.dbuild
+++ /dev/null
@@ -1,57 +0,0 @@
-build.projects:[
- {
- name: scala-compiler
- system: ivy
- uri: "ivy:org.scala-lang#scala-compiler;2.10.2"
- extra: { sources: true }
- }, {
- name: scala-reflect
- system: ivy
- uri: "ivy:org.scala-lang#scala-reflect;2.10.2"
- }, {
- name: scala-library
- system: ivy
- uri: "ivy:org.scala-lang#scala-library;2.10.2"
- }, {
- name: scala-actors
- system: ivy
- uri: "ivy:org.scala-lang#scala-actors;2.10.2"
- }, {
- name: jline
- system: ivy
- uri: "ivy:org.scala-lang#jline;2.10.2"
- }, {
- name: "scalacheck",
- uri: "git://github.com/rickynils/scalacheck.git#1.10.1"
- }, {
- name: "sbinary",
- uri: "git://github.com/harrah/sbinary.git#bdc555afbbb7657b4a9def7ae342d53881be2e2d"
- extra: { projects: ["core"] }
- }, {
- name: "sbt",
- uri: "git://github.com/sbt/sbt.git#f4a3904a4724dcd1fb8c8cd315c6b2f416bda3a3"
- extra: {
- projects: ["compiler-interface",
- "classpath","logging","io","control","classfile",
- "process","relation","interface","persist","api",
- "compiler-integration","incremental-compiler","compile","launcher-interface"
- ],
- run-tests: false
- }
- }, {
- name: "sbt-republish",
- uri: "http://github.com/typesafehub/sbt-republish.git#2dc7afb6c84e5a55eb0ff7677343c6c301a38aeb",
- set-version: "0.13.0-on-2.10.3-SNAPSHOT-for-IDE-SNAPSHOT"
- }, {
- name: "zinc",
- uri: "https://github.com/typesafehub/zinc.git#f5912305a08fed3750f5ea7e77bc1efc27424f2a"
- }, {
- name: specs2
- system: ivy
- uri: "ivy:org.specs2#specs2_2.10;1.12.3"
- }, {
- name: specs2-scalaz-core
- system: ivy
- uri: "ivy:org.specs2#specs2-scalaz-core_2.10.0-RC3;6.0.1"
- }
-]
diff --git a/docs/src/sphinx/conf.py b/docs/src/sphinx/conf.py
index b2b5e49f..5e770b3b 100644
--- a/docs/src/sphinx/conf.py
+++ b/docs/src/sphinx/conf.py
@@ -1,6 +1,7 @@
# -*- coding: utf-8 -*-
import sys, os
+from version import release
sys.path.append(os.path.abspath('_sphinx/exts'))
extensions = ['sphinxcontrib.issuetracker', 'sphinx.ext.extlinks', 'howto']
@@ -8,9 +9,6 @@
# Project variables
project = 'dbuild'
-version = '0.9.7'
-release = '0.9.7-SNAPSHOT'
-sbt_version = '0.12.4'
# General settings
@@ -66,10 +64,8 @@
.. _zip: %(dbuild_native_package_base)s/%(project)s/%(version)s/zips/%(project)s-%(version)s.zip
.. _tgz: %(dbuild_native_package_base)s/%(project)s/%(version)s/tgzs/%(project)s-%(version)s.tgz
.. |version| replace:: %(version)s
-.. |sbtversion| replace:: %(sbtversion)s
.. |addSbtplugin| replace:: addSbtPlugin(:s2:`"com.typesafe.dbuild"` %% :s2:`"plugin"` %% :s2:`"%(version)s"`)
""" % {
- 'sbtversion': sbt_version,
'version': release,
'project': project,
'dbuild_native_package_base': 'http://repo.typesafe.com/typesafe/ivy-releases/com.typesafe.dbuild',
diff --git a/docs/src/sphinx/download.rst b/docs/src/sphinx/download.rst
index 4e67981c..948d80ed 100644
--- a/docs/src/sphinx/download.rst
+++ b/docs/src/sphinx/download.rst
@@ -21,7 +21,6 @@ The archive contains the following files:
./bin/drepo
./bin/drepo.properties
./bin/sbt-launch.jar
- ./samples/[...]
Where ``dbuild`` is the build tool, and ``dbuild.properties`` is its configuration file. The ``bin`` directory also contains
the ``drepo`` repository inspection tool, together with its configuration file; you can find more information in the
diff --git a/logging/src/main/scala/com/typesafe/dbuild/logging/Logger.scala b/logging/src/main/scala/com/typesafe/dbuild/logging/Logger.scala
index 8ab8e272..0ee5db2c 100644
--- a/logging/src/main/scala/com/typesafe/dbuild/logging/Logger.scala
+++ b/logging/src/main/scala/com/typesafe/dbuild/logging/Logger.scala
@@ -1,9 +1,10 @@
package com.typesafe.dbuild.logging
-import sbt.{ Logger => SbtLogger, LogEvent }
import sys.process.ProcessLogger
-import sbt.Level._
import com.typesafe.dbuild.graph
+import com.typesafe.dbuild.adapter.{LoggingInterface,StreamLoggerAdapter}
+import LoggingInterface.{Logger=>SbtLogger,BasicLogger=>SbtBasicLogger,_}
+import LoggingInterface.Level._
trait Logger extends SbtLogger with ProcessLogger {
def newNestedLogger(name: String, projName: String = ""): Logger
@@ -41,14 +42,10 @@ object ConsoleLogger {
def apply(debug: Boolean): Logger = new StreamLogger(System.out, debug)
}
-//
-// Below this line, unused code
-//
-
-abstract class BasicLogger extends sbt.BasicLogger with Logger
+abstract class BasicLogger extends SbtBasicLogger with Logger
/** Logs to an output stream. */
-class StreamLogger(out: java.io.PrintStream, debug: Boolean) extends BasicLogger {
+final class StreamLogger(out: java.io.PrintStream, debug: Boolean) extends BasicLogger with StreamLoggerAdapter {
if (debug) setLevel(Debug)
@@ -56,23 +53,21 @@ class StreamLogger(out: java.io.PrintStream, debug: Boolean) extends BasicLogger
def trace(t: => Throwable): Unit =
out.synchronized {
val traceLevel = getTrace
- if (traceLevel >= 0) out.print(sbt.StackTrace.trimmed(t, traceLevel))
+ if (traceLevel >= 0) out.print(StackTrace.trimmed(t, traceLevel))
}
def success(message: => String): Unit =
if (successEnabled) log(SuccessLabel, message)
def buffer[T](t: => T): T = t
- def err(s: => String): Unit =
- log(Error, s)
- def out(s: => String): Unit =
- log(Info.toString, s)
- def control(event: sbt.ControlEvent.Value, message: => String): Unit =
+ def control(event: ControlEvent.Value, message: => String): Unit =
log(Info.toString, message)
def logAll(events: Seq[LogEvent]) = out.synchronized { events foreach log }
- def log(level: sbt.Level.Value, message: => String): Unit =
+ def log(level: Level.Value, message: => String): Unit =
if (atLevel(level)) log(level.toString, message)
- private def log(label: String, message: String): Unit =
+ // The log(String,String) version should be protected or private,
+ // but we cannot make it such because of the Adapter trait mix-in
+ def log(label: String, message: String): Unit =
out.synchronized {
for (line <- message.split("""\n""")) {
out.print("[")
diff --git a/metadata/src/main/scala/com/typesafe/dbuild/model/Config.scala b/metadata/src/main/scala/com/typesafe/dbuild/model/Config.scala
index 6e06f6fa..a556cd04 100644
--- a/metadata/src/main/scala/com/typesafe/dbuild/model/Config.scala
+++ b/metadata/src/main/scala/com/typesafe/dbuild/model/Config.scala
@@ -13,6 +13,13 @@ import collection.JavaConverters._
import com.typesafe.dbuild.deploy.DeployTarget
import com.typesafe.dbuild.hashing
+import SeqBooleanH._
+import SeqDBCH._
+import SeqDepsModifiersH._
+import SeqNotificationH._
+import SeqSelectorElementH._
+import SeqSeqStringH._
+import SeqStringH._
/**
* Metadata about a build. This is extracted from a config file and contains enough information
* to further extract information about a build.
@@ -209,7 +216,7 @@ case class DBuildConfiguration(
* empty record.
*/
@JsonDeserialize(using = classOf[VarDeserializer])
-case class Vars
+case class Vars()
class VarDeserializer extends JsonDeserializer[Vars] {
override def deserialize(p: JsonParser, ctx: DeserializationContext): Vars = {
val tf = ctx.getConfig.getTypeFactory()
@@ -347,7 +354,7 @@ case class SeqString(override val s: Seq[String]) extends Flex[String](s) {
}
class SeqStringDeserializer extends SeqFlexDeserializer[String, SeqString]
class SeqStringSerializer extends SeqFlexSerializer[String]
-object SeqString {
+object SeqStringH {
implicit def SeqToSeqString(s: Seq[String]): SeqString = SeqString(s)
implicit def SeqStringToSeq(a: SeqString): Seq[String] = a.s
}
@@ -362,7 +369,7 @@ case class SeqBoolean(override val s: Seq[Boolean]) extends Flex[Boolean](s) {
}
class SeqBooleanDeserializer extends SeqFlexDeserializer[Boolean, SeqBoolean]
class SeqBooleanSerializer extends SeqFlexSerializer[Boolean]
-object SeqBoolean {
+object SeqBooleanH {
implicit def SeqToSeqBoolean(s: Seq[Boolean]): SeqBoolean = SeqBoolean(s)
implicit def SeqBooleanToSeq(a: SeqBoolean): Seq[Boolean] = a.s
}
@@ -376,7 +383,7 @@ object SeqBoolean {
case class SeqDBC(override val s: Seq[DBuildConfig]) extends Flex[DBuildConfig](s)
class SeqDBCDeserializer extends SeqFlexDeserializer[DBuildConfig, SeqDBC]
class SeqDBCSerializer extends SeqFlexSerializer[DBuildConfig]
-object SeqDBC {
+object SeqDBCH {
implicit def SeqToSeqDBC(s: Seq[DBuildConfig]): SeqDBC = SeqDBC(s)
implicit def SeqDBCToSeq(a: SeqDBC): Seq[DBuildConfig] = a.s
}
@@ -389,7 +396,7 @@ object SeqDBC {
case class SeqDepsModifiers(override val s: Seq[DepsModifiers]) extends Flex[DepsModifiers](s)
class SeqDMDeserializer extends SeqFlexDeserializer[DepsModifiers, SeqDepsModifiers]
class SeqDMSerializer extends SeqFlexSerializer[DepsModifiers]
-object SeqDepsModifiers {
+object SeqDepsModifiersH {
implicit def SeqToSeqDM(s: Seq[DepsModifiers]): SeqDepsModifiers = SeqDepsModifiers(s)
implicit def SeqDMToSeq(a: SeqDepsModifiers): Seq[DepsModifiers] = a.s
implicit def OptToSeqDM(o: Option[DepsModifiers]): SeqDepsModifiers = SeqDepsModifiers(o.toSeq)
@@ -407,7 +414,7 @@ case class SeqSeqString(override val s: Seq[SeqString]) extends Flex[SeqString](
// turn the SeqSeqString into a Seq[Seq[String]]
def expand = s map {_.s}
}
-object SeqSeqString {
+object SeqSeqStringH {
implicit def SeqToSeqSeqString(s: Seq[SeqString]): SeqSeqString = SeqSeqString(s)
implicit def SeqSeqStringToSeq(a: SeqSeqString): Seq[SeqString] = a.s
}
@@ -543,7 +550,7 @@ class ExtraSerializer extends JsonSerializer[ExtraConfig] {
ScalaTypeSig(cfg.getTypeFactory, jt) match {
case Some(sts) if sts.isCaseClass =>
// the "true" below is for options.caseClassSkipNulls
- (new CaseClassSerializer(jt, sts.annotatedAccessors, true)).serialize(value.asInstanceOf[Product], g, p)
+ (new CaseClassSerializer(jt, sts.annotatedAccessors(cfg), true)).serialize(value.asInstanceOf[Product], g, p)
case _ => throw new Exception("Internal error while serializing build system config. Please report.")
}
}
@@ -702,7 +709,7 @@ class SelectorElementSerializer extends JsonSerializer[SelectorElement] {
val jt = tf.constructType(classOf[SubProjects])
val Some(sts) = ScalaTypeSig(cfg.getTypeFactory, jt)
// the "true" below is for options.caseClassSkipNulls
- (new CaseClassSerializer(jt, sts.annotatedAccessors, true)).serialize(d, g, p)
+ (new CaseClassSerializer(jt, sts.annotatedAccessors(cfg), true)).serialize(d, g, p)
case _ => throw new Exception("Internal error while serializing deploy projects. Please report.")
}
}
@@ -779,7 +786,7 @@ case class SeqSelectorElement(override val s: Seq[SelectorElement]) extends Flex
}
class SeqElementDeserializer extends SeqFlexDeserializer[SelectorElement, SeqSelectorElement]
class SeqElementSerializer extends SeqFlexSerializer[SelectorElement]
-object SeqSelectorElement {
+object SeqSelectorElementH {
implicit def SeqToSeqSelectorElement(s: Seq[SelectorElement]): SeqSelectorElement = SeqSelectorElement(s)
implicit def SeqSelectorElementToSeq(a: SeqSelectorElement): Seq[SelectorElement] = a.s
}
@@ -793,7 +800,7 @@ object SeqSelectorElement {
case class SeqNotification(override val s: Seq[Notification]) extends Flex[Notification](s)
class SeqNotificationDeserializer extends SeqFlexDeserializer[Notification, SeqNotification]
class SeqNotificationSerializer extends SeqFlexSerializer[Notification]
-object SeqNotification {
+object SeqNotificationH {
implicit def SeqToSeqNotification(s: Seq[Notification]): SeqNotification = SeqNotification(s)
implicit def SeqNotificationToSeq(a: SeqNotification): Seq[Notification] = a.s
}
@@ -968,7 +975,7 @@ class NotificationKindSerializer extends JsonSerializer[NotificationKind] {
ScalaTypeSig(cfg.getTypeFactory, jt) match {
case Some(sts) if sts.isCaseClass =>
// the "true" below is for options.caseClassSkipNulls
- (new CaseClassSerializer(jt, sts.annotatedAccessors, true)).serialize(value.asInstanceOf[Product], g, p)
+ (new CaseClassSerializer(jt, sts.annotatedAccessors(cfg), true)).serialize(value.asInstanceOf[Product], g, p)
case _ => throw new Exception("Internal error while serializing NotificationKind. Please report.")
}
}
@@ -976,7 +983,7 @@ class NotificationKindSerializer extends JsonSerializer[NotificationKind] {
class NotificationDeserializer extends JsonDeserializer[Notification] {
override def deserialize(p: JsonParser, ctx: DeserializationContext): Notification = {
- val notificationKinds = NotificationKind.kinds
+ val notificationKinds = NotificationKindH.kinds
val tf = ctx.getConfig.getTypeFactory()
val d = ctx.findContextualValueDeserializer(tf.constructType(classOf[NotificationShadow]), null)
@@ -1133,7 +1140,7 @@ case class Smtp(
case class ConsoleNotification() extends NotificationKind
-object NotificationKind {
+object NotificationKindH {
val kinds: Map[String, java.lang.Class[_ <: NotificationKind]] = Map(
"console" -> classOf[ConsoleNotification],
"flowdock" -> classOf[FlowdockNotification],
diff --git a/metadata/src/main/scala/com/typesafe/dbuild/model/Extracted.scala b/metadata/src/main/scala/com/typesafe/dbuild/model/Extracted.scala
index 5d943a3e..a0fa4084 100644
--- a/metadata/src/main/scala/com/typesafe/dbuild/model/Extracted.scala
+++ b/metadata/src/main/scala/com/typesafe/dbuild/model/Extracted.scala
@@ -1,6 +1,10 @@
package com.typesafe.dbuild.model
import com.fasterxml.jackson.annotation.{ JsonCreator, JsonProperty }
+// Note: all of the case classes in this file are serialized/deserialized
+// by using the "jacks" library. For that library to work correctly, there
+// must not be any companion objects defined for those case classes.
+
/**
* A project dep is an extracted *external* build dependency. I.e. this is a
* maven/ivy artifact that exists and is built external to a local build.
@@ -70,7 +74,7 @@ case class ExtractedBuildMeta(@JsonProperty("proj-info") projInfo: Seq /*Levels*
"%s -> (%s, %s, %s)" format (index, version, projects.mkString("\n\t", "\n\t", "\n"), subproj.mkString("\n ", ", ", "\n"))
})
}
-object ExtractedBuildMeta {
+object ExtractedBuildMetaH {
def apply(version: String, projects: Seq[Project], subproj: Seq[String] = Seq.empty): ExtractedBuildMeta =
ExtractedBuildMeta(Seq /*Levels*/ (ProjMeta(version, projects, subproj)))
-}
\ No newline at end of file
+}
diff --git a/metadata/src/main/scala/com/typesafe/dbuild/model/RepeatableBuild.scala b/metadata/src/main/scala/com/typesafe/dbuild/model/RepeatableBuild.scala
index 37711642..befa1a97 100644
--- a/metadata/src/main/scala/com/typesafe/dbuild/model/RepeatableBuild.scala
+++ b/metadata/src/main/scala/com/typesafe/dbuild/model/RepeatableBuild.scala
@@ -3,6 +3,7 @@ package com.typesafe.dbuild.model
import Utils.{ writeValue, canSeeSpace }
import com.fasterxml.jackson.annotation.JsonProperty
import com.typesafe.dbuild.hashing
+import com.typesafe.dbuild.model.SeqStringH._
/**
* Information on how to build a project. Consists of both dbuild
@@ -66,7 +67,7 @@ case class RepeatableDepInfo(
// the two Seqs should probably be converted into a Seq[(String,String)].
)
-object RepeatableDBuildConfig {
+object RepeatableDBuildConfigH {
def fromExtractionOutcome(outcome: ExtractionOK) = RepeatableDBuildConfig(outcome.pces)
}
/**
@@ -131,7 +132,13 @@ case class RepeatableDBuildConfig(builds: Seq[ProjectConfigAndExtracted]) {
// more appropriate to print the actual subproject name, rather than the Project
case class Origin(fromProject: String, spaces: SeqString)
case class Info(artOrg: String, artName: String, origin: Origin)
- val generatedArtifacts = builds flatMap { b => b.extracted.projects.map { a => Info(a.organization, a.name, Origin(b.config.name, b.getSpace.to)) } }
+
+ // declare a collision if any artifacts in two distint projects have same organization and name
+ // (even if they differ in their extension or classifiers)
+ val generatedArtifacts = builds flatMap { b => b.extracted.projects.flatMap { _.artifacts.groupBy {
+ case ProjectRef(name, org, ext, classifier) => (org, name)
+ }.map { case ((org, name), _) => Info(org, name, Origin(b.config.name, b.getSpace.to)) } } }
+
val byArt = (generatedArtifacts.groupBy { case Info(org, name, origin) => (org, name) }).toSeq
val collisions = byArt flatMap {
case ((org, name), seqInfo) =>
diff --git a/metadata/src/test/scala/com/typesafe/dbuild/model/RepeatableBuildSpec.scala b/metadata/src/test/scala/com/typesafe/dbuild/model/RepeatableBuildSpec.scala
index b9c88550..fdfddedc 100644
--- a/metadata/src/test/scala/com/typesafe/dbuild/model/RepeatableBuildSpec.scala
+++ b/metadata/src/test/scala/com/typesafe/dbuild/model/RepeatableBuildSpec.scala
@@ -2,6 +2,7 @@ package com.typesafe.dbuild.model
import org.specs2.mutable.Specification
import Utils.{writeValue,readValue}
+import SeqDepsModifiersH._
import com.lambdaworks.jacks._
import JacksOption._
diff --git a/plugin/src/main/scala/com/typesafe/dbuild/plugin/DBuildPlugin.scala b/plugin/src/main/scala/com/typesafe/dbuild/plugin/DBuildPlugin.scala
index 76d26fae..0b2e2827 100644
--- a/plugin/src/main/scala/com/typesafe/dbuild/plugin/DBuildPlugin.scala
+++ b/plugin/src/main/scala/com/typesafe/dbuild/plugin/DBuildPlugin.scala
@@ -2,9 +2,11 @@ package com.typesafe.dbuild.plugin
import sbt._
-object DBuildPlugin extends Plugin {
+object DBuildPlugin extends AutoPlugin {
+ override def trigger = allRequirements
+ override def requires = plugins.JvmPlugin
override def buildSettings = (
DBuildRunner.buildSettings
)
override def projectSettings = DBuildRunner.projectSettings
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/scala/com/typesafe/dbuild/plugin/DBuildRunner.scala b/plugin/src/main/scala/com/typesafe/dbuild/plugin/DBuildRunner.scala
index 71ddb5f9..bf429d1e 100644
--- a/plugin/src/main/scala/com/typesafe/dbuild/plugin/DBuildRunner.scala
+++ b/plugin/src/main/scala/com/typesafe/dbuild/plugin/DBuildRunner.scala
@@ -2,6 +2,9 @@
package com.typesafe.dbuild.plugin
import sbt._
+import com.typesafe.dbuild.adapter.Adapter
+import Adapter.{ProjectResolver,scalaInstance,allPaths,Load,applyCross,ScalaInstance}
+import Adapter.syntax._
import com.typesafe.dbuild.model
import com.typesafe.dbuild.support.sbt.SbtBuildConfig
import com.typesafe.dbuild.model.ArtifactLocation
@@ -226,7 +229,7 @@ object DBuildRunner {
val newSettings1 = {
ptSettings map { s =>
- SbtUpdate.update(s.asInstanceOf[Setting[Option[sbt.Resolver]]].key) {
+ Def.update(s.asInstanceOf[Setting[Option[sbt.Resolver]]].key) {
_ match {
case Some(r: PatternsBasedRepository) if (!r.patterns.isMavenCompatible) => ivyRepo
case _ => mavenRepo
@@ -281,7 +284,7 @@ object DBuildRunner {
}
// as above, but assumes the transformation is a simple Project.update (aka: ~= )
- def fixGenericK2[K](k: Scoped, f: K => K) = fixGenericTransform2(k) { s: Setting[K] => SbtUpdate.update(s.key)(f) } _
+ def fixGenericK2[K](k: Scoped, f: K => K) = fixGenericTransform2(k) { s: Setting[K] => Def.update(s.key)(f) } _
// Separate cases for settings and tasks (to keep the type inferencer happy)
def fixGeneric2[K](k: SettingKey[K], m: String)(f: K => K) = fixGenericK2(k, f)(m)
@@ -379,6 +382,12 @@ object DBuildRunner {
def fixInterProjectResolver2 =
fixGeneric2(Keys.projectResolver, "Disabling inter-project resolver") { _ map { _ => new RawRepository(new ProjectResolver("inter-project", Map.empty)) } }
+ // Some projects or plugins modify the "publish" task (for instance, to use Bintray),
+ // but we need the task to point to the standard definition, so that we can publish
+ // the files to the local directories
+ def fixStandardPublish2 =
+ fixGeneric2(Keys.publish, "Resetting publish task") { _ map { _ => sbt.Classpaths.publishTask(Keys.publishConfiguration, Keys.deliver) } }
+
// alternate version, which only removes the artifacts that are not part
// of the selected subprojects. Might be more suitable for setupcmd; in this case,
// local-publish-repo should not be added to the list of resolvers.
@@ -440,7 +449,7 @@ object DBuildRunner {
val sc = s.key.scope
Keys.scalaInstance in sc <<= Keys.appConfiguration in sc map { app =>
val launcher = app.provider.scalaProvider.launcher
- ScalaInstance(libraryJar(scalaHome), compilerJar(scalaHome), launcher, allJars(scalaHome): _*)
+ scalaInstance(libraryJar(scalaHome), compilerJar(scalaHome), launcher, allJars(scalaHome): _*)
}
}("Setting Scala instance")(oldSettings, log)
}
@@ -605,7 +614,7 @@ object DBuildRunner {
// current set of files in the repository against the files we had previously
val previousFiles = previous._1
val localRepo = config.info.outRepo.getAbsoluteFile
- val currentFiles = (localRepo.***).get.
+ val currentFiles = (allPaths(localRepo)).get.
filterNot(file => file.isDirectory || file.getName == "maven-metadata-local.xml")
val newFilesShas = currentFiles.diff(previousFiles).map { LocalRepoHelper.makeArtifactSha(_, localRepo) }
@@ -663,6 +672,7 @@ object DBuildRunner {
private def preparePublishSettings(in: BuildInput, log: ConsoleLogger, oldSettings: Seq[Setting[_]]) =
Seq[Fixer](
+ fixStandardPublish2,
fixPublishTos2(in.outRepo.getAbsoluteFile),
fixPGPs2,
fixVersions2(in)) flatMap { _(oldSettings, log) }
@@ -757,7 +767,7 @@ object DBuildRunner {
def extractArtifactLocations(org: String, version: String, artifacts: Map[Artifact, File],
cross: CrossVersion, sv: String, sbv: String, sbtbv: String, isSbtPlugin: Boolean): Seq[model.ArtifactLocation] = {
- val crossSuffix = CrossVersion.applyCross("", CrossVersion(cross, sv, sbv))
+ val crossSuffix = applyCross("", CrossVersion(cross, sv, sbv))
for {
(artifact, file) <- artifacts.toSeq
} yield model.ArtifactLocation(
diff --git a/plugin/src/main/scala/com/typesafe/dbuild/plugin/DependencyAnalysis.scala b/plugin/src/main/scala/com/typesafe/dbuild/plugin/DependencyAnalysis.scala
index 50b95061..2ad5df3f 100644
--- a/plugin/src/main/scala/com/typesafe/dbuild/plugin/DependencyAnalysis.scala
+++ b/plugin/src/main/scala/com/typesafe/dbuild/plugin/DependencyAnalysis.scala
@@ -1,6 +1,9 @@
package com.typesafe.dbuild.plugin
import sbt._
+import com.typesafe.dbuild.adapter.Adapter
+import Adapter.syntaxio._
+import Adapter.defaultID
import com.typesafe.dbuild.model
import com.typesafe.dbuild.plugin.StateHelpers._
import com.typesafe.dbuild.support.sbt.ExtractionInput
@@ -61,8 +64,9 @@ object DependencyAnalysis {
def normalizedProjectName(s: ProjectRef, baseDirectory: File) = normalizedProjectNameString(s.project, baseDirectory)
def normalizedProjectNameString(name: String, baseDirectory: File): String = {
// we only cover the most common cases. The full logic for 0.13 may involve Load.scala (autoID) and the def default* in Build.scala
- val base = StringUtilities.normalize(baseDirectory.getName)
- val defaultIDs = Seq(Build.defaultID(baseDirectory), "root-" + base, base)
+ // This "toLowerCase" etc comes from the long deprecated "StringUtilities.normalize()"
+ val base = baseDirectory.getName.toLowerCase(java.util.Locale.ENGLISH).replaceAll("""\W+""", "-")
+ val defaultIDs = Seq(defaultID(baseDirectory), "root-" + base, base)
val defaultName = "default-sbt-project"
if (defaultIDs contains name) defaultName else {
if (name.endsWith("-build") && base == "project" && normalizedProjectNameString(name.dropRight(6), baseDirectory.getParentFile) == defaultName)
@@ -293,4 +297,4 @@ object DependencyAnalysis {
log))(DBuildRunner.newState(state, extracted, prepareExtractionSettings))
}
-}
\ No newline at end of file
+}
diff --git a/proj/src/main/scala/com/typesafe/dbuild/project/build/BuildDirs.scala b/proj/src/main/scala/com/typesafe/dbuild/project/build/BuildDirs.scala
index d26eeddf..6baa9124 100644
--- a/proj/src/main/scala/com/typesafe/dbuild/project/build/BuildDirs.scala
+++ b/proj/src/main/scala/com/typesafe/dbuild/project/build/BuildDirs.scala
@@ -1,7 +1,9 @@
package com.typesafe.dbuild.project.build
import java.io.File
import com.typesafe.dbuild.repo.core.GlobalDirs.buildDir
-import sbt.Path._
+import com.typesafe.dbuild.adapter.Adapter
+import Adapter.Path._
+import Adapter.syntaxio._
/**
* dbuild-specific file names used during building.
@@ -59,4 +61,4 @@ object BuildDirs {
repo.mkdirs()
repo
}
-}
\ No newline at end of file
+}
diff --git a/proj/src/main/scala/com/typesafe/dbuild/project/build/LocalBuildRunner.scala b/proj/src/main/scala/com/typesafe/dbuild/project/build/LocalBuildRunner.scala
index acf47cbb..5bd27ce4 100644
--- a/proj/src/main/scala/com/typesafe/dbuild/project/build/LocalBuildRunner.scala
+++ b/proj/src/main/scala/com/typesafe/dbuild/project/build/LocalBuildRunner.scala
@@ -6,7 +6,8 @@ import com.typesafe.dbuild.project.resolve.ProjectResolver
import Logger.prepareLogMsg
import java.io.File
import com.typesafe.dbuild.repo.core._
-import sbt.Path._
+import com.typesafe.dbuild.adapter.Adapter
+import Adapter.Path._
import com.typesafe.dbuild.project.dependencies.Extractor
import com.typesafe.dbuild.project.cleanup.Recycling.{ updateTimeStamp, markSuccess }
import com.typesafe.dbuild.project.BuildData
diff --git a/proj/src/main/scala/com/typesafe/dbuild/project/dependencies/Extractor.scala b/proj/src/main/scala/com/typesafe/dbuild/project/dependencies/Extractor.scala
index bd2dd0f5..2b4499f6 100644
--- a/proj/src/main/scala/com/typesafe/dbuild/project/dependencies/Extractor.scala
+++ b/proj/src/main/scala/com/typesafe/dbuild/project/dependencies/Extractor.scala
@@ -1,7 +1,8 @@
package com.typesafe.dbuild.project.dependencies
-import sbt.IO
-import sbt.Path._
+import com.typesafe.dbuild.adapter.Adapter
+import Adapter.IO
+import Adapter.Path._
import java.io.File
import com.typesafe.dbuild.project.resolve.ProjectResolver
import com.typesafe.dbuild.model.{ ProjectConfigAndExtracted, ProjectBuildConfig, ExtractedBuildMeta, SeqDepsModifiers }
@@ -16,6 +17,8 @@ import com.typesafe.dbuild.project.cleanup.Recycling.{ updateTimeStamp, markSucc
import com.typesafe.dbuild.model.ExtractionOK
import org.apache.ivy.core.module.id.ModuleRevisionId
import com.typesafe.dbuild.model.ProjectRef
+import com.typesafe.dbuild.model.SeqDepsModifiersH._
+import com.typesafe.dbuild.model.SeqStringH._
/** This is used to extract dependencies from projects. */
class Extractor(
diff --git a/project/Build.scala b/project/Build.scala
deleted file mode 100644
index 75d2b1b2..00000000
--- a/project/Build.scala
+++ /dev/null
@@ -1,305 +0,0 @@
-import sbt._
-import Keys._
-
-import Dependencies._
-import com.typesafe.sbt.SbtNativePackager.Universal
-import com.typesafe.sbt.SbtSite.site
-import com.typesafe.sbt.SbtGhPages.{ghpages, GhPagesKeys}
-import com.typesafe.sbt.SbtGit.{git, GitKeys}
-import com.typesafe.sbt.site.SphinxSupport
-import com.typesafe.sbt.site.SphinxSupport.{ enableOutput, generatePdf, generatedPdf, generateEpub, generatedEpub, sphinxInputs, sphinxPackages, Sphinx }
-import com.typesafe.sbt.S3Plugin
-import net.virtualvoid.sbt.cross.CrossPlugin
-import bintray.BintrayKeys._
-
-object DBuilderBuild extends Build with BuildHelper {
-
- override def settings = super.settings ++ SbtSupport.buildSettings
-
- def MyVersion: String = "0.9.7-SNAPSHOT"
-
- lazy val root = (
- Proj("root")
- aggregate(graph, hashing, logging, actorLogging, proj, actorProj, deploy,
- core, plugin, build, support, supportGit, repo, metadata, docs, dist, indexmeta)
- settings(publish := (), publishLocal := (), version := MyVersion)
- settings(CrossPlugin.crossBuildingSettings:_*)
- settings(CrossBuilding.crossSbtVersions := Seq("0.12","0.13"), selectScalaVersion)
- settings(commands += Command.command("release") { state =>
- "clean" :: "publish" :: state
- })
- )
-
- lazy val dist = (
- Proj("dist")
- /*, eclipse plugin bombs if we do this: settings = Packaging.settings */
- settings(Packaging.settings:_*)
- settings(
- mappings in Universal <+= (target, sourceDirectory, scalaVersion in build, version in build) map Packaging.makeDBuildProps,
- mappings in Universal <+= (target, sourceDirectory, scalaVersion in repo, version in repo) map Packaging.makeDRepoProps,
- version := MyVersion,
- selectScalaVersion,
- // disable the publication of artifacts in dist if 2.10
- // (we only retain the correct launcher, which is the
- // one generated using 2.9)
- // This is a pretty ugly hack, but it is quite difficult to prevent sbt from
- // skipping publishing completely (including the ivy file) upon a given condition.
- publishConfiguration <<= (publishConfiguration,scalaVersion) map { (p,sv) =>
- if (sv.startsWith("2.10")) new sbt.PublishConfiguration(None,p.resolverName,Map.empty,Seq.empty,p.logging) else p}
- )
- )
-
- // The component projects...
- lazy val graph = (
- Proj("graph")
- )
- lazy val hashing = (
- Proj("hashing")
- dependsOnRemote(typesafeConfig)
- )
- lazy val deploy = (
- Proj("deploy")
- dependsOnRemote(jacks, jackson, typesafeConfig, commonsLang, aws, uriutil, dispatch, commonsIO, jsch)
- dependsOnSbt(sbtLogging, sbtIo)
- )
-
- lazy val indexmeta = (
- Proj("indexmeta")
- )
-
- lazy val metadata = (
- Proj("metadata")
- dependsOn(graph, hashing, indexmeta, deploy)
- dependsOnRemote(jacks, jackson, typesafeConfig, /*sbtCollections,*/ commonsLang)
- )
-
- lazy val logging = (
- Proj("logging")
- dependsOn(graph)
- dependsOnSbt(sbtLogging, sbtIo, sbtLaunchInt)
- )
- lazy val actorLogging = (
- Proj("actorLogging")
- dependsOn(logging)
- dependsOnAkka()
- dependsOnSbt(sbtLogging, sbtIo, sbtLaunchInt)
- settings(skip210:_*)
- )
- lazy val core = (
- Proj("core")
- dependsOnRemote(javaMail)
- dependsOn(metadata, graph, hashing, logging, repo)
- dependsOnSbt(sbtIo)
- )
- lazy val proj = (
- Proj("proj")
- dependsOn(core, repo, logging)
- dependsOnRemote(javaMail, commonsIO)
- dependsOnSbt(sbtIo, sbtIvy)
- )
- lazy val actorProj = (
- Proj("actorProj")
- dependsOn(core, actorLogging, proj)
- dependsOnSbt(sbtIo, sbtIvy)
- settings(skip210:_*)
- )
- lazy val repo = (
- Proj("repo")
- dependsOn(metadata, logging)
- dependsOnRemote(mvnAether, dispatch, aether, aetherApi, aetherSpi, aetherUtil, aetherImpl, aetherConnectorBasic, aetherFile, aetherHttp, aetherWagon, mvnAether)
- dependsOnSbt(sbtIo, sbtLaunchInt)
- settings(sourceGenerators in Compile <+= (sourceManaged in Compile, version, organization, scalaVersion, streams) map { (dir, version, org, sv, s) =>
- val file = dir / "Defaults.scala"
- if(!dir.isDirectory) dir.mkdirs()
- s.log.info("Generating \"Defaults.scala\" for sbt "+sbtVer(sv)+" and Scala "+sv)
- IO.write(file, """
-package com.typesafe.dbuild.repo.core
-
-object Defaults {
- val version = "%s"
- val org = "%s"
- val hash = "%s"
-}
-""" format (version, org, Process("git log --pretty=format:%H -n 1").lines.head))
- Seq(file)
- })
- )
- lazy val build = (
- Proj("build")
- dependsOn(actorProj, support, supportGit, repo, metadata, deploy, proj)
- dependsOnRemote(aws, uriutil, dispatch, gpgLib, jsch, oro, scallop, commonsLang)
- dependsOnSbt(sbtLaunchInt, sbtLauncher)
- settings(skip210:_*)
- settings(SbtSupport.settings:_*)
- settings(
- // We hook the testLoader of it to make sure all the it tasks have a legit sbt plugin to use.
- // Technically, this just pushes every project. We could outline just the plugin itself, but for now
- // we don't care that much.
- testLoader in IntegrationTest := {
- val ignore = publishLocal.all(ScopeFilter(inAggregates(LocalRootProject, includeRoot=false))).value
- (testLoader in IntegrationTest).value
- },
- parallelExecution in IntegrationTest := false
- )
- )
-
- lazy val support = (
- Proj("support")
- dependsOn(core, repo, metadata, proj % "compile->compile;it->compile", logging % "it")
- dependsOnRemote(mvnEmbedder, mvnWagon, javaMail, aether, aetherApi, aetherSpi, aetherUtil, aetherImpl, aetherConnectorBasic, aetherFile, aetherHttp, slf4jSimple)
- dependsOnSbt(sbtLaunchInt, sbtIvy)
- settings(SbtSupport.settings:_*)
- settings(
- // We hook the testLoader of it to make sure all the it tasks have a legit sbt plugin to use.
- // Technically, this just pushes every project. We could outline just the plugin itself, but for now
- // we don't care that much.
- testLoader in IntegrationTest := {
- val ignore = publishLocal.all(ScopeFilter(inAggregates(LocalRootProject, includeRoot=false))).value
- (testLoader in IntegrationTest).value
- },
- parallelExecution in IntegrationTest := false
- )
- )
- // A separate support project for git/jgit
- lazy val supportGit = (
- Proj("supportGit")
- dependsOn(core, repo, metadata, proj, support)
- dependsOnRemote(mvnEmbedder, mvnWagon, javaMail, jgit)
- dependsOnSbt(sbtLaunchInt, sbtIvy)
- settings(SbtSupport.settings:_*)
- settings(skip210:_*)
- )
-
- // SBT plugin
- lazy val plugin = (
- Proj("plugin")
- settings(sbtPlugin := true)
- dependsOn(support, metadata)
- settings(sourceGenerators in Compile <+= (sourceManaged in Compile, scalaVersion, streams) map { (dir, sv, s) =>
- val file = dir / "Update.scala"
- if(!dir.isDirectory) dir.mkdirs()
- s.log.info("Generating \"Update.scala\" for sbt "+sbtVer(sv)+" and Scala "+sv)
- val where = if (sbtVer(sv).startsWith("0.12")) "Project" else "Def"
- IO.write(file, """
-package com.typesafe.dbuild.plugin
-object SbtUpdate {
-def update[T]: (sbt.%s.ScopedKey[T]) => (T => T) => sbt.%s.Setting[T] = sbt.%s.update[T]
-}
-""" format (where, where, where))
- Seq(file)
- },
- CrossBuilding.crossSbtVersions := Seq("0.12","0.13")
- )
- settings(CrossPlugin.crossBuildingSettings:_*)
- )
-}
-
-
-
-// Additional DSL
-trait BuildHelper extends Build {
-
- def MyVersion: String
-
- // for dependencies
- def sbtVer(scalaVersion:String) = if (scalaVersion.startsWith("2.9")) sbtVersion12 else sbtVersion13
-
- def selectScalaVersion =
- scalaVersion <<= (sbtVersion in sbtPlugin).apply( sb => if (sb.startsWith("0.12")) "2.9.2" else "2.10.2" )
-
- def skip210 =
- Seq(skip in compile <<= scalaVersion.map(_.startsWith("2.10")),
- sources in doc in Compile <<= (sources in doc in Compile,skip in compile).map( (c,s) =>
- if(s) List() else c ) )
-
- def defaultDSettings: Seq[Setting[_]] = Seq(
- version := MyVersion,
- organization := "com.typesafe.dbuild",
- selectScalaVersion,
- libraryDependencies += specs2,
- resolvers += Resolver.typesafeIvyRepo("releases"),
- resolvers += "Typesafe Repository" at "http://repo.typesafe.com/typesafe/releases/",
- publishMavenStyle := false
- )
- /** Create a project. */
- def Proj(name: String) = (
- Project(name, file(if (name=="root") "." else name))
- configs( IntegrationTest )
- settings( Defaults.itSettings : _*)
- settings(defaultDSettings:_*)
- settings(
- licenses += ("Apache 2", url("http://www.apache.org/licenses/LICENSE-2.0"))
- )
- settings(
- bintrayReleaseOnPublish := false,
- licenses += ("Apache-2.0", url("http://opensource.org/licenses/Apache-2.0")),
- bintrayOrganization := Some("typesafe"),
- bintrayRepository := "ivy-releases",
- bintrayPackage := "dbuild"
- )
- )
-
- // DSL for adding remote deps like local deps.
- implicit def p2remote(p: Project): RemoteDepHelper = new RemoteDepHelper(p)
- class RemoteDepHelper(p: Project) {
- def dependsOnRemote(ms: ModuleID*): Project = p.settings(libraryDependencies ++= ms)
- def dependsOnSbt(ms: (String=>ModuleID)*): Project = p.settings(libraryDependencies <++= (scalaVersion) {sv => ms map {_(sbtVer(sv))}})
- def dependsOnAkka(): Project = p.settings(libraryDependencies <+= (scalaVersion) {sv => if (sv.startsWith("2.9")) akkaActor29 else akkaActor210})
- }
-
- lazy val docs = (Proj("docs")
- settings(defaultDSettings ++ site.settings ++ site.sphinxSupport() ++
- ghpages.settings ++ Seq(
-// enableOutput in generatePdf in Sphinx := true,
-// enableOutput in generateEpub in Sphinx := true,
- git.remoteRepo := "git@github.com:typesafehub/dbuild.git",
- GhPagesKeys.synchLocal <<= Docs.synchLocalImpl,
- publish := (),
- publishLocal := ()
- ):_*))
-
-
- // based on the related sbt source code
- object Docs {
- val VersionPattern = """(\d+)\.(\d+)\.(\d+)(-.+)?""".r.pattern
-
- def synchLocalImpl = (mappings in GhPagesKeys.synchLocal, GhPagesKeys.updatedRepository, version, isSnapshot, streams) map {
- (mappings, repo, v, snap, s) =>
- val versioned = repo / v
- if(snap) {
- s.log.info("Replacing docs for previous snapshot in: " + versioned.getAbsolutePath)
- IO.delete(versioned)
- } else if(versioned.exists) {
- s.log.warn("Site for " + v + " was already in: " + versioned.getAbsolutePath)
- s.log.info("Replacing previous docs...")
- IO.delete(versioned)
- }
- IO.copy(mappings map { case (file, target) => (file, versioned / target) })
- IO.touch(repo / ".nojekyll")
- IO.write(repo / "versions.js", versionsJs(sortVersions(collectVersions(repo))))
- if (!snap) IO.write(repo / "index.html",
- """|
- |dbuild
- |
- |
- |""".stripMargin)
- s.log.info("Copied site to " + versioned)
- repo
- }
- def versionsJs(vs: Seq[String]): String = "var availableDocumentationVersions = " + vs.mkString("['", "', '", "']")
- // names of all directories that are explicit versions
- def collectVersions(base: File): Seq[String] = (base * versionFilter).get.map(_.getName)
- def sortVersions(vs: Seq[String]): Seq[String] = vs.sortBy(versionComponents).reverse
- def versionComponents(v: String): Option[(Int,Int,Int,Option[String])] = {
- val m = VersionPattern.matcher(v)
- if(m.matches())
- Some( (m.group(1).toInt, m.group(2).toInt, m.group(3).toInt, Option(m.group(4))) )
- else
- None
- }
- def versionFilter = new PatternFilter(VersionPattern) && DirectoryFilter
-
- }
-
-}
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 769b774a..9d5281d9 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -1,24 +1,15 @@
import sbt._
+import SyntaxAdapter.syntax._
-
-object Dependencies {
-
- val sbtVersion12 = "0.12.4"
- val sbtVersion13 = "0.13.0"
+class CommonDependencies {
val mvnVersion = "3.2.3"
- val aetherVersion = "1.0.0.v20140518"
val typesafeConfig = "com.typesafe" % "config" % "1.2.1"
- val akkaActor29 = "com.typesafe.akka" % "akka-actor" % "2.0.5"
- val akkaActor210 = "com.typesafe.akka" %% "akka-actor" % "2.1.4"
-
-// 2.1.1 per 2.10, 1.12.4.1 per 2.9.x. 1.12.3 is the only common one
-// val specs2 = "org.specs2" %% "specs2" % "2.1.1" % "test"
- val specs2 = "org.specs2" %% "specs2" % "1.12.3" % "it,test"
val dispatch = "net.databinder" %% "dispatch-http" % "0.8.10"
+ val aetherVersion = "1.0.0.v20140518"
val aether = "org.eclipse.aether" % "aether" % aetherVersion
val aetherApi = "org.eclipse.aether" % "aether-api" % aetherVersion
val aetherSpi = "org.eclipse.aether" % "aether-spi" % aetherVersion
@@ -29,16 +20,17 @@ object Dependencies {
val aetherHttp = "org.eclipse.aether" % "aether-transport-http" % aetherVersion
val aetherWagon = "org.eclipse.aether" % "aether-transport-wagon" % aetherVersion
+ val ivy = "org.scala-sbt.ivy" % "ivy" % "2.3.0-sbt-2cc8d2761242b072cedb0a04cb39435c4fa24f9a"
+
val mvnAether = "org.apache.maven" % "maven-aether-provider" % mvnVersion
val mvnWagon = "org.apache.maven.wagon" % "wagon-http" % "2.2"
val mvnEmbedder = "org.apache.maven" % "maven-embedder" % mvnVersion
- val jacks = "com.cunei" %% "jacks" % "2.1.9"
+ val jacks = "com.cunei" %% "jacks" % "2.2.4"
val jackson = "com.fasterxml.jackson.core" % "jackson-annotations" % "2.1.4"
val aws = "com.amazonaws" % "aws-java-sdk" % "1.3.29"
val uriutil = "org.eclipse.equinox" % "org.eclipse.equinox.common" % "3.6.0.v20100503"
- val gpgLib = "com.jsuereth" %% "gpg-library" % "0.8.2"
val javaMail = "javax.mail" % "mail" % "1.4.7"
val commonsLang = "commons-lang" % "commons-lang" % "2.6"
val commonsIO = "commons-io" % "commons-io" % "2.4"
@@ -50,12 +42,4 @@ object Dependencies {
val slf4jSimple = "org.slf4j" % "slf4j-simple" % "1.7.7"
- def sbtIo(v:String) = "org.scala-sbt" % "io" % v
- def sbtIvy(v:String) = "org.scala-sbt" % "ivy" % v
- def sbtLogging(v:String) = "org.scala-sbt" % "logging" % v
- def sbtLaunchInt(v:String) = "org.scala-sbt" % "launcher-interface" % v % "provided"
-// def sbtCollections(v:String) = "org.scala-sbt" % "collections" % v
- def sbtLauncher(v:String) = "org.scala-sbt" % "launcher" % v
-
-
}
diff --git a/project/RemoteDepHelper.scala b/project/RemoteDepHelper.scala
new file mode 100644
index 00000000..71d7bad9
--- /dev/null
+++ b/project/RemoteDepHelper.scala
@@ -0,0 +1,23 @@
+import sbt._
+import Keys._
+import Dependencies._
+import SyntaxAdapter.syntax._
+
+// DSL for adding remote deps like local deps.
+class RemoteDepHelper(p: Project) {
+ def dependsOnRemote(ms: ModuleID*): Project = p.settings(libraryDependencies ++= ms)
+ def dependsOnSbt(ms: (String=>ModuleID)*): Project = dependsOnSbtP(false, ms:_*)
+ def dependsOnSbtProvided(ms: (String=>ModuleID)*): Project = dependsOnSbtP(true, ms:_*)
+ def dependsOnSbtP(provided: Boolean, ms: (String=>ModuleID)*): Project =
+ p.settings(libraryDependencies ++= {
+ val v = sbtVersion.value
+ ms map { lib =>
+ val d = lib(v)
+ if (provided) (d % "provided") else d
+ }
+ })
+}
+object RemoteDepHelper {
+ implicit def p2remote(p: Project): RemoteDepHelper = new RemoteDepHelper(p)
+}
+
diff --git a/project/SbtSupport.scala b/project/SbtSupport.scala
index ebd28f15..4325fbab 100644
--- a/project/SbtSupport.scala
+++ b/project/SbtSupport.scala
@@ -1,21 +1,25 @@
import sbt._
import Keys._
+import SyntaxAdapter.syntaxio._
+import SyntaxAdapter.{syntaxCompile=>Compile}
object SbtSupport {
val sbtLaunchJarUrl = SettingKey[String]("sbt-launch-jar-url")
val sbtLaunchJarLocation = SettingKey[File]("sbt-launch-jar-location")
- val sbtLaunchJar = TaskKey[File]("sbt-launch-jar", "Resolves SBT launch jar")
+ val sbtLaunchJar = TaskKey[Seq[java.io.File]]("sbt-launch-jar", "Resolves SBT launch jar")
def currentDownloadUrl(v: String) = "http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/"+v+"/sbt-launch.jar"
def oldDownloadUrl(v: String) = "http://repo.typesafe.com/typesafe/ivy-releases/org.scala-tools.sbt/sbt-launch/"+v+"/sbt-launch.jar"
+ def oneDotZeroDownloadUrl(v: String) = "https://repo1.maven.org/maven2/org/scala-sbt/sbt-launch/"+v+"/sbt-launch.jar"
def downloadUrlForVersion(v: String) = (v split "[^\\d]" filter (_ matches "[\\d]+") map (_.toInt)) match {
case Array(0, 11, x, _*) if x >= 3 => currentDownloadUrl(v)
case Array(0, y, _*) if y >= 12 => currentDownloadUrl(v)
+ case Array(1, _, _*) => oneDotZeroDownloadUrl(v)
case _ => oldDownloadUrl(v)
}
- def downloadFile(uri: String, file: File): File = {
+ def downloadFile(uri: String, file: File): Seq[File] = {
import dispatch.classic._
if(!file.exists) {
// oddly, some places require us to create the file before writing...
@@ -25,17 +29,15 @@ object SbtSupport {
finally writer.close()
}
// TODO - GPG Trust validation.
- file
+ Seq(file)
}
val buildSettings: Seq[Setting[_]] = Seq(
-// sbtLaunchJarUrl <<= sbtVersion apply downloadUrlForVersion,
- sbtLaunchJarUrl := downloadUrlForVersion(Dependencies.sbtVersion13),
- sbtLaunchJarLocation <<= baseDirectory (_ / "target" / "sbt" / "sbt-launch.jar"),
- sbtLaunchJar <<= (sbtLaunchJarUrl, sbtLaunchJarLocation) map downloadFile
+ sbtLaunchJarUrl := downloadUrlForVersion(sbtVersion.value),
+ sbtLaunchJarLocation := baseDirectory.value / "target" / "sbt" / "sbt-launch.jar",
+ sbtLaunchJar := downloadFile(sbtLaunchJarUrl.value, sbtLaunchJarLocation.value)
)
-
- val settings: Seq[Setting[_]] = Seq(
- resourceGenerators in Compile <+= (sbtLaunchJar.task map (Seq apply _))
+ val settings: Seq[Setting[_]] = buildSettings ++ Seq(
+ resourceGenerators in Compile += sbtLaunchJar.taskValue
)
}
diff --git a/project/bintray.sbt b/project/bintray.sbt
deleted file mode 100644
index 919c7d81..00000000
--- a/project/bintray.sbt
+++ /dev/null
@@ -1,13 +0,0 @@
-// Note: currently using an unofficial pre-release
-
-resolvers += Resolver.url("bintray-eed3si9n-sbt-plugins", url("https://dl.bintray.com/eed3si9n/sbt-plugins/"))(Resolver.ivyStylePatterns)
-
-addSbtPlugin("com.eed3si9n" % "bintray-sbt" % "0.3.0-a1934a5457f882053b08cbdab5fd4eb3c2d1285d")
-
-//resolvers += Resolver.url(
-// "bintray-sbt-plugin-releases",
-// url("http://dl.bintray.com/content/sbt/sbt-plugin-releases"))(
-// Resolver.ivyStylePatterns)
-//
-//addSbtPlugin("me.lessis" % "bintray-sbt" % "0.3.0")
-
diff --git a/project/build.properties b/project/build.properties
index a6e117b6..68026476 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1,2 @@
+#sbt.version=1.0.0-M4
sbt.version=0.13.8
diff --git a/project/build.sbt b/project/build.sbt
new file mode 100644
index 00000000..715ecb3e
--- /dev/null
+++ b/project/build.sbt
@@ -0,0 +1 @@
+lazy val root = (project in file(".")).dependsOn(BintrayDep211.bintrayIf211:_*)
diff --git a/project/cross-plugin.sbt b/project/cross-plugin.sbt
index f4fc19ac..c045db63 100644
--- a/project/cross-plugin.sbt
+++ b/project/cross-plugin.sbt
@@ -1 +1 @@
-addSbtPlugin("net.virtual-void" % "sbt-cross-building" % "0.8.1")
+//addSbtPlugin("net.virtual-void" % "sbt-cross-building" % "0.8.1")
diff --git a/project/native-packaging.sbt b/project/native-packaging.sbt
deleted file mode 100644
index 2cd73a61..00000000
--- a/project/native-packaging.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "0.8.0")
diff --git a/project/plugins-2.10.sbt b/project/plugins-2.10.sbt
new file mode 100644
index 00000000..44d5cf25
--- /dev/null
+++ b/project/plugins-2.10.sbt
@@ -0,0 +1,25 @@
+// only if scalaVersion is 2.10:
+//addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "0.7.0")
+//addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.5.2")
+//addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "0.8.0") // could be 1.1.4 now
+//addSbtPlugin("com.typesafe.sbt" % "sbt-s3" % "0.9")
+//addSbtPlugin("com.eed3si9n" % "bintray-sbt" % "0.3.0-a1934a5457f882053b08cbdab5fd4eb3c2d1285d")
+// -> which is a patched version of addSbtPlugin("me.lessis" % "bintray-sbt" % "0.3.0")
+
+
+resolvers += Resolver.url("bintray-eed3si9n-sbt-plugins", url("https://dl.bintray.com/eed3si9n/sbt-plugins/"))(Resolver.ivyStylePatterns)
+resolvers += "jgit-repo" at "http://download.eclipse.org/jgit/maven"
+
+
+libraryDependencies ++= {
+ val dependencies = Seq("com.typesafe.sbt" % "sbt-site" % "0.7.0",
+ "com.typesafe.sbt" % "sbt-ghpages" % "0.5.2",
+ "com.typesafe.sbt" % "sbt-native-packager" % "0.8.0",
+ "com.typesafe.sbt" % "sbt-s3" % "0.9",
+ "com.eed3si9n" % "bintray-sbt" % "0.3.0-a1934a5457f882053b08cbdab5fd4eb3c2d1285d")
+ val sbtV = (sbtBinaryVersion in update).value
+ val scalaV = (scalaBinaryVersion in update).value
+ if (scalaV.startsWith("2.10"))
+ dependencies map { sbt.Defaults.sbtPluginExtra(_, sbtV, scalaV) } else Seq.empty
+}
+
diff --git a/project/project/src/main/scala-2.10/bintrayIf211.scala b/project/project/src/main/scala-2.10/bintrayIf211.scala
new file mode 100644
index 00000000..bdb42d3e
--- /dev/null
+++ b/project/project/src/main/scala-2.10/bintrayIf211.scala
@@ -0,0 +1,4 @@
+object BintrayDep211 {
+ val bintrayIf211 = Seq[sbt.ClasspathDep[sbt.ProjectReference]]()
+}
+
diff --git a/project/project/src/main/scala-2.11/bintrayIf211.scala b/project/project/src/main/scala-2.11/bintrayIf211.scala
new file mode 100644
index 00000000..c12b0fd8
--- /dev/null
+++ b/project/project/src/main/scala-2.11/bintrayIf211.scala
@@ -0,0 +1,7 @@
+import sbt._
+import syntax._
+object BintrayDep211 {
+ lazy val bintrayProject = sbt.RootProject(uri("git://github.com/eed3si9n/bintray-sbt#topic/sbt1.0.0-M4"))
+ val bintrayIf211 = Seq[sbt.internal.util.Eval[sbt.ClasspathDep[sbt.ProjectReference]]](bintrayProject)
+}
+
diff --git a/project/sbts3.sbt b/project/sbts3.sbt
deleted file mode 100644
index c241d447..00000000
--- a/project/sbts3.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("com.typesafe.sbt" % "sbt-s3" % "0.5")
diff --git a/project/sbtsite.sbt b/project/sbtsite.sbt
deleted file mode 100644
index 5266e5ce..00000000
--- a/project/sbtsite.sbt
+++ /dev/null
@@ -1,5 +0,0 @@
-resolvers += "jgit-repo" at "http://download.eclipse.org/jgit/maven"
-
-addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "0.7.0")
-
-addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.5.2")
diff --git a/project/src/main/scala-2.10/Dependencies.scala b/project/src/main/scala-2.10/Dependencies.scala
new file mode 100644
index 00000000..091c2189
--- /dev/null
+++ b/project/src/main/scala-2.10/Dependencies.scala
@@ -0,0 +1,20 @@
+import sbt._
+import SyntaxAdapter.syntax._
+
+object Dependencies extends CommonDependencies {
+
+ val akkaActor = "com.typesafe.akka" %% "akka-actor" % "2.1.4"
+
+// 2.1.1 per 2.10, 1.12.4.1 per 2.9.x. 1.12.3 is the only common one between 2.9 and 2.10
+ val specs2 = "org.specs2" %% "specs2" % "2.1.1" % "it,test"
+
+ def sbtIo(v:String) = "org.scala-sbt" % "io" % v
+ def sbtIvy(v:String) = "org.scala-sbt" % "ivy" % v
+ def sbtLogging(v:String) = "org.scala-sbt" % "logging" % v
+ def sbtLaunchInt(v:String) = "org.scala-sbt" % "launcher" % v
+ def sbtLauncher(v:String) = "org.scala-sbt" % "launcher" % v
+ def sbtSbt(v:String) = "org.scala-sbt" % "sbt" % v
+
+ val zincProvidedIf211 = Seq[ModuleID]()
+ val gpgLibIf210 = Seq("com.jsuereth" %% "gpg-library" % "0.8.2")
+}
diff --git a/project/src/main/scala-2.10/SyntaxAdapter.scala b/project/src/main/scala-2.10/SyntaxAdapter.scala
new file mode 100644
index 00000000..0c05c5ac
--- /dev/null
+++ b/project/src/main/scala-2.10/SyntaxAdapter.scala
@@ -0,0 +1,5 @@
+object SyntaxAdapter {
+ val syntax = new {}
+ val syntaxio = syntax
+ val syntaxCompile = sbt.Compile
+}
diff --git a/project/src/main/scala-2.10/docs.scala b/project/src/main/scala-2.10/docs.scala
new file mode 100644
index 00000000..1390599a
--- /dev/null
+++ b/project/src/main/scala-2.10/docs.scala
@@ -0,0 +1,69 @@
+import sbt.Keys._
+import sbt.Path._
+import sbt.IO
+import java.io.File
+import sbt.{Setting,PatternFilter,DirectoryFilter}
+import com.typesafe.sbt.SbtSite.site
+import com.typesafe.sbt.SbtGhPages.{ghpages, GhPagesKeys}
+import com.typesafe.sbt.SbtGit.{git, GitKeys}
+import com.typesafe.sbt.site.SphinxSupport
+import com.typesafe.sbt.site.SphinxSupport.{ enableOutput, generatePdf, generatedPdf, generateEpub,
+ generatedEpub, sphinxInputs, sphinxPackages, Sphinx }
+
+// based on the related sbt source code
+object DocsSupport {
+ val VersionPattern = """(\d+)\.(\d+)\.(\d+)(-.+)?""".r.pattern
+
+ def synchLocalImpl = (mappings in GhPagesKeys.synchLocal, GhPagesKeys.updatedRepository, version, isSnapshot, streams) map {
+ (mappings, repo, v, snap, s) =>
+ val versioned = repo / v
+ if(snap) {
+ s.log.info("Replacing docs for previous snapshot in: " + versioned.getAbsolutePath)
+ IO.delete(versioned)
+ } else if(versioned.exists) {
+ s.log.warn("Site for " + v + " was already in: " + versioned.getAbsolutePath)
+ s.log.info("Replacing previous docs...")
+ IO.delete(versioned)
+ }
+ IO.copy(mappings map { case (file, target) => (file, versioned / target) })
+ IO.touch(repo / ".nojekyll")
+ IO.write(repo / "versions.js", versionsJs(sortVersions(collectVersions(repo))))
+ if (!snap) IO.write(repo / "index.html",
+ """|
+ |dbuild
+ |
+ |
+ |""".stripMargin)
+ s.log.info("Copied site to " + versioned)
+ repo
+ }
+ def versionsJs(vs: Seq[String]): String = "var availableDocumentationVersions = " + vs.mkString("['", "', '", "']")
+ // names of all directories that are explicit versions
+ def collectVersions(base: File): Seq[String] = (base * versionFilter).get.map(_.getName)
+ def sortVersions(vs: Seq[String]): Seq[String] = vs.sortBy(versionComponents).reverse
+ def versionComponents(v: String): Option[(Int,Int,Int,Option[String])] = {
+ val m = VersionPattern.matcher(v)
+ if(m.matches())
+ Some( (m.group(1).toInt, m.group(2).toInt, m.group(3).toInt, Option(m.group(4))) )
+ else
+ None
+ }
+ def versionFilter = new PatternFilter(VersionPattern) && DirectoryFilter
+
+ import com.typesafe.sbt.SbtSite.SiteKeys.makeSite
+ import com.typesafe.sbt.SbtSite.SiteKeys.siteSourceDirectory
+ def settings:Seq[Setting[_]] = site.settings ++ site.sphinxSupport() ++
+ ghpages.settings ++ Seq(
+ enableOutput in generatePdf in Sphinx := false,
+ enableOutput in generateEpub in Sphinx := false,
+ git.remoteRepo := "git@github.com:typesafehub/dbuild.git",
+ GhPagesKeys.synchLocal <<= DocsSupport.synchLocalImpl,
+ publish := (),
+ publishLocal := (),
+ makeSite <<= makeSite.dependsOn(sbt.Def.task {
+ val file = (siteSourceDirectory in Sphinx).value / "version.py"
+ IO.write(file, ("release = '%s'\n" format (version.value)))
+ })
+ )
+}
diff --git a/project/packaging.scala b/project/src/main/scala-2.10/packaging.scala
similarity index 75%
rename from project/packaging.scala
rename to project/src/main/scala-2.10/packaging.scala
index e6cbfd65..671bf830 100644
--- a/project/packaging.scala
+++ b/project/src/main/scala-2.10/packaging.scala
@@ -11,21 +11,21 @@ object Packaging {
def mapArt[A](key:sbt.TaskKey[_], kind: String) =
// cheat a little: by setting the classifier to the version number, we can
// publish to Ivy the tgz/zip with the full name, like "dbuild-0.8.1.tgz".
- artifact in (Universal, key) <<= (artifact in (Universal, key), version) {
- (a,v) => a.copy(`type` = kind, extension = kind, `classifier` = Some(v))
- }
+ artifact in (Universal, key) :=
+ (artifact in (Universal, key)).value.copy(`type` = kind, extension = kind, `classifier` = Some(version.value))
- def settings: Seq[Setting[_]] = packagerSettings ++ S3Plugin.s3Settings ++ Seq(
+ def settings(build:Project, repo:Project): Seq[Setting[_]] = packagerSettings ++ S3Plugin.s3Settings ++
+ SbtSupport.buildSettings ++ packagerSettings ++ Seq(
organization := "com.typesafe.dbuild",
name := "dbuild",
wixConfig := ,
- maintainer := "Antonio Cunei ",
+ maintainer := "Antonio Cunei ",
packageSummary := "Multi-project builder.",
packageDescription := """A multi-project builder capable of glueing together a set of related projects.""",
- mappings in Universal <+= SbtSupport.sbtLaunchJar map { jar =>
+ mappings in Universal ++= SbtSupport.sbtLaunchJar.value map { jar =>
jar -> "bin/sbt-launch.jar"
},
- name in Universal <<= (name,version).apply((n,v) => (n+"-"+v)),
+ name in Universal := name.value + "-" + version.value,
rpmRelease := "1",
rpmVendor := "typesafe",
rpmUrl := Some("http://github.com/typesafehub/dbuild"),
@@ -37,8 +37,11 @@ object Packaging {
// S3 stuff
host in upload := "downloads.typesafe.com",
- mappings in upload <<= (packageZipTarball in Universal, packageBin in Universal, name, version, scalaVersion) map
- {(tgz,zip,n,v,sv) => if(sv.startsWith("2.10")) Seq.empty else Seq(tgz,zip) map {f=>(f,n+"/"+v+"/"+f.getName)}},
+ mappings in upload := { if(scalaVersion.value.startsWith("2.10")) Seq.empty else
+ Seq((packageZipTarball in Universal).value, (packageBin in Universal).value) map {
+ f => (f, name.value+"/"+version.value+"/"+f.getName)
+ }
+ },
progress in upload := true,
credentials += Credentials(Path.userHome / ".s3credentials"),
// Important: always issue "clean" before an S3 upload
@@ -55,9 +58,13 @@ object Packaging {
crossPaths := false
) ++
- addArtifact(artifact in (Universal, packageZipTarball), packageZipTarball in Universal) ++
- addArtifact(artifact in (Universal, packageBin), packageBin in Universal)
-
+ addArtifact(artifact in (Universal, packageZipTarball), packageZipTarball in Universal) ++
+ addArtifact(artifact in (Universal, packageBin), packageBin in Universal) ++
+ Seq(mappings in Universal ++= Seq(
+ Packaging.makeDBuildProps(target.value, sourceDirectory.value, (scalaVersion in build).value, (version in build).value),
+ Packaging.makeDRepoProps(target.value, sourceDirectory.value, (scalaVersion in build).value, (version in build).value)
+ )
+ )
def makeDRepoProps(t: File, src: File, sv: String, v: String): (File, String) = makeProps(t,src,sv,v,"repo","com.typesafe.dbuild.repo.core.SbtRepoMain")
def makeDBuildProps(t: File, src: File, sv: String, v: String): (File, String) = makeProps(t,src,sv,v,"build","com.typesafe.dbuild.build.SbtBuildMain")
diff --git a/project/src/main/scala-2.11/Dependencies.scala b/project/src/main/scala-2.11/Dependencies.scala
new file mode 100644
index 00000000..2f970a7f
--- /dev/null
+++ b/project/src/main/scala-2.11/Dependencies.scala
@@ -0,0 +1,20 @@
+import sbt._
+import SyntaxAdapter.syntax._
+
+object Dependencies extends CommonDependencies {
+
+ val akkaActor = "com.typesafe.akka" %% "akka-actor" % "2.4.11"
+
+// 2.1.1 per 2.10, 1.12.4.1 per 2.9.x. 1.12.3 is the only common one between 2.9 and 2.10
+ val specs2 = "org.specs2" %% "specs2" % "3.7" % "it,test"
+
+ def sbtIo(v:String) = "org.scala-sbt" %% "io" % "1.0.0-M6"
+ def sbtIvy(v:String) = "org.scala-sbt" %% "librarymanagement" % "0.1.0-M12"
+ def sbtLogging(v:String) = "org.scala-sbt" %% "util-logging" % "0.1.0-M14"
+ def sbtLaunchInt(v:String) = "org.scala-sbt" % "launcher" % "1.0.0"
+ def sbtLauncher(v:String) = "org.scala-sbt" % "launcher" % "1.0.0"
+ def sbtSbt(v:String) = "org.scala-sbt" % "sbt" % v
+
+ val zincProvidedIf211 = Seq("org.scala-sbt" %% "zinc" % "1.0.0-X1" % "provided")
+ val gpgLibIf210 = Seq[librarymanagement.ModuleID]()
+}
diff --git a/project/src/main/scala-2.11/SyntaxAdapter.scala b/project/src/main/scala-2.11/SyntaxAdapter.scala
new file mode 100644
index 00000000..9ae848d7
--- /dev/null
+++ b/project/src/main/scala-2.11/SyntaxAdapter.scala
@@ -0,0 +1,5 @@
+object SyntaxAdapter {
+ val syntax = sbt.syntax
+ val syntaxio = sbt.io.syntax
+ val syntaxCompile = sbt.syntax.Compile
+}
diff --git a/project/src/main/scala-2.11/docs.scala b/project/src/main/scala-2.11/docs.scala
new file mode 100644
index 00000000..099befa8
--- /dev/null
+++ b/project/src/main/scala-2.11/docs.scala
@@ -0,0 +1,3 @@
+object DocsSupport {
+ def settings:Seq[sbt.Setting[_]] = Seq.empty
+}
diff --git a/project/src/main/scala-2.11/packaging.scala b/project/src/main/scala-2.11/packaging.scala
new file mode 100644
index 00000000..7ac96650
--- /dev/null
+++ b/project/src/main/scala-2.11/packaging.scala
@@ -0,0 +1,18 @@
+import sbt.internal.librarymanagement.PublishConfiguration
+import sbt.Keys._
+import sbt.Project
+
+object Packaging {
+ def settings(build:Project, repo:Project): Seq[sbt.Setting[_]] = Seq(
+ // disable the publication of artifacts in dist if 2.11
+ // (we only retain the correct launcher, which is the
+ // one generated using 2.10)
+ // This is a pretty ugly hack, but it is quite difficult to prevent sbt from
+ // skipping publishing completely (including the ivy file) upon a given condition.
+ publishConfiguration := {
+ val p = publishConfiguration.value
+ new PublishConfiguration(None,p.resolverName,Map.empty,Seq.empty,p.logging)
+ }
+ // TODO: fuse this with skip211()
+ )
+}
diff --git a/repo/src/main/scala/com/typesafe/dbuild/repo/core/CachedRepository.scala b/repo/src/main/scala/com/typesafe/dbuild/repo/core/CachedRepository.scala
index 1e52d297..af01de5a 100644
--- a/repo/src/main/scala/com/typesafe/dbuild/repo/core/CachedRepository.scala
+++ b/repo/src/main/scala/com/typesafe/dbuild/repo/core/CachedRepository.scala
@@ -1,7 +1,9 @@
package com.typesafe.dbuild.repo.core
import java.io.File
-import sbt.IO
+import com.typesafe.dbuild.adapter.Adapter
+import Adapter.IO
+import Adapter.Path._
import dispatch.classic._
/** A cached remote repository. */
@@ -83,4 +85,4 @@ object Remote {
}
}
-}
\ No newline at end of file
+}
diff --git a/repo/src/main/scala/com/typesafe/dbuild/repo/core/GlobalDirs.scala b/repo/src/main/scala/com/typesafe/dbuild/repo/core/GlobalDirs.scala
index 47b3a91d..c5c0b2ff 100644
--- a/repo/src/main/scala/com/typesafe/dbuild/repo/core/GlobalDirs.scala
+++ b/repo/src/main/scala/com/typesafe/dbuild/repo/core/GlobalDirs.scala
@@ -2,7 +2,8 @@ package com.typesafe.dbuild.repo.core
import com.typesafe.dbuild.model._
import java.io.File
-import sbt.Path._
+import com.typesafe.dbuild.adapter.{Adapter,Defaults}
+import Adapter.Path._
// TODO - Locally configured area for projects
// With some kind of locking to prevent more than one
@@ -70,12 +71,13 @@ object GlobalDirs {
def checkForObsoleteDirs(f: (=> String) => Unit) = {
def issueWarnings(root: File, baseDirName: String, dirName: String) = {
- import sbt.{ FileFilter => FF, DirectoryFilter => DF }
- root.*(DF && ((baseDirName: FF) || baseDirName + "-*") && -(dirName: FF)).get.foreach { z =>
+ import Adapter.{ FileFilter => FF, DirectoryFilter => DF, toFF }
+ import Adapter.syntaxio._
+ root.*(DF && ((toFF(baseDirName)) || toFF(baseDirName + "-*")) && -(toFF(dirName))).get.foreach { z =>
f("WARNING: This directory is not in use: " + z.getCanonicalPath)
}
}
issueWarnings(baseDir, targetBaseDirName, targetDirName)
issueWarnings(dbuildHomeDir, userCacheDirBaseName, userCacheDirName)
}
-}
\ No newline at end of file
+}
diff --git a/repo/src/main/scala/com/typesafe/dbuild/repo/core/Helper.scala b/repo/src/main/scala/com/typesafe/dbuild/repo/core/Helper.scala
index 434728ad..34edcbbf 100644
--- a/repo/src/main/scala/com/typesafe/dbuild/repo/core/Helper.scala
+++ b/repo/src/main/scala/com/typesafe/dbuild/repo/core/Helper.scala
@@ -2,7 +2,9 @@ package com.typesafe.dbuild.repo.core
import com.typesafe.dbuild.model._
import java.io.File
-import sbt.{ RichFile, IO, Path }
+import com.typesafe.dbuild.adapter.Adapter
+import Adapter.{ RichFile, IO, Path }
+import Adapter.syntaxio._
import Path._
import com.typesafe.dbuild.model.Utils.{ writeValue, readValue }
import com.typesafe.dbuild.logging.Logger
@@ -292,4 +294,4 @@ object LocalRepoHelper {
meta.versions
}
-}
\ No newline at end of file
+}
diff --git a/repo/src/main/scala/com/typesafe/dbuild/repo/core/OfflineLocalCacheRepository.scala b/repo/src/main/scala/com/typesafe/dbuild/repo/core/OfflineLocalCacheRepository.scala
index b24474a5..0fb391e0 100644
--- a/repo/src/main/scala/com/typesafe/dbuild/repo/core/OfflineLocalCacheRepository.scala
+++ b/repo/src/main/scala/com/typesafe/dbuild/repo/core/OfflineLocalCacheRepository.scala
@@ -1,7 +1,7 @@
package com.typesafe.dbuild.repo.core
import java.io.File
-import sbt.IO
+import com.typesafe.dbuild.adapter.Adapter.IO
/** A cached remote repository. */
class OfflineLocalCacheRepository(cacheDir: File) extends ReadableRepository {
@@ -25,4 +25,4 @@ class LocalRepository(repo: File)
val cacheFile = new File(repo, key)
IO.copyFile(file, cacheFile, false)
}
-}
\ No newline at end of file
+}
diff --git a/repo/src/main/scala/com/typesafe/dbuild/repo/core/ProjectRepoMain.scala b/repo/src/main/scala/com/typesafe/dbuild/repo/core/ProjectRepoMain.scala
index 0e78b2db..ebc86a8a 100644
--- a/repo/src/main/scala/com/typesafe/dbuild/repo/core/ProjectRepoMain.scala
+++ b/repo/src/main/scala/com/typesafe/dbuild/repo/core/ProjectRepoMain.scala
@@ -3,7 +3,9 @@ package com.typesafe.dbuild.repo.core
import com.typesafe.dbuild.model._
import LocalRepoHelper.ResolutionResult
import java.io.File
-import sbt.{RichFile, IO, Path}
+import com.typesafe.dbuild.adapter.Adapter
+import Adapter.{ RichFile, IO, Path }
+import Adapter.syntaxio._
import Path._
import com.typesafe.dbuild.model.Utils.writeValue
diff --git a/repo/src/main/scala/com/typesafe/dbuild/repo/core/Repository.scala b/repo/src/main/scala/com/typesafe/dbuild/repo/core/Repository.scala
index 81bbe995..03d714ce 100644
--- a/repo/src/main/scala/com/typesafe/dbuild/repo/core/Repository.scala
+++ b/repo/src/main/scala/com/typesafe/dbuild/repo/core/Repository.scala
@@ -1,7 +1,9 @@
package com.typesafe.dbuild.repo.core
import java.io.File
-import sbt.Path._
+import com.typesafe.dbuild.adapter.Adapter
+import Adapter.IO
+import Adapter.Path._
/** Interface for a repository of raw key-value files. */
trait ReadableRepository {
@@ -25,7 +27,7 @@ object Repository {
def readCredFile(f: File): Option[(String, Credentials)] =
if (f.exists) {
val props = new java.util.Properties
- sbt.IO.load(props, f)
+ IO.load(props, f)
def getProp(name: String): Option[String] =
Option(props getProperty name)
for {
diff --git a/support/src/it/scala/com/typesafe/dbuild/support/sbt/SbtExtractionSpec.scala b/support/src/it/scala/com/typesafe/dbuild/support/sbt/SbtExtractionSpec.scala
index 544d0104..dd334588 100644
--- a/support/src/it/scala/com/typesafe/dbuild/support/sbt/SbtExtractionSpec.scala
+++ b/support/src/it/scala/com/typesafe/dbuild/support/sbt/SbtExtractionSpec.scala
@@ -5,7 +5,8 @@ package sbt
import com.typesafe.dbuild.logging.{ConsoleLogger, Logger}
import com.typesafe.dbuild.model.{ProjectRef, SbtExtraConfig, ProjectBuildConfig, ExtractionConfig}
import org.specs2.mutable.Specification
-
+import com.typesafe.dbuild.model.SeqSeqStringH._
+import com.typesafe.dbuild.model.SeqStringH._
// TDOO - Because this requires the sbt plugin to be published, we have to publsh locally
// before we can run integration tests.
@@ -82,4 +83,4 @@ object SbtExtractionSpec extends Specification {
}
}
}
-}
\ No newline at end of file
+}
diff --git a/support/src/it/scala/com/typesafe/dbuild/support/sbt/SbtTestHarness.scala b/support/src/it/scala/com/typesafe/dbuild/support/sbt/SbtTestHarness.scala
index eb9aeb0f..9be033b2 100644
--- a/support/src/it/scala/com/typesafe/dbuild/support/sbt/SbtTestHarness.scala
+++ b/support/src/it/scala/com/typesafe/dbuild/support/sbt/SbtTestHarness.scala
@@ -11,7 +11,10 @@ object SbtTestHarness {
url: URL,
ivyPattern: String = defaultIvyPatterns,
artifactPattern: String = defaultIvyPatterns,
- mavenCompatible: Boolean = false) extends xsbti.IvyRepository
+ mavenCompatible: Boolean = false,
+ descriptorOptional: Boolean = false,
+ skipConsistencyCheck:Boolean = false
+ ) extends xsbti.IvyRepository
private case class MvnRepo(id: String, url: URL) extends xsbti.MavenRepository
// TODO - we should pull in whatever local ~/.sbt/repositories specifies, or what the current sbt project is using,
// so we dont' have super slow integration tests.
diff --git a/support/src/main/scala/com/typesafe/dbuild/support/SbtUtil.scala b/support/src/main/scala/com/typesafe/dbuild/support/SbtUtil.scala
index 69d90c3e..b502b529 100644
--- a/support/src/main/scala/com/typesafe/dbuild/support/SbtUtil.scala
+++ b/support/src/main/scala/com/typesafe/dbuild/support/SbtUtil.scala
@@ -1,6 +1,6 @@
package com.typesafe.dbuild.support
import com.typesafe.dbuild.model.SbtPluginAttrs
-import _root_.sbt.{ ModuleID => SbtModuleID, Artifact => SbtArtifact }
+import com.typesafe.dbuild.adapter.Adapter.{ ModuleID => SbtModuleID, Artifact => SbtArtifact }
import org.apache.ivy.core.module.id.{ ModuleRevisionId => IvyModuleRevisionId }
import _root_.scala.collection.JavaConversions._
import _root_.java.util.{ Map => JavaMap }
diff --git a/support/src/main/scala/com/typesafe/dbuild/support/aether/AetherBuildSystem.scala b/support/src/main/scala/com/typesafe/dbuild/support/aether/AetherBuildSystem.scala
index 9462ed49..e4f5ac2d 100644
--- a/support/src/main/scala/com/typesafe/dbuild/support/aether/AetherBuildSystem.scala
+++ b/support/src/main/scala/com/typesafe/dbuild/support/aether/AetherBuildSystem.scala
@@ -21,8 +21,10 @@ import com.typesafe.dbuild.project.{ BuildSystem, BuildData }
import com.typesafe.dbuild.model._
import com.typesafe.dbuild.repo.core.LocalArtifactMissingException
import java.io.File
-import sbt.Path._
-import sbt.IO
+import com.typesafe.dbuild.adapter.Adapter
+import Adapter.Path._
+import Adapter.{IO,allPaths}
+import Adapter.syntaxio._
import com.typesafe.dbuild.logging.Logger
import sys.process._
import com.typesafe.dbuild.repo.core.LocalRepoHelper
@@ -435,9 +437,9 @@ class AetherBuildSystem(repos: List[xsbti.Repository], workingDir: File) extends
if (a.getClassifier != "jar" && a.getClassifier != "") Some(a.getClassifier) else None)
}
- ExtractedBuildMeta(modRevId.getRevision, Seq.empty, Seq.empty)
+ ExtractedBuildMetaH(modRevId.getRevision, Seq.empty, Seq.empty)
// (version: String, projects: Seq[Project], subproj: Seq[String] = Seq.empty)
- val q = ExtractedBuildMeta(modRevId.getRevision, Seq(Project(fixName(modRevId.getName()), modRevId.getOrganisation(),
+ val q = ExtractedBuildMetaH(modRevId.getRevision, Seq(Project(fixName(modRevId.getName()), modRevId.getOrganisation(),
// artifacts: Seq[ProjectRef],
arts map artToProjectRef,
// dependencies: Seq[ProjectRef])
@@ -515,7 +517,7 @@ class AetherBuildSystem(repos: List[xsbti.Repository], workingDir: File) extends
// the pom art will be the first one in "arts"
val (descriptorResult, arts) = resolveAether(download, localRepo, mainJar, sources, javadoc, Some(availableRepo), log)
// DELETE from the resolved local repository all files called "_remote.repositories", which are aether temporary leftovers
- localRepo.**(new sbt.ExactFilter("_remote.repositories")).get.foreach { IO.delete }
+ localRepo.**(new Adapter.ExactFilter("_remote.repositories")).get.foreach { IO.delete }
// TODO: add support for source/javadoc/etc jars, as well as plugins.
@@ -608,7 +610,7 @@ class AetherBuildSystem(repos: List[xsbti.Repository], workingDir: File) extends
//BuildSubArtifactsOut(subProjName, artifacts, shas, moduleInfo)
val q = BuildArtifactsOut(Seq(BuildSubArtifactsOut("default-aether-project",
arts.map { aetherArtifactToArtifactLocation },
- localRepo.***.get.filterNot(file => file.isDirectory) map { LocalRepoHelper.makeArtifactSha(_, localRepo) },
+ allPaths(localRepo).get.filterNot(file => file.isDirectory) map { LocalRepoHelper.makeArtifactSha(_, localRepo) },
ModuleInfo(organization = finalModRevId.getOrganisation,
name = trimName, version = finalModRevId.getRevision, {
// We need to calculate CrossBuildProperties; that is made a bit complicated by the fact that
diff --git a/support/src/main/scala/com/typesafe/dbuild/support/aether/ProjectResolver.scala b/support/src/main/scala/com/typesafe/dbuild/support/aether/ProjectResolver.scala
index 754c715b..a65a2620 100644
--- a/support/src/main/scala/com/typesafe/dbuild/support/aether/ProjectResolver.scala
+++ b/support/src/main/scala/com/typesafe/dbuild/support/aether/ProjectResolver.scala
@@ -2,8 +2,10 @@ package com.typesafe.dbuild.support.aether
import com.typesafe.dbuild.logging.Logger
import com.typesafe.dbuild.model._
-import _root_.sbt.Path._
-import _root_.sbt.IO
+import com.typesafe.dbuild.adapter.Adapter
+import Adapter.Path._
+import Adapter.{IO, toFF}
+import Adapter.syntaxio._
import com.typesafe.dbuild.project.resolve.ProjectResolver
import java.io.File
import org.apache.ivy.core.module.id.{ ModuleId, ModuleRevisionId }
@@ -29,7 +31,7 @@ class AetherProjectResolver(repos: List[xsbti.Repository]) extends ProjectResolv
def resolve(config: ProjectBuildConfig, baseDir: File, log: Logger): ProjectBuildConfig = {
// clean the directory content, just in case there are leftovers
// (we do not really need to re-resolve non-snapshot artifacts, but let's be conservative)
- IO.delete(baseDir.*("*").get)
+ IO.delete(baseDir.*(toFF("*")).get)
val modRevId = AetherBuildSystem.getProjectModuleID(config)
val revision = modRevId.getRevision
@@ -38,4 +40,4 @@ class AetherProjectResolver(repos: List[xsbti.Repository]) extends ProjectResolv
config
} else config
}
-}
\ No newline at end of file
+}
diff --git a/support/src/main/scala/com/typesafe/dbuild/support/assemble/AssembleBuildSystem.scala b/support/src/main/scala/com/typesafe/dbuild/support/assemble/AssembleBuildSystem.scala
index 2f3e2b67..21deba7c 100644
--- a/support/src/main/scala/com/typesafe/dbuild/support/assemble/AssembleBuildSystem.scala
+++ b/support/src/main/scala/com/typesafe/dbuild/support/assemble/AssembleBuildSystem.scala
@@ -4,9 +4,11 @@ import com.typesafe.dbuild.model._
import org.apache.commons.io.FilenameUtils
import org.apache.commons.io.FileUtils
import _root_.java.io.File
-import _root_.sbt.Path._
-import _root_.sbt.IO
-import _root_.sbt.IO.relativize
+import com.typesafe.dbuild.adapter.Adapter
+import Adapter.Path._
+import Adapter.{IO,NameFilter,allPaths,toFF}
+import Adapter.IO.relativize
+import Adapter.syntaxio._
import com.typesafe.dbuild.logging.Logger
import sys.process._
import com.typesafe.dbuild.repo.core.LocalRepoHelper
@@ -23,10 +25,9 @@ import org.apache.maven.model.io.xpp3.{ MavenXpp3Reader, MavenXpp3Writer }
import org.apache.maven.model.Dependency
import org.apache.ivy.util.ChecksumHelper
import com.typesafe.dbuild.support.NameFixer.fixName
-import _root_.sbt.NameFilter
import org.apache.ivy
import com.typesafe.dbuild.project.build.BuildDirs.localRepos
-
+import com.typesafe.dbuild.model.SeqDBCH._
/**
* The "assemble" build system accepts a list of nested projects, with the same format
* as the "build" section of a normal dbuild configuration file.
@@ -144,7 +145,7 @@ object AssembleBuildSystem extends BuildSystemCore {
// postprocessing of the subproject names
val adapted = adaptSubProjects(projectsAndSubprojects)
- val newMeta = ExtractedBuildMeta("0.0.0",
+ val newMeta = ExtractedBuildMetaH("0.0.0",
allConfigAndExtracted.flatMap(_.extracted.projects.map { p =>
// remove all dependencies that are not already provided by this
// assembled project (we pretend the resulting assembled set has
@@ -206,7 +207,7 @@ object AssembleBuildSystem extends BuildSystemCore {
val localRepo = input.outRepo
// We do a bunch of in-place file operations in the localRepo, before returning.
// To avoid problems due to stale files, delete all contents before proceeding.
- IO.delete(localRepo.*("*").get)
+ IO.delete(localRepo.*(toFF("*")).get)
def mavenArtifactDir(repoDir: File, ref: ProjectRef, crossSuffix: String) =
ref.organization.split('.').foldLeft(repoDir)(_ / _) / (ref.name + crossSuffix)
@@ -225,7 +226,7 @@ object AssembleBuildSystem extends BuildSystemCore {
val artCross = if (isScalaCoreRef(art)) "" else crossSuffix
Seq(mavenArtifactDir(localRepo, art, artCross),
ivyArtifactDir(localRepo, art, artCross))
- }.distinct.flatMap { _.***.get }.
+ }.distinct.flatMap { allPaths(_).get }.
// Since this may be a real local maven repo, it also contains
// the "maven-metadata-local.xml" files, which should /not/ end up in the repository.
filterNot(file => file.isDirectory || file.getName == "maven-metadata-local.xml").map(f)
@@ -407,10 +408,10 @@ object AssembleBuildSystem extends BuildSystemCore {
val allArtifactsOut = artifactsMap.map { _._2 }
val available = allArtifactsOut.flatMap { _.results }.flatMap { _.artifacts }
- (localRepo.***.get).filter(_.getName.endsWith(".pom")).foreach { patchPomDependencies(_, available) }
+ (allPaths(localRepo).get).filter(_.getName.endsWith(".pom")).foreach { patchPomDependencies(_, available) }
val ivyHome = dir / ".ivy2" / "cache"
- (localRepo.***.get).filter(_.getName == "ivy.xml").foreach { patchIvyDependencies(_, available, ivyHome, localRepo) }
+ (allPaths(localRepo).get).filter(_.getName == "ivy.xml").foreach { patchIvyDependencies(_, available, ivyHome, localRepo) }
// dbuild SHAs must be re-computed (since the POM/Ivy files changed)
// We preserve the list of original subprojects (and consequently modules),
diff --git a/support/src/main/scala/com/typesafe/dbuild/support/ivy/IvyBuildSystem.scala b/support/src/main/scala/com/typesafe/dbuild/support/ivy/IvyBuildSystem.scala
index b0cff3c5..9246de5d 100644
--- a/support/src/main/scala/com/typesafe/dbuild/support/ivy/IvyBuildSystem.scala
+++ b/support/src/main/scala/com/typesafe/dbuild/support/ivy/IvyBuildSystem.scala
@@ -5,8 +5,10 @@ import com.typesafe.dbuild.project.{ BuildSystem, BuildData }
import com.typesafe.dbuild.model._
import com.typesafe.dbuild.repo.core.LocalArtifactMissingException
import java.io.File
-import sbt.Path._
-import sbt.IO
+import com.typesafe.dbuild.adapter.Adapter
+import Adapter.Path._
+import Adapter.{IO,allPaths}
+import Adapter.syntaxio._
import com.typesafe.dbuild.logging.Logger
import sys.process._
import com.typesafe.dbuild.repo.core.LocalRepoHelper
@@ -54,7 +56,7 @@ class IvyBuildSystem(repos: List[xsbti.Repository], workingDir: File) extends Bu
log.warn("**** Warning: no artifacts found in project " + config.name)
val module = config.uri.substring(4)
val modRevId = ModuleRevisionId.parse(module)
- ExtractedBuildMeta(modRevId.getRevision, Seq.empty, Seq.empty)
+ ExtractedBuildMetaH(modRevId.getRevision, Seq.empty, Seq.empty)
} else {
val modRevId = artifactReports(0).getArtifact.getModuleRevisionId
val module = modRevId.getModuleId()
@@ -80,7 +82,7 @@ class IvyBuildSystem(repos: List[xsbti.Repository], workingDir: File) extends Bu
val deps = loaded.flatMap { _.getAllArtifacts.toSeq }.distinct
if (deps.nonEmpty) log.info("Dependencies of project " + config.name + ":")
deps foreach { d => log.info(" " + d) }
- val q = ExtractedBuildMeta(modRevId.getRevision, Seq(Project(fixName(first.getName), first.getOrganisation,
+ val q = ExtractedBuildMetaH(modRevId.getRevision, Seq(Project(fixName(first.getName), first.getOrganisation,
firstNode.getAllArtifacts.toSeq.map(artifactToProjectRef).distinct,
loaded.flatMap { _.getAllArtifacts.toSeq.map(artifactToProjectRef) }.distinct)))
log.debug(q.toString)
@@ -153,7 +155,7 @@ class IvyBuildSystem(repos: List[xsbti.Repository], workingDir: File) extends Bu
val modulePluginInfo = pluginAttrs(module)
val q = BuildArtifactsOut(Seq(BuildSubArtifactsOut("default-ivy-project",
publishArts,
- localRepo.***.get.filterNot(file => file.isDirectory) map { LocalRepoHelper.makeArtifactSha(_, localRepo) },
+ allPaths(localRepo).get.filterNot(file => file.isDirectory) map { LocalRepoHelper.makeArtifactSha(_, localRepo) },
com.typesafe.dbuild.manifest.ModuleInfo(organization = module.getOrganisation,
name = fixName(module.getName), version = version, {
import com.typesafe.dbuild.manifest.ModuleAttributes
diff --git a/support/src/main/scala/com/typesafe/dbuild/support/ivy/IvyMachinery.scala b/support/src/main/scala/com/typesafe/dbuild/support/ivy/IvyMachinery.scala
index 63fa998b..31bc5045 100644
--- a/support/src/main/scala/com/typesafe/dbuild/support/ivy/IvyMachinery.scala
+++ b/support/src/main/scala/com/typesafe/dbuild/support/ivy/IvyMachinery.scala
@@ -3,8 +3,12 @@ package com.typesafe.dbuild.support.ivy
import com.typesafe.dbuild.project.BuildSystem
import com.typesafe.dbuild.model._
import java.io.File
-import sbt.Path._
-import sbt.IO.relativize
+import com.typesafe.dbuild.adapter.Adapter
+import Adapter.FileRepository
+import Adapter.Path._
+import Adapter.{IO,allPaths}
+import Adapter.IO.relativize
+import Adapter.syntaxio._
import com.typesafe.dbuild.logging.Logger
import sys.process._
import com.typesafe.dbuild.repo.core.LocalRepoHelper
@@ -19,7 +23,6 @@ import org.apache.ivy.plugins.parser.xml.XmlModuleDescriptorWriter
import ivy.core.module.id.{ ModuleId, ModuleRevisionId }
import ivy.core.resolve.{ ResolveEngine, ResolveOptions }
import ivy.core.report.ResolveReport
-import sbt.FileRepository
import org.apache.ivy.core.retrieve.RetrieveOptions
import org.apache.ivy.core.deliver.DeliverOptions
import com.typesafe.dbuild.support.sbt.Repositories.ivyPattern
@@ -27,6 +30,7 @@ import org.apache.ivy.core.resolve.IvyNode
import org.apache.ivy.core.module.descriptor.Configuration
import org.apache.ivy.core.module.descriptor.DefaultDependencyArtifactDescriptor
import com.typesafe.dbuild.project.build.BuildDirs._
+import com.typesafe.dbuild.model.SeqStringH._
object IvyMachinery {
// there are two stages to the madness below. The first: we create a dummy caller, and add the module we need as a dependency.
@@ -59,7 +63,7 @@ object IvyMachinery {
val cache = settings.getDefaultCache()
val theIvy = Ivy.newInstance(settings)
theIvy.getLoggerEngine.pushLogger(new IvyLoggerInterface(log))
- sbt.IO.withTemporaryFile("ivy", ".xml") { ivyFile =>
+ IO.withTemporaryFile("ivy", ".xml") { ivyFile =>
val outer = ModuleRevisionId.newInstance("dbuild-ivy", "dbuild-ivy", "working")
val md = new DefaultModuleDescriptor(outer, "integration", new java.util.Date())
md.addExtraAttributeNamespace("m", "http://ant.apache.org/ivy/maven")
@@ -240,7 +244,7 @@ object IvyMachinery {
deo.setConfs(md2.getConfigurations() map { _.getName() })
deo.setPubdate(new java.util.Date())
theIvy.deliver(modRevIdpublish, modRevIdpublish.getRevision, (ivyxmlDir / ivyPattern).getCanonicalPath, deo)
- ivyxmlDir.***.get.foreach {
+ allPaths(ivyxmlDir).get.foreach {
f =>
if (f.getName == "ivy.xml")
scala.io.Source.fromFile(f).getLines foreach { s => log.debug(s) }
@@ -405,4 +409,4 @@ object IvyMachinery {
def setShowProgress(progress: Boolean) {}
}
-}
\ No newline at end of file
+}
diff --git a/support/src/main/scala/com/typesafe/dbuild/support/nil/NilBuildSystem.scala b/support/src/main/scala/com/typesafe/dbuild/support/nil/NilBuildSystem.scala
index cdaedef0..02257870 100644
--- a/support/src/main/scala/com/typesafe/dbuild/support/nil/NilBuildSystem.scala
+++ b/support/src/main/scala/com/typesafe/dbuild/support/nil/NilBuildSystem.scala
@@ -49,6 +49,6 @@ object NilBuildSystem extends BuildSystemCore {
* Fabricate some ExtractedBuildMeta as suitable.
*/
private def readMeta(config: ProjectBuildConfig): ExtractedBuildMeta = {
- ExtractedBuildMeta(config.setVersion getOrElse "xxx", Seq.empty, Seq.empty)
+ ExtractedBuildMetaH(config.setVersion getOrElse "xxx", Seq.empty, Seq.empty)
}
}
diff --git a/support/src/main/scala/com/typesafe/dbuild/support/nil/ProjectResolver.scala b/support/src/main/scala/com/typesafe/dbuild/support/nil/ProjectResolver.scala
index 6692d332..70ebe35a 100644
--- a/support/src/main/scala/com/typesafe/dbuild/support/nil/ProjectResolver.scala
+++ b/support/src/main/scala/com/typesafe/dbuild/support/nil/ProjectResolver.scala
@@ -4,8 +4,10 @@ import com.typesafe.dbuild.logging.Logger
import com.typesafe.dbuild.model._
import com.typesafe.dbuild.project.resolve.ProjectResolver
import java.io.File
-import sbt.IO
-import sbt.Path._
+import com.typesafe.dbuild.adapter.Adapter
+import Adapter.{IO,toFF}
+import Adapter.Path._
+import Adapter.syntaxio._
/**
* The nil resolver does absolutely nothing.
@@ -17,7 +19,7 @@ class NilProjectResolver() extends ProjectResolver {
def resolve(config: ProjectBuildConfig, baseDir: File, log: Logger): ProjectBuildConfig = {
// scrub the whole content before returning
- IO.delete(baseDir.*("*").get)
+ IO.delete(baseDir.*(toFF("*")).get)
config
}
-}
\ No newline at end of file
+}
diff --git a/support/src/main/scala/com/typesafe/dbuild/support/sbt/DependencyExtractor.scala b/support/src/main/scala/com/typesafe/dbuild/support/sbt/DependencyExtractor.scala
index a1db7fad..5fc127f9 100644
--- a/support/src/main/scala/com/typesafe/dbuild/support/sbt/DependencyExtractor.scala
+++ b/support/src/main/scala/com/typesafe/dbuild/support/sbt/DependencyExtractor.scala
@@ -2,13 +2,16 @@ package com.typesafe.dbuild.support.sbt
import com.typesafe.dbuild.model._
import com.typesafe.dbuild.logging.Logger
-import _root_.sbt.{ IO, Path, PathExtra }
+import com.typesafe.dbuild.adapter.Adapter
+import Adapter.{ IO, Path }
+import Adapter.syntaxio._
import Path._
import _root_.java.io.File
import sys.process.Process
import com.typesafe.dbuild.model.Utils.{ readValue, writeValue }
import com.typesafe.dbuild.logging.Logger.logFullStackTrace
import com.fasterxml.jackson.annotation.JsonProperty
+import com.typesafe.dbuild.model.SeqStringH._
/**
* Input data to the dbuild sbt plugin
diff --git a/support/src/main/scala/com/typesafe/dbuild/support/sbt/Repositories.scala b/support/src/main/scala/com/typesafe/dbuild/support/sbt/Repositories.scala
index 889a3661..77f84c5e 100644
--- a/support/src/main/scala/com/typesafe/dbuild/support/sbt/Repositories.scala
+++ b/support/src/main/scala/com/typesafe/dbuild/support/sbt/Repositories.scala
@@ -3,7 +3,7 @@ package com.typesafe.dbuild.support.sbt
import com.typesafe.dbuild.model._
import _root_.java.io.File
import _root_.java.net.URI
-import _root_.sbt.IO
+import com.typesafe.dbuild.adapter.Adapter.IO
object Repositories {
val ivyPattern = "[organization]/[module]/(scala_[scalaVersion]/)(sbt_[sbtVersion]/)[revision]/[type]s/[artifact](-[classifier]).[ext]"
diff --git a/support/src/main/scala/com/typesafe/dbuild/support/sbt/SbtBuildRunner.scala b/support/src/main/scala/com/typesafe/dbuild/support/sbt/SbtBuildRunner.scala
index c2a44f80..a50d2081 100644
--- a/support/src/main/scala/com/typesafe/dbuild/support/sbt/SbtBuildRunner.scala
+++ b/support/src/main/scala/com/typesafe/dbuild/support/sbt/SbtBuildRunner.scala
@@ -2,7 +2,9 @@ package com.typesafe.dbuild.support.sbt
import com.typesafe.dbuild.model._
import com.typesafe.dbuild.logging.Logger
-import _root_.sbt.{ IO, Path, PathExtra }
+import com.typesafe.dbuild.adapter.Adapter
+import Adapter.{ IO, Path, Logger => SbtLogger }
+import Adapter.syntaxio._
import Path._
import _root_.java.io.File
import sys.process.Process
@@ -12,6 +14,7 @@ import com.typesafe.dbuild.project.build.BuildDirs._
import com.typesafe.dbuild.support.sbt.SbtRunner.SbtFileNames._
import com.typesafe.dbuild.support.sbt.SbtRunner.{ sbtIvyCache, buildArtsFile }
import com.typesafe.dbuild.model.SeqSeqString
+import com.typesafe.dbuild.model.SeqStringH._
/**
* Rewiring a level needs the information contained in RewireInput:
*
@@ -86,7 +89,7 @@ object SbtBuilder {
def prepareRewireFilesAndDirs(projectDir: File, artifacts: BuildArtifactsInMulti,
subprojs: Seq[Seq[String]], crossVers: Seq[String], checkMiss: Seq[Boolean], sbtSettings: Seq[Seq[String]],
- log: _root_.sbt.Logger, debug: Boolean): Unit = {
+ log: SbtLogger, debug: Boolean): Unit = {
// we do the rewiring on each level using onLoad; we generate the artifacts at the end
// Note: Because the user could configure settings/projects for build levels which do not have configuration,
// we must figure out if there is configuration which will be written to a given build level.
@@ -127,4 +130,4 @@ object SbtBuilder {
}
SbtRunner.placeInputFiles(projectDir, rewireInputFileName, inputDataAll.toSeq, log, debug)
}
-}
\ No newline at end of file
+}
diff --git a/support/src/main/scala/com/typesafe/dbuild/support/sbt/SbtBuildSystem.scala b/support/src/main/scala/com/typesafe/dbuild/support/sbt/SbtBuildSystem.scala
index 61f6997e..4fcf29d3 100644
--- a/support/src/main/scala/com/typesafe/dbuild/support/sbt/SbtBuildSystem.scala
+++ b/support/src/main/scala/com/typesafe/dbuild/support/sbt/SbtBuildSystem.scala
@@ -2,16 +2,20 @@ package com.typesafe.dbuild.support.sbt
import com.typesafe.dbuild.model._
import com.typesafe.dbuild.support.BuildSystemCore
-import _root_.sbt.Path._
+import com.typesafe.dbuild.adapter.Adapter.Path._
import com.typesafe.dbuild.logging.Logger
import com.typesafe.dbuild.model.SbtExtraConfig
import _root_.java.io.File
-import com.typesafe.dbuild.repo.core.{ Defaults, GlobalDirs }
+import com.typesafe.dbuild.adapter.Defaults
+import com.typesafe.dbuild.adapter.Adapter.syntaxio._
+import com.typesafe.dbuild.repo.core.GlobalDirs
import com.typesafe.dbuild.project.dependencies.Extractor
import com.typesafe.dbuild.project.build.LocalBuildRunner
import com.typesafe.dbuild.project.{ BuildSystem, BuildData }
import com.typesafe.dbuild.model.Utils.{ writeValue, readValue }
import com.typesafe.dbuild.support.sbt.SbtRunner.{ sbtIvyCache, buildArtsFile }
+import com.typesafe.dbuild.model.SeqSeqStringH._
+import com.typesafe.dbuild.model.SeqStringH._
/** Implementation of the SBT build system. */
class SbtBuildSystem(repos: List[xsbti.Repository], workingDir: File, debug: Boolean) extends BuildSystemCore {
@@ -99,4 +103,4 @@ object SbtBuildSystem {
sys.error("The specified subdirectory \"" + ec.directory + "\" does not seem to be a subdir of the project directory")
projectDir
}
-}
\ No newline at end of file
+}
diff --git a/support/src/main/scala/com/typesafe/dbuild/support/sbt/SbtRunner.scala b/support/src/main/scala/com/typesafe/dbuild/support/sbt/SbtRunner.scala
index 82cd3a22..189a5af2 100644
--- a/support/src/main/scala/com/typesafe/dbuild/support/sbt/SbtRunner.scala
+++ b/support/src/main/scala/com/typesafe/dbuild/support/sbt/SbtRunner.scala
@@ -1,12 +1,13 @@
package com.typesafe.dbuild.support.sbt
import _root_.java.io.File
-import _root_.sbt.{ IO, Path }
+import com.typesafe.dbuild.adapter.{Adapter,Defaults}
+import Adapter.{ IO, Path, toFF, Logger => SbtLogger }
+import Adapter.syntaxio._
import Path._
import com.typesafe.dbuild.logging.Logger
import sys.process._
import com.typesafe.dbuild.model.ExtraConfig
-import com.typesafe.dbuild.repo.core.Defaults
import org.apache.commons.io.FileUtils.readFileToString
import com.typesafe.dbuild.model.Utils.{ readValue, writeValue }
import org.apache.commons.io.FileUtils.writeStringToFile
@@ -164,9 +165,6 @@ object SbtRunner {
finally in.close
}
- def writeDeps(file: File): Unit =
- IO.write(file, """addSbtPlugin("com.typesafe.dbuild" % "plugin" % """ + '"' + Defaults.version + "\")")
-
def writeRepoFile(repos: List[xsbti.Repository], config: File, repositories: (String, String)*): Unit =
Repositories.writeRepoFile(repos, config, repositories:_*)
@@ -180,7 +178,7 @@ object SbtRunner {
def buildLevels(dir: File): Int = {
val sub = dir / "project"
val subSub = sub / "project"
- if (sub.isDirectory && (sub.*("*.sbt").get.nonEmpty || (subSub.isDirectory() && sub.*("*.scala").get.nonEmpty)))
+ if (sub.isDirectory && (sub.*(toFF("*.sbt")).get.nonEmpty || (subSub.isDirectory() && sub.*(toFF("*.scala")).get.nonEmpty)))
buildLevels(sub) + 1
else 1
}
@@ -279,7 +277,7 @@ object SbtRunner {
* Place each element of "contents" in the subsequent directories
* dir, dir/project, dir/project/project, and so on.
*/
- def writeSbtFiles(mainDir: File, contents: Seq[String], log: _root_.sbt.Logger, debug: Boolean) =
+ def writeSbtFiles(mainDir: File, contents: Seq[String], log: SbtLogger, debug: Boolean) =
placeFiles(mainDir, contents, dbuildSbtFileName, None, s => if (debug) log.debug("Adding dbuild .sbt file to " + s))
/**
@@ -287,7 +285,7 @@ object SbtRunner {
* in dir/.dbuild, the second in dir/project/.dbuild, the dir/project/project/.dbuild,
* and so on.
*/
- def placeInputFiles[T](mainDir: File, fileName: String, data: Seq[T], log: _root_.sbt.Logger, debug: Boolean)(implicit m: Manifest[T]) =
+ def placeInputFiles[T](mainDir: File, fileName: String, data: Seq[T], log: SbtLogger, debug: Boolean)(implicit m: Manifest[T]) =
placeFiles(mainDir, data.map { writeValue(_) }, fileName, Some(dbuildSbtDirName), s => if (debug) log.debug("Placing one input file in " + s))
def rewireInputFile(dir: File) = dir / dbuildSbtDirName / rewireInputFileName
diff --git a/support/src/main/scala/com/typesafe/dbuild/support/scala/ScalaBuildSystem.scala b/support/src/main/scala/com/typesafe/dbuild/support/scala/ScalaBuildSystem.scala
index 480f3276..29c45591 100644
--- a/support/src/main/scala/com/typesafe/dbuild/support/scala/ScalaBuildSystem.scala
+++ b/support/src/main/scala/com/typesafe/dbuild/support/scala/ScalaBuildSystem.scala
@@ -5,9 +5,11 @@ import com.typesafe.dbuild.support.BuildSystemCore
import org.apache.commons.io.FilenameUtils
import org.apache.commons.io.FileUtils
import _root_.java.io.File
-import _root_.sbt.Path._
-import _root_.sbt.IO
-import _root_.sbt.IO.relativize
+import com.typesafe.dbuild.adapter.Adapter
+import Adapter.Path._
+import Adapter.{IO,NameFilter,allPaths,toFF}
+import Adapter.IO.relativize
+import Adapter.syntaxio._
import com.typesafe.dbuild.logging.Logger
import sys.process._
import com.typesafe.dbuild.repo.core.LocalRepoHelper
@@ -21,8 +23,8 @@ import org.apache.maven.model.io.xpp3.{ MavenXpp3Reader, MavenXpp3Writer }
import org.apache.maven.model.Dependency
import org.apache.ivy.util.ChecksumHelper
import com.typesafe.dbuild.support.NameFixer.fixName
-import _root_.sbt.NameFilter
import com.typesafe.dbuild.project.build.BuildDirs.dbuildDirName
+import com.typesafe.dbuild.model.SeqStringH._
/** Implementation of the Scala build system. */
object ScalaBuildSystem extends BuildSystemCore {
@@ -54,7 +56,7 @@ object ScalaBuildSystem extends BuildSystemCore {
}
// ok, now we just have to merge everything together.
- val newMeta = ExtractedBuildMeta(meta.version, configAndExtracted.extracted.projects, meta.subproj)
+ val newMeta = ExtractedBuildMetaH(meta.version, configAndExtracted.extracted.projects, meta.subproj)
log.info(newMeta.subproj.mkString("These subprojects will be built: ", ", ", ""))
newMeta
}
@@ -203,7 +205,7 @@ object ScalaBuildSystem extends BuildSystemCore {
targets foreach {
case (target, path) =>
// erase the content of the private cache before each stage of a build, just in case.
- IO.delete(localM2repo.*("*").get)
+ IO.delete(localM2repo.*(toFF("*")).get)
val targetDir = path.split("/").foldLeft(dir)(_ / _)
Process(Seq("ant", target,
"-Dlocal.snapshot.repository=" + localRepo.getAbsolutePath,
@@ -233,7 +235,7 @@ object ScalaBuildSystem extends BuildSystemCore {
// possible patterns:
// org-with-dots/name/var/name-ver.pom
// org-with-dots/name_suff/var/name_suff-ver.pom
- val nameFilter = (name: NameFilter) | ((name + "_*"): NameFilter)
+ val nameFilter = (toFF(name)) | (toFF((name + "_*")))
val potentialDirs = od.*(nameFilter).get
if (potentialDirs.isEmpty) {
sys.error("Cannot find artifacts dir for: " + modID)
@@ -245,7 +247,7 @@ object ScalaBuildSystem extends BuildSystemCore {
// let's look for var/nameWithCross-ver.pom
val SearchPattern = """([^/]*)/([^/]*)-\1.pom""".r
val crossSuffixesAndVers = potentialDirs.flatMap { d =>
- d.***.get.filterNot(file => file.isDirectory).map { f =>
+ allPaths(d).get.filterNot(file => file.isDirectory).map { f =>
val relative = relativize(d, f) getOrElse sys.error("Internal error in relative paths creation. Please report.")
relative match {
case SearchPattern(ver, nameAndCross) =>
@@ -277,7 +279,7 @@ object ScalaBuildSystem extends BuildSystemCore {
// use the list of artifacts as a hint as to which directories should be looked up,
// but actually scan the dirs rather than using the list of artifacts (there may be
// additional files like checksums, for instance).
- artifacts.map(artifactDir(localRepo, _, crossSuffix)).distinct.flatMap { _.***.get }.
+ artifacts.map(artifactDir(localRepo, _, crossSuffix)).distinct.flatMap { allPaths(_).get }.
filterNot(file => file.isDirectory || file.getName == "maven-metadata-local.xml").map(f)
}
@@ -419,4 +421,4 @@ object ScalaBuildSystem extends BuildSystemCore {
Seq(ProjectRef("scala-library", "org.scala-lang"), ProjectRef("scala-actors", "org.scala-lang"))))
else Seq.empty))))
}
-}
\ No newline at end of file
+}
diff --git a/support/src/main/scala/com/typesafe/dbuild/support/svn/ProjectResolver.scala b/support/src/main/scala/com/typesafe/dbuild/support/svn/ProjectResolver.scala
index f260c055..f03a369a 100644
--- a/support/src/main/scala/com/typesafe/dbuild/support/svn/ProjectResolver.scala
+++ b/support/src/main/scala/com/typesafe/dbuild/support/svn/ProjectResolver.scala
@@ -1,7 +1,9 @@
package com.typesafe.dbuild.support.svn
-import _root_.sbt.Path._
-import _root_.sbt.IO
+import com.typesafe.dbuild.adapter.Adapter
+import Adapter.Path._
+import Adapter.{IO,toFF}
+import Adapter.syntaxio._
import com.typesafe.dbuild.model._
import com.typesafe.dbuild.logging.Logger
import com.typesafe.dbuild.project.resolve.ProjectResolver
@@ -23,7 +25,7 @@ class SvnProjectResolver extends ProjectResolver {
val uri = new _root_.java.net.URI(config.uri)
// clean the directory content, just in case there are leftovers
- IO.delete(dir.*("*").get)
+ IO.delete(dir.*(toFF("*")).get)
if(!(dir / ".svn" ).exists) Svn.checkout(uri, dir, log)
else Svn.revert(dir, log)
@@ -37,4 +39,4 @@ class SvnProjectResolver extends ProjectResolver {
val newUri = UriUtil.dropFragment(uri).toASCIIString + "#" + rev
config.copy(uri = newUri)
}
-}
\ No newline at end of file
+}
diff --git a/support/src/main/scala/com/typesafe/dbuild/support/svn/Svn.scala b/support/src/main/scala/com/typesafe/dbuild/support/svn/Svn.scala
index 28b6d766..c550b55e 100644
--- a/support/src/main/scala/com/typesafe/dbuild/support/svn/Svn.scala
+++ b/support/src/main/scala/com/typesafe/dbuild/support/svn/Svn.scala
@@ -3,7 +3,7 @@ package com.typesafe.dbuild.support.svn
import sys.process._
import _root_.java.io.File
import _root_.java.net.URI
-import _root_.sbt.IO
+import com.typesafe.dbuild.adapter.Adapter.IO
import com.typesafe.dbuild.logging.Logger
import com.typesafe.dbuild.support.UriUtil
import com.typesafe.dbuild.support.OS._
@@ -56,4 +56,4 @@ object Svn {
case 0 => ()
case n => sys.error("Nonzero exit code ("+n+"): svn " + (args mkString " "))
}
-}
\ No newline at end of file
+}
diff --git a/support/src/main/scala/com/typesafe/dbuild/support/test/ProjectResolver.scala b/support/src/main/scala/com/typesafe/dbuild/support/test/ProjectResolver.scala
index 14e75c0f..942799bf 100644
--- a/support/src/main/scala/com/typesafe/dbuild/support/test/ProjectResolver.scala
+++ b/support/src/main/scala/com/typesafe/dbuild/support/test/ProjectResolver.scala
@@ -5,8 +5,10 @@ import com.typesafe.dbuild.model._
import com.typesafe.dbuild.project.resolve.ProjectResolver
import java.io.File
import _root_.java.net.URI
-import sbt.IO
-import sbt.Path._
+import com.typesafe.dbuild.adapter.Adapter
+import Adapter.{IO,toFF}
+import Adapter.Path._
+import Adapter.syntaxio._
/**
* The test resolver does absolutely nothing; however, it fails every now and then (for testing).
@@ -18,7 +20,7 @@ class TestProjectResolver() extends ProjectResolver {
def resolve(config: ProjectBuildConfig, baseDir: File, log: Logger): ProjectBuildConfig = {
// scrub the whole content before returning
- IO.delete(baseDir.*("*").get)
+ IO.delete(baseDir.*(toFF("*")).get)
val rand = new java.util.Random
// abort resolution 10% of the times
@@ -28,4 +30,4 @@ class TestProjectResolver() extends ProjectResolver {
if (rand.nextInt(2)==0) config.copy(setVersion=Some((rand.nextInt(80000)).toString)) else config
}
-}
\ No newline at end of file
+}
diff --git a/support/src/main/scala/com/typesafe/dbuild/support/test/TestBuildSystem.scala b/support/src/main/scala/com/typesafe/dbuild/support/test/TestBuildSystem.scala
index 79927793..2abf0816 100644
--- a/support/src/main/scala/com/typesafe/dbuild/support/test/TestBuildSystem.scala
+++ b/support/src/main/scala/com/typesafe/dbuild/support/test/TestBuildSystem.scala
@@ -52,6 +52,6 @@ object TestBuildSystem extends BuildSystemCore {
* Fabricate some ExtractedBuildMeta as suitable.
*/
private def readMeta(config: ProjectBuildConfig): ExtractedBuildMeta = {
- ExtractedBuildMeta(config.setVersion getOrElse "xxx", Seq.empty, Seq.empty)
+ ExtractedBuildMetaH(config.setVersion getOrElse "xxx", Seq.empty, Seq.empty)
}
}