Ready for v0.9.7-RC1

.gitignore

@@ -1,2 +1 @@
-/project/project/
 target/

.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:

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

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
 

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:_*)
+}
+}

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)
+  }
+}
+}