Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Small improvements to Idea project generation #616

Merged
merged 11 commits into from Jun 28, 2019
Merged

Small improvements to Idea project generation #616

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
308d562
Fixes https://github.com/lihaoyi/mill/issues/532
May 22, 2019
e2b1691
Using Task.sequence instead of multiple evals
May 22, 2019
ea1202f
Fixes generation of fake SBT libraries
May 24, 2019
3008b55
Simple fix for https://github.com/lihaoyi/mill/issues/527
May 24, 2019
9626e43
Fixes 'file name too long' error
May 24, 2019
03e37da
Using coursier for reading poms instead of ad-hoc xml parsing
May 25, 2019
05d1d40
It seems that simply using the provided evaluator fixes https://githu…
May 26, 2019
85dd96a
Added back the usage of module-defined repos for resolving mill libra…
Jun 6, 2019
37b4e93
Changed GenIdeaTests to use ScriptTestSuite
Jun 11, 2019
0c46108
Using mill source path instead of pwd
Jun 18, 2019
6b80cfa
Update logic to check for Scala libraries when generating fake SBT li…
Jun 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Fixes #532
  • Loading branch information
Andres Pipicello committed Jun 26, 2019
commit 308d5620948e0f82f60cd553116021a5d2bcd9e8
10 changes: 5 additions & 5 deletions scalalib/src/GenIdeaImpl.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package mill.scalalib

import ammonite.runtime.SpecialClassLoader
import coursier.Repository
import mill.define._
import mill.eval.{Evaluator, PathRef, Result}
import coursier.{LocalRepositories, Repositories}
import mill.api.Ctx.{Home, Log}
import mill.api.Strict.Agg
import mill.api.{Loose, Strict}
import mill.api.{Loose, Result, Strict}
import mill.define._
import mill.eval.{Evaluator, PathRef}
import mill.{T, scalalib}
import os.Path

Expand Down Expand Up @@ -77,7 +77,7 @@ object GenIdeaImpl {
else sys.props.get("MILL_BUILD_LIBRARIES") match {
case Some(found) => found.split(',').map(os.Path(_)).distinct.toList
case None =>
val repos = modules.foldLeft(Set.empty[Repository]) { _ ++ _._2.repositories }
val repos = Seq(LocalRepositories.ivy2Local, Repositories.central)
lefou marked this conversation as resolved.
Show resolved Hide resolved
val artifactNames = Seq("main-moduledefs", "main-api", "main-core", "scalalib", "scalajslib")
val Result.Success(res) = scalalib.Lib.resolveDependencies(
repos.toList,
Expand Down