diff --git a/build.sbt b/build.sbt index 5dfe188..fce116c 100644 --- a/build.sbt +++ b/build.sbt @@ -45,11 +45,19 @@ lazy val commonSettings = Def.settings( ) ) +// Avoid racing doPatchPluginXml against packageMappings +packageArtifact := { + packageArtifact dependsOn Def.sequential(packageMappings, doPatchPluginXml) +}.value + lazy val ideaSettings = Def.settings( ThisBuild / intellijPluginName := "scio-idea", ThisBuild / intellijPlatform := IntelliJPlatform.IdeaCommunity, ThisBuild / intellijBuild := "232.10072.27", - intellijPlugins += "org.intellij.scala".toPlugin + intellijPlugins += "org.intellij.scala".toPlugin, + patchPluginXml := pluginXmlOptions { xml => + xml.version = version.value + } ) lazy val scioIdeaPlugin: Project = project diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml index bf7816a..822e341 100644 --- a/src/main/resources/META-INF/plugin.xml +++ b/src/main/resources/META-INF/plugin.xml @@ -1,8 +1,8 @@ com.spotify.scio-idea Scio IDEA - 0.1.24 - Spotify + FILLED_BY_BUILD + Spotify IntelliJ IDEA plugin for Scio - https://github.com/spotify/scio diff --git a/version.sbt b/version.sbt index b2da1a2..57dd134 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -ThisBuild / version := "0.1.24" +ThisBuild / version := "0.1.25"