summaryrefslogtreecommitdiff
path: root/integration
diff options
context:
space:
mode:
authorLi Haoyi <haoyi.sg@gmail.com>2018-02-02 21:48:35 -0800
committerLi Haoyi <haoyi.sg@gmail.com>2018-02-02 21:48:35 -0800
commit80c8ad730132145fc33b790657b14669f282d5b0 (patch)
treefa9d39763756cc07a3e9524cf146186cb2979516 /integration
parent27273750636acbbff1b37cf53bba76684f0b96bb (diff)
downloadmill-80c8ad730132145fc33b790657b14669f282d5b0.tar.gz
mill-80c8ad730132145fc33b790657b14669f282d5b0.tar.bz2
mill-80c8ad730132145fc33b790657b14669f282d5b0.zip
- Rename `basePath` -> `millSourcePath`
- Make `T.worker`s not flush out their directories between instantiations
Diffstat (limited to 'integration')
-rw-r--r--integration/test/resources/acyclic/build.sc2
-rw-r--r--integration/test/resources/ammonite/build.sc2
-rw-r--r--integration/test/resources/jawn/build.sc4
3 files changed, 4 insertions, 4 deletions
diff --git a/integration/test/resources/acyclic/build.sc b/integration/test/resources/acyclic/build.sc
index b8f878ad..5328db24 100644
--- a/integration/test/resources/acyclic/build.sc
+++ b/integration/test/resources/acyclic/build.sc
@@ -4,7 +4,7 @@ import mill.scalalib.publish.{PomSettings, License, Developer, SCM}
object acyclic extends Cross[AcyclicModule]("2.10.6", "2.11.8", "2.12.3", "2.12.4")
class AcyclicModule(val crossScalaVersion: String) extends CrossSbtModule with PublishModule {
- def basePath = super.basePath / ammonite.ops.up
+ def millSourcePath = super.millSourcePath / ammonite.ops.up
def artifactName = "acyclic"
def publishVersion = "0.1.7"
diff --git a/integration/test/resources/ammonite/build.sc b/integration/test/resources/ammonite/build.sc
index 4b8db461..f8732a4c 100644
--- a/integration/test/resources/ammonite/build.sc
+++ b/integration/test/resources/ammonite/build.sc
@@ -59,7 +59,7 @@ object amm extends Cross[MainModule](fullCrossScalaVersions:_*){
def generatedSources = T{
import ammonite.ops._
mkdir(T.ctx().dest)
- cp(build.basePath/'project/"Constants.scala", T.ctx().dest/"Constants.scala")
+ cp(build.millSourcePath/'project/"Constants.scala", T.ctx().dest/"Constants.scala")
Seq(PathRef(T.ctx().dest))
}
}
diff --git a/integration/test/resources/jawn/build.sc b/integration/test/resources/jawn/build.sc
index ac9de195..b83eac17 100644
--- a/integration/test/resources/jawn/build.sc
+++ b/integration/test/resources/jawn/build.sc
@@ -4,7 +4,7 @@ import mill.scalalib.{Dep, TestModule, DepSyntax, Lib}
import ammonite.ops.up
object jawn extends Cross[JawnModule]("2.10.6", "2.11.11", "2.12.3")
class JawnModule(crossVersion: String) extends mill.Module{
- override def basePath = super.basePath / up / up
+ override def millSourcePath = super.millSourcePath / up / up
trait JawnModule extends scalalib.SbtModule{
def scalaVersion = crossVersion
@@ -53,7 +53,7 @@ class JawnModule(crossVersion: String) extends mill.Module{
object rojoma extends Support(ivy"com.rojoma::rojoma-json:2.4.3")
object rojomaV3 extends Support(ivy"com.rojoma::rojoma-json-v3:3.7.2"){
- override def basePath = super.basePath / up / "rojoma-v3"
+ override def millSourcePath = super.millSourcePath / up / "rojoma-v3"
}
object spray extends Support(ivy"io.spray::spray-json:1.3.3")
}