From 21641f51d3a9e913da1f7417399923a2e7f82a46 Mon Sep 17 00:00:00 2001 From: Andreas Gabor Date: Thu, 4 Jun 2020 17:02:52 +0200 Subject: [PATCH] use ivyPath for publishLocalFolder --- .../plugin/ScalablyTypedConverterExternalNpmPlugin.scala | 2 +- .../converter/plugin/ScalablyTypedConverterPlugin.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sbt-converter/src/main/scala/org/scalablytyped/converter/plugin/ScalablyTypedConverterExternalNpmPlugin.scala b/sbt-converter/src/main/scala/org/scalablytyped/converter/plugin/ScalablyTypedConverterExternalNpmPlugin.scala index f90a361047..5e665d5974 100644 --- a/sbt-converter/src/main/scala/org/scalablytyped/converter/plugin/ScalablyTypedConverterExternalNpmPlugin.scala +++ b/sbt-converter/src/main/scala/org/scalablytyped/converter/plugin/ScalablyTypedConverterExternalNpmPlugin.scala @@ -102,7 +102,7 @@ object ScalablyTypedConverterExternalNpmPlugin extends AutoPlugin { logger = stLogger, parseCacheDirOpt = Some(cacheDir.toPath resolve "parse"), compiler = ScalablyTypedPluginBase.stInternalZincCompiler.value, - publishLocalFolder = constants.defaultLocalPublishFolder, + publishLocalFolder = ivyPaths.value.ivyHome.fold(constants.defaultLocalPublishFolder)(os.Path(_) / "local"), ) match { case Right(output) => Json.persist[InOut](runCache)((input, output)) diff --git a/sbt-converter/src/main/scala/org/scalablytyped/converter/plugin/ScalablyTypedConverterPlugin.scala b/sbt-converter/src/main/scala/org/scalablytyped/converter/plugin/ScalablyTypedConverterPlugin.scala index dc750be4e5..b7d9767672 100644 --- a/sbt-converter/src/main/scala/org/scalablytyped/converter/plugin/ScalablyTypedConverterPlugin.scala +++ b/sbt-converter/src/main/scala/org/scalablytyped/converter/plugin/ScalablyTypedConverterPlugin.scala @@ -103,7 +103,7 @@ object ScalablyTypedConverterPlugin extends AutoPlugin { logger = stLogger, parseCacheDirOpt = Some(cacheDir.toPath resolve "parse"), compiler = ScalablyTypedPluginBase.stInternalZincCompiler.value, - publishLocalFolder = constants.defaultLocalPublishFolder, + publishLocalFolder = ivyPaths.value.ivyHome.fold(constants.defaultLocalPublishFolder)(os.Path(_) / "local"), ) match { case Right(output) => Json.persist[InOut](runCache)((input, output))