From 256ed68acd018d5ba17584edb57a25246c7b66b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98yvind=20Raddum=20Berg?= Date: Sun, 19 Apr 2020 19:27:36 +0200 Subject: [PATCH] fixup sbt versioning plugin deprecation notice and some minor breakage --- .../org/scalablytyped/converter/internal/importer/Ci.scala | 2 +- .../converter/internal/importer/build/GenerateSbtPlugin.scala | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/importer/src/main/scala/org/scalablytyped/converter/internal/importer/Ci.scala b/importer/src/main/scala/org/scalablytyped/converter/internal/importer/Ci.scala index f1c6340100..5ef24779d6 100644 --- a/importer/src/main/scala/org/scalablytyped/converter/internal/importer/Ci.scala +++ b/importer/src/main/scala/org/scalablytyped/converter/internal/importer/Ci.scala @@ -398,7 +398,7 @@ target/ } else { interfaceLogger warn "Generating sbt plugin..." - val sbtProjectDir = targetFolder / s"sbt-${config.projectName}" + val sbtProjectDir = targetFolder / s"sbt-${config.projectName.value}" GenerateSbtPlugin( isDeprecated = true, diff --git a/importer/src/main/scala/org/scalablytyped/converter/internal/importer/build/GenerateSbtPlugin.scala b/importer/src/main/scala/org/scalablytyped/converter/internal/importer/build/GenerateSbtPlugin.scala index 71bb302308..bbf6857c72 100644 --- a/importer/src/main/scala/org/scalablytyped/converter/internal/importer/build/GenerateSbtPlugin.scala +++ b/importer/src/main/scala/org/scalablytyped/converter/internal/importer/build/GenerateSbtPlugin.scala @@ -86,7 +86,8 @@ object GenerateSbtPlugin { val deprecationNotice = if (isDeprecated) - """@deprecated("The pre-built distribution you're using of ScalablyTyped is deprecated. Please see https://www.scalablytyped.org for the new sbt plugin")\n""" + """ + |@deprecated("The pre-built distribution you're using of ScalablyTyped is deprecated. Please see https://www.scalablytyped.org for the new sbt plugin", "2020-04-19")""".stripMargin else "" val pluginSource = s"""