diff options
author | Li Haoyi <haoyi.sg@gmail.com> | 2018-02-11 02:17:45 -0800 |
---|---|---|
committer | Li Haoyi <haoyi.sg@gmail.com> | 2018-02-11 10:08:46 -0800 |
commit | f04735a5a7d50516120dfd98d0c000f724ebe36e (patch) | |
tree | 8781f1580048d90decfb0aa6375380e8f7400969 /integration | |
parent | 04590b50ee0017e85c10947b55db80c993dadd89 (diff) | |
download | mill-f04735a5a7d50516120dfd98d0c000f724ebe36e.tar.gz mill-f04735a5a7d50516120dfd98d0c000f724ebe36e.tar.bz2 mill-f04735a5a7d50516120dfd98d0c000f724ebe36e.zip |
fixes
Diffstat (limited to 'integration')
-rw-r--r-- | integration/test/resources/ammonite/build.sc | 14 | ||||
-rw-r--r-- | integration/test/resources/better-files/build.sc | 4 |
2 files changed, 13 insertions, 5 deletions
diff --git a/integration/test/resources/ammonite/build.sc b/integration/test/resources/ammonite/build.sc index fd802ddf..4594cd9f 100644 --- a/integration/test/resources/ammonite/build.sc +++ b/integration/test/resources/ammonite/build.sc @@ -13,6 +13,10 @@ trait AmmModule extends mill.scalalib.CrossSbtModule{ def ivyDeps = Agg(ivy"com.lihaoyi::utest:0.6.0") def testFramework = "utest.runner.Framework" } + def allIvyDeps = T{transitiveIvyDeps() ++ scalaLibraryIvyDeps()} + def externalSources = T{ + resolveDeps(allIvyDeps, sources = true)() + } } object ops extends Cross[OpsModule](binCrossScalaVersions:_*) @@ -44,6 +48,10 @@ object amm extends Cross[MainModule](fullCrossScalaVersions:_*){ ivy"com.lihaoyi::pprint:0.5.2", ivy"com.lihaoyi::fansi:0.2.4" ) + def compileIvyDeps = Agg( + ivy"org.scala-lang:scala-reflect:$crossScalaVersion" + ) + } @@ -59,7 +67,7 @@ object amm extends Cross[MainModule](fullCrossScalaVersions:_*){ def generatedSources = T{ import ammonite.ops._ cp(build.millSourcePath/'project/"Constants.scala", T.ctx().dest/"Constants.scala") - T.ctx().dest + Seq(PathRef(T.ctx().dest)) } } @@ -91,7 +99,7 @@ object amm extends Cross[MainModule](fullCrossScalaVersions:_*){ def resources = T.sources { super.resources() ++ ReplModule.this.sources() ++ - ReplModule.this.externalCompileDepSources() + ReplModule.this.externalSources() } } } @@ -118,7 +126,7 @@ class MainModule(val crossScalaVersion: String) extends AmmModule{ amm.interp().sources() ++ amm.repl().sources() ++ sources() ++ - externalCompileDepSources() + externalSources() diff --git a/integration/test/resources/better-files/build.sc b/integration/test/resources/better-files/build.sc index 582d3400..425e70ea 100644 --- a/integration/test/resources/better-files/build.sc +++ b/integration/test/resources/better-files/build.sc @@ -27,7 +27,7 @@ trait BetterFilesModule extends SbtModule{ "-Xlint:nullary-unit", // Warn when nullary methods return Unit. "-Xlint:option-implicit", // Option.apply used implicit view. "-Xlint:package-object-classes", // Class or object defined in package object. - "-Xlint:poly-implicit-overload", // Parameterized overloaded implicit methods are not visible as view bounds. + "-Xlint:poly-implicit-o¡verload", // Parameterized overloaded implicit methods are not visible as view bounds. "-Xlint:private-shadow", // A private field (or class parameter) shadows a superclass field. "-Xlint:stars-align", // Pattern sequence wildcard must align with sequence component. "-Xlint:type-parameter-shadow", // A local type parameter shadows a type already in scope. @@ -76,7 +76,7 @@ object benchmarks extends BetterFilesModule{ def ivyDeps = Agg( ivy"commons-io:commons-io:2.5" ) - def depClasspath = Agg( + def unmanagedClasspath = Agg( mill.modules.Util.download( "https://github.com/williamfiset/FastJavaIO/releases/download/v1.0/fastjavaio.jar", "fastjavaio.jar" |