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

Use patchPluginXml #279

Merged
merged 4 commits into from
Oct 26, 2023
Merged

Use patchPluginXml #279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
47b366e
Use patchPluginXml
kellen Oct 26, 2023
975ed70
simpler
kellen Oct 26, 2023
a4612ba
scalafmt
kellen Oct 26, 2023
eab8f27
Fix accidentally overwritten vendor, bump version
kellen Oct 26, 2023
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
10 changes: 9 additions & 1 deletion build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/META-INF/plugin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<idea-plugin>
<id>com.spotify.scio-idea</id>
<name>Scio IDEA</name>
<version>0.1.24</version>
<vendor url="https://github.com/spotify/scio-idea-plugin">Spotify</vendor>
<version>FILLED_BY_BUILD</version>
<vendor>Spotify</vendor>

<description>IntelliJ IDEA plugin for Scio - https://github.com/spotify/scio</description>

Expand Down
2 changes: 1 addition & 1 deletion version.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ThisBuild / version := "0.1.24"
ThisBuild / version := "0.1.25"
Loading