diff --git a/ideaSupport/src/main/scala/org/jetbrains/sbtidea/Init.scala b/ideaSupport/src/main/scala/org/jetbrains/sbtidea/Init.scala index ac4464c..adce66c 100644 --- a/ideaSupport/src/main/scala/org/jetbrains/sbtidea/Init.scala +++ b/ideaSupport/src/main/scala/org/jetbrains/sbtidea/Init.scala @@ -134,6 +134,10 @@ trait Init { this: Keys.type => doPatchPluginXml.value packageArtifactDynamic.value }, + packageArtifactZip := Def.sequential( + buildIntellijOptionsIndex.toTask, + doPackageArtifactZip.toTask, + ).value, publishPlugin := PublishPlugin.createTask.evaluated, signPlugin := SignPluginArtifactTask.createTask.value, diff --git a/ideaSupport/src/main/scala/org/jetbrains/sbtidea/searchableoptions/BuildIndex.scala b/ideaSupport/src/main/scala/org/jetbrains/sbtidea/searchableoptions/BuildIndex.scala index afb8af6..bb7c859 100644 --- a/ideaSupport/src/main/scala/org/jetbrains/sbtidea/searchableoptions/BuildIndex.scala +++ b/ideaSupport/src/main/scala/org/jetbrains/sbtidea/searchableoptions/BuildIndex.scala @@ -17,7 +17,7 @@ import scala.collection.JavaConverters.* object BuildIndex { private val IDX_DIR = "search" - type IndexElement = (Path, Path) // jar file -> options.xml + private type IndexElement = (Path, Path) // jar file -> options.xml def createTask: Def.Initialize[Task[Unit]] = Def.task { implicit val log: PluginLogger = new SbtPluginLogger(streams.value) diff --git a/packaging/src/main/scala/org/jetbrains/sbtidea/packaging/PackagingKeys.scala b/packaging/src/main/scala/org/jetbrains/sbtidea/packaging/PackagingKeys.scala index f127c45..a328f6a 100644 --- a/packaging/src/main/scala/org/jetbrains/sbtidea/packaging/PackagingKeys.scala +++ b/packaging/src/main/scala/org/jetbrains/sbtidea/packaging/PackagingKeys.scala @@ -58,4 +58,5 @@ object PackagingKeys extends PackagingKeysInit with PackagingDefs { lazy val dumpDependencyStructureOffline = taskKey[SbtPackageProjectData]("").invisible lazy val packageMappings = taskKey[Mappings]("").invisible lazy val packageMappingsOffline = taskKey[Mappings]("").invisible + lazy val doPackageArtifactZip = taskKey[File]("").invisible } diff --git a/packaging/src/main/scala/org/jetbrains/sbtidea/packaging/PackagingKeysInit.scala b/packaging/src/main/scala/org/jetbrains/sbtidea/packaging/PackagingKeysInit.scala index a91cd1c..da50288 100644 --- a/packaging/src/main/scala/org/jetbrains/sbtidea/packaging/PackagingKeysInit.scala +++ b/packaging/src/main/scala/org/jetbrains/sbtidea/packaging/PackagingKeysInit.scala @@ -100,7 +100,8 @@ trait PackagingKeysInit { new DynamicDistBuilder(stream, myTarget, outputDir, hints).produceArtifact(mappings) outputDir }, - packageArtifactZip := { + packageArtifactZip := doPackageArtifactZip.value, + doPackageArtifactZip := { implicit val stream: TaskStreams = streams.value val outputDir = packageArtifact.value.getParentFile packageArtifactZipFile.?.value match {