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

Derived new GenIdea module to support meta-builds #2638

Merged
merged 21 commits into from
Aug 21, 2023
Merged

Derived new GenIdea module to support meta-builds #2638

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
2398c38
Derived new GenIdea module to support meta-builds
lefou Jun 27, 2023
10750fe
Restored binary compatibility
lefou Jun 27, 2023
19c458e
Fixed more compile issues
lefou Jun 27, 2023
74d34fa
scalafmt
lefou Jun 27, 2023
863307d
Cleanup
lefou Jun 27, 2023
8196b6d
Deprecate mill.scalalib.GenIdea and updated docs
lefou Jun 28, 2023
7edee3a
Use new idea module in tests, WIP
lefou Jun 28, 2023
5efa6fb
Use the correct evaluator when evaluating tasks in GenIdeaImpl
lefou Aug 15, 2023
3792bc3
Refined MillBootstrapModule and GenIdeaImpl
lefou Aug 16, 2023
a6568d1
Minimize test failures
lefou Aug 17, 2023
e404fef
Fixed typo
lefou Aug 17, 2023
69a8c5c
Don't rename wrapper scripts; refined allSourceFiles instead
lefou Aug 17, 2023
9f1fbc7
Cleanup
lefou Aug 17, 2023
1ebe115
Cleanup
lefou Aug 17, 2023
1f56225
Cleanup and scalafmt
lefou Aug 17, 2023
4a9dff9
Also deprecated mill.scalalib.GenIdeaImpl
lefou Aug 17, 2023
be3c882
Review and improvements
lefou Aug 17, 2023
9bcf7b5
Re-invert dependency between scriptSources and parseBuildFiles
lefou Aug 18, 2023
12501c0
Removed unneeded distinct
lefou Aug 18, 2023
53cebcc
Add the intellijModulePath as empty content url to ensure proper layout
lefou Aug 21, 2023
a69d9bd
Consolidate sourceFolder entries for same contentRoot
lefou Aug 21, 2023
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
Prev Previous commit
Next Next commit
Cleanup
  • Loading branch information
@lefou
lefou committed Aug 16, 2023
commit 863307dddf4cc4f81819ffe7cc5a65567e5d0499
2 changes: 1 addition & 1 deletion idea/src/mill/idea/GenIdea.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ object GenIdea extends ExternalModule {

def idea(ev: Evaluator): Command[Unit] = T.command {
try {
Result.Success(mill.idea.GenIdeaImpl(
Result.Success(GenIdeaImpl(
evaluator = ev,
rootModule = ev.rootModule,
discover = ev.rootModule.millDiscover
Expand Down
5 changes: 2 additions & 3 deletions idea/src/mill/idea/GenIdeaImpl.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,16 @@ import scala.util.Try
import scala.xml.{Elem, MetaData, Node, NodeSeq, Null, UnprefixedAttribute}
import coursier.core.compatibility.xmlParseDom
import coursier.maven.Pom
import fansi.Attrs
import mill.Agg
import mill.api.Ctx
import mill.api.{Logger, PathRef, Result, Strict}
import mill.api.{PathRef, Strict}
import mill.define.{Ctx => _, _}
import mill.eval.Evaluator
import mill.main.BuildInfo
import mill.runner.RootModuleFinder
import mill.scalalib.GenIdeaModule.{IdeaConfigFile, JavaFacet}
import mill.scalalib.internal.JavaModuleUtils
import mill.util.{Classpath, DummyLogger}
import mill.util.{Classpath}
import mill.{T, scalalib}
import os.{Path, SubPath}
import mill.scalalib.{GenIdeaImpl => _, _}
Expand Down