summaryrefslogtreecommitdiff
path: root/project
diff options
context:
space:
mode:
authorSeth Tisue <seth@tisue.net>2016-09-02 16:34:16 -0700
committerSeth Tisue <seth@tisue.net>2016-09-02 16:53:01 -0700
commit5ecc0376f8e352a66d73153f8205d7993849c6ec (patch)
treec5b5c126682557942c6139b54e32293138af73a1 /project
parent170373f06250d62c25cc4899de4e3236e71c4a78 (diff)
downloadscala-5ecc0376f8e352a66d73153f8205d7993849c6ec.tar.gz
scala-5ecc0376f8e352a66d73153f8205d7993849c6ec.tar.bz2
scala-5ecc0376f8e352a66d73153f8205d7993849c6ec.zip
remove various references to Ant build
Diffstat (limited to 'project')
-rw-r--r--project/MiMa.scala5
-rw-r--r--project/Osgi.scala6
-rw-r--r--project/ScalaTool.scala2
-rw-r--r--project/build.sbt2
4 files changed, 6 insertions, 9 deletions
diff --git a/project/MiMa.scala b/project/MiMa.scala
index 66442fc725..6c6f5efd51 100644
--- a/project/MiMa.scala
+++ b/project/MiMa.scala
@@ -4,7 +4,7 @@
// both forwards and backwards incompatibilities (possibly fixed as of
// https://github.com/typesafehub/migration-manager/commit/2844ffa48b6d2255aa64bd687703aec21dadd55e)
// * ability to pass a filter file (https://github.com/typesafehub/migration-manager/issues/102)
-// So we invoke the MiMa CLI directly; it's also what the Ant build did.
+// So we invoke the MiMa CLI directly.
import sbt._
import sbt.Keys._
@@ -29,8 +29,7 @@ object MiMa {
prev = if (isForward) curr else prev,
curr = if (isForward) prev else curr,
// TODO: it would be nicer if each subproject had its own whitelist, but for now
- // for compatibility with how Ant did things, there's just one at the root.
- // once Ant is gone we'd be free to split it up.
+ // there's just one at the root. with the Ant build gone, we would be free now to split it.
filter = (baseDirectory in ThisBuild).value / s"bincompat-$direction.whitelist.conf",
log)
}
diff --git a/project/Osgi.scala b/project/Osgi.scala
index 4177251aa4..8a62c9128a 100644
--- a/project/Osgi.scala
+++ b/project/Osgi.scala
@@ -9,9 +9,9 @@ import VersionUtil.versionProperties
/** OSGi packaging for the Scala build, distilled from sbt-osgi. We do not use sbt-osgi because it
* depends on a newer version of BND which gives slightly different output (probably OK to upgrade
- * in the future but for now it would make comparing the sbt and ant build output harder) and does
- * not allow a crucial bit of configuration that we need: Setting the classpath for BND. In sbt-osgi
- * this is always `fullClasspath in Compile` whereas we want `products in Compile in packageBin`. */
+ * in the future, now that the Ant build has been removed) and does not allow a crucial bit of
+ * configuration that we need: Setting the classpath for BND. In sbt-osgi this is always
+ * `fullClasspath in Compile` whereas we want `products in Compile in packageBin`. */
object Osgi {
val bundle = TaskKey[File]("osgiBundle", "Create an OSGi bundle.")
val bundleName = SettingKey[String]("osgiBundleName", "The Bundle-Name for the manifest.")
diff --git a/project/ScalaTool.scala b/project/ScalaTool.scala
index 5e3f20b1ba..98e18235c4 100644
--- a/project/ScalaTool.scala
+++ b/project/ScalaTool.scala
@@ -4,8 +4,6 @@ import org.apache.commons.lang3.StringUtils.replaceEach
/**
* A class that generates a shell or batch script to execute a Scala program.
- *
- * This is a simplified copy of Ant task (see scala.tools.ant.ScalaTool).
*/
case class ScalaTool(mainClass: String,
classpath: List[String],
diff --git a/project/build.sbt b/project/build.sbt
index b19238f577..a604896ded 100644
--- a/project/build.sbt
+++ b/project/build.sbt
@@ -1,2 +1,2 @@
-// Add genprod to the build; It should be moved from `src/build` to `project` once the ANT build is gone
+// Add genprod to the build; It should be moved from `src/build` to `project` now that the Ant build is gone
sources in Compile += ((baseDirectory).value.getParentFile / "src" / "build" / "genprod.scala")