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 /build.sc | |
parent | 04590b50ee0017e85c10947b55db80c993dadd89 (diff) | |
download | mill-f04735a5a7d50516120dfd98d0c000f724ebe36e.tar.gz mill-f04735a5a7d50516120dfd98d0c000f724ebe36e.tar.bz2 mill-f04735a5a7d50516120dfd98d0c000f724ebe36e.zip |
fixes
Diffstat (limited to 'build.sc')
-rwxr-xr-x | build.sc | 13 |
1 files changed, 6 insertions, 7 deletions
@@ -73,7 +73,7 @@ object core extends MillModule { ) def generatedSources = T { - shared.generateCoreSources(T.ctx().dest) + Seq(PathRef(shared.generateCoreSources(T.ctx().dest))) } } @@ -85,13 +85,13 @@ object main extends MillModule { ) def generatedSources = T { - shared.generateCoreSources(T.ctx().dest) + Seq(PathRef(shared.generateCoreSources(T.ctx().dest))) } val test = new Tests(implicitly) class Tests(ctx0: mill.define.Ctx) extends super.Tests(ctx0){ def generatedSources = T { - shared.generateCoreTestSources(T.ctx().dest) + Seq(PathRef(shared.generateCoreTestSources(T.ctx().dest))) } } } @@ -117,9 +117,8 @@ object scalalib extends MillModule { ) def genTask(m: ScalaModule) = T.task{ - Seq(m.jar(), m.sourcesJar()) ++ - m.externalCompileDepClasspath() ++ - m.externalCompileDepSources() + Seq(m.jar(), m.sourceJar()) ++ + m.runClasspath() } def testArgs = T{ @@ -237,7 +236,7 @@ def publishVersion = T.input{ val latestTaggedVersion = %%('git, 'describe, "--abbrev=0", "--tags")(pwd).out.trim val commitsSinceLastTag = - %%('git, "rev-list", 'master, "--count")(pwd).out.trim.toInt - + %%('git, "rev-list", gitHead(), "--count")(pwd).out.trim.toInt - %%('git, "rev-list", latestTaggedVersion, "--count")(pwd).out.trim.toInt ("unstable", s"$latestTaggedVersion-$commitsSinceLastTag-${gitHead().take(6)}") |