diff options
| author | Andres Pipicello <andres.pipicello@olx.com> | 2019-06-26 17:07:44 -0300 |
|---|---|---|
| committer | Tobias Roeser <le.petit.fou@web.de> | 2019-06-28 08:37:39 +0200 |
| commit | da1436a331aadcacb4b0854a82ba8d7128e6dfa2 (patch) | |
| tree | e1c4789ac886934d1c9b8eb3782677aa88a78281 /scalalib | |
| parent | 1ae2061ca5ba6eecf18d4b17203717526d1b3d39 (diff) | |
| download | mill-da1436a331aadcacb4b0854a82ba8d7128e6dfa2.tar.gz mill-da1436a331aadcacb4b0854a82ba8d7128e6dfa2.tar.bz2 mill-da1436a331aadcacb4b0854a82ba8d7128e6dfa2.zip | |
Update logic to check for Scala libraries when generating fake SBT libraries
Diffstat (limited to 'scalalib')
| -rwxr-xr-x | scalalib/src/GenIdeaImpl.scala | 5 | ||||
| -rw-r--r-- | scalalib/test/src/GenIdeaTests.scala | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/scalalib/src/GenIdeaImpl.scala b/scalalib/src/GenIdeaImpl.scala index f27fb1da..04cd5158 100755 --- a/scalalib/src/GenIdeaImpl.scala +++ b/scalalib/src/GenIdeaImpl.scala @@ -84,7 +84,7 @@ case class GenIdeaImpl(evaluator: Evaluator, val artifactNames = Seq("main-moduledefs", "main-api", "main-core", "scalalib", "scalajslib") val Result.Success(res) = scalalib.Lib.resolveDependencies( repos.toList, - Lib.depToDependency(_, "2.12.4", ""), + Lib.depToDependency(_, "2.12.8", ""), for(name <- artifactNames) yield ivy"com.lihaoyi::mill-$name:${sys.props("MILL_VERSION")}", false, @@ -214,8 +214,9 @@ case class GenIdeaImpl(evaluator: Evaluator, val pom = xmlParseDom(os.read(pomPath)).flatMap(Pom.project).right.get val artifactId = pom.module.name.value + val scalaArtifactRegex = ".*_[23]\\.[0-9]{1,2}".r val artifactWithScalaVersion = artifactId.substring(artifactId.length - 5) match { - case "_2.10" | "_2.11" | "_2.12" => artifactId + case scalaArtifactRegex(_*) => artifactId case _ => artifactId + "_2.12" } s"SBT: ${pom.module.organization.value}:$artifactWithScalaVersion:${pom.version}:jar" diff --git a/scalalib/test/src/GenIdeaTests.scala b/scalalib/test/src/GenIdeaTests.scala index b7d3a257..b1b71cb1 100644 --- a/scalalib/test/src/GenIdeaTests.scala +++ b/scalalib/test/src/GenIdeaTests.scala @@ -16,8 +16,6 @@ object GenIdeaTests extends ScriptTestSuite(false) { workspacePath / ".idea_modules" /"helloworld.iml", s"$workspaceSlug/idea_modules/helloworld.test.iml" -> workspacePath / ".idea_modules" /"helloworld.test.iml", -// s"$workspaceSlug/idea_modules/mill-build.iml" -> -// os.pwd / ".idea_modules" /"mill-build.iml", s"$workspaceSlug/idea/libraries/scala-library-2.12.4.jar.xml" -> workspacePath / ".idea" / "libraries" / "scala-library-2.12.4.jar.xml", s"$workspaceSlug/idea/modules.xml" -> |