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

Update scalablyTypedImportTask to also check for IVY_HOME #36

Closed
wants to merge 5 commits into from
Closed

Update scalablyTypedImportTask to also check for IVY_HOME #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7aceeb9
Update scalablyTypedImportTask with IVY_HOME check
imdaveho Jan 8, 2025
83398c5
Merge branch 'main' into feat-additionally-use-IVY_HOME-if-exists
imdaveho Jan 8, 2025
95973ab
Update ScalablyTyped.scala ivyLocal with map(os.Path(_)) on env var
imdaveho Jan 8, 2025
70e4ca3
fixed formatting
Jan 9, 2025
8ad5f5c
updated .gitignore with to exclude .metals and .bloop
Jan 9, 2025
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
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
out
node_modules
.bsp
.bloop
.metals
6 changes: 3 additions & 3 deletions mill-scalablytyped/src/com/github/lolgab/mill/scalablytyped/ScalablyTyped.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ trait ScalablyTyped extends ScalaJSModule with VersionSpecific {
private def scalablyTypedImportTask = T {
packageJsonSource()
val ivyLocal = sys.props
.get("ivy.home")
.map(os.Path(_))
.getOrElse(os.home / ".ivy2") / "local"
.get("ivy.home").map(os.Path(_))
.getOrElse(sys.env.get("IVY_HOME").map(os.Path(_))
.getOrElse(os.home / ".ivy2")) / "local"

val targetPath = T.dest / "out"

Expand Down