diff options
| author | Li Haoyi <haoyi.sg@gmail.com> | 2018-04-06 20:20:14 -0700 |
|---|---|---|
| committer | Li Haoyi <haoyi.sg@gmail.com> | 2018-04-06 20:48:59 -0700 |
| commit | e628c84be7cf0b7bb00ba2141635d29503203fc4 (patch) | |
| tree | cef8007401a40bce66d5383bfc9f1107f3c8defe /integration | |
| parent | b9e9b6827da900a1c3565ebbd4a18f1657d6114c (diff) | |
| download | mill-e628c84be7cf0b7bb00ba2141635d29503203fc4.tar.gz mill-e628c84be7cf0b7bb00ba2141635d29503203fc4.tar.bz2 mill-e628c84be7cf0b7bb00ba2141635d29503203fc4.zip | |
try to fix build
Diffstat (limited to 'integration')
| -rw-r--r-- | integration/test/resources/play-json/build.sc | 8 | ||||
| -rw-r--r-- | integration/test/resources/play-json/mima.sc | 7 | ||||
| -rw-r--r-- | integration/test/resources/play-json/playJsonVersion.sc (renamed from integration/test/resources/play-json/version.sc) | 0 |
3 files changed, 5 insertions, 10 deletions
diff --git a/integration/test/resources/play-json/build.sc b/integration/test/resources/play-json/build.sc index e5222ae1..c60eefba 100644 --- a/integration/test/resources/play-json/build.sc +++ b/integration/test/resources/play-json/build.sc @@ -1,5 +1,5 @@ import mill._, mill.scalalib._, mill.scalalib.publish._, mill.scalajslib._ -import $file.version +import $file.playJsonVersion import $file.reformat import reformat.Scalariform import $file.mima @@ -47,7 +47,7 @@ trait PlayJsonModule extends BaseModule with PublishModule with MiMa { def scalacOptions = Seq("-deprecation", "-feature", "-unchecked", "-encoding", "utf8") def javacOptions = Seq("-encoding", "UTF-8", "-Xlint:-options") - def publishVersion = version.current + def publishVersion = playJsonVersion.current } abstract class PlayJson(val platformSegment: String) extends PlayJsonModule { @@ -329,14 +329,14 @@ object release extends Module { private val ReleaseVersion = raw"""(\d+)\.(\d+)\.(\d+)""".r private val MinorSnapshotVersion = raw"""(\d+)\.(\d+)\.(\d+)-SNAPSHOT""".r - private val releaseVersion = version.current match { + private val releaseVersion = playJsonVersion.current match { case MinorSnapshotVersion(major, minor, patch) => s"${major}.${minor}.${patch.toInt}" case ReleaseVersion(major, minor, patch) => s"${major}.${minor}.${patch.toInt}" } - private val nextVersion = version.current match { + private val nextVersion = playJsonVersion.current match { case v@MinorSnapshotVersion(major, minor, patch) => v case ReleaseVersion(major, minor, patch) => s"${major}.${minor}.${patch.toInt + 1}-SNAPSHOT" diff --git a/integration/test/resources/play-json/mima.sc b/integration/test/resources/play-json/mima.sc index ebab2c72..3902f2c7 100644 --- a/integration/test/resources/play-json/mima.sc +++ b/integration/test/resources/play-json/mima.sc @@ -18,12 +18,7 @@ trait MiMa extends ScalaModule with PublishModule { def previousDeps = T { Agg.from(previousVersions().map { version => - Dep.Java( - pomSettings().organization, - artifactId(), - version, - cross = false - ) + ivy"${pomSettings().organization}:${artifactId()}:${version}" }) } diff --git a/integration/test/resources/play-json/version.sc b/integration/test/resources/play-json/playJsonVersion.sc index e9dbb12f..e9dbb12f 100644 --- a/integration/test/resources/play-json/version.sc +++ b/integration/test/resources/play-json/playJsonVersion.sc |