From 588ab71b3464c4b6b1a479933d8b8a76a7e4dc6e Mon Sep 17 00:00:00 2001 From: Shadaj Laddad Date: Sat, 26 Feb 2022 19:02:49 -0800 Subject: [PATCH] Try to not set untilBuild --- .github/workflows/sbt.yml | 2 +- coreIntellijSupport/build.sbt | 1 - coreIntellijSupport/src/main/resources/META-INF/plugin.xml | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/sbt.yml b/.github/workflows/sbt.yml index db67a3da..f484b52c 100644 --- a/.github/workflows/sbt.yml +++ b/.github/workflows/sbt.yml @@ -97,7 +97,7 @@ jobs: java-version: 1.8 - run: git fetch --unshallow - name: Publish to Marketplace - run: sbt coreIntellijSupport/updateIntellij coreIntellijSupport/packageArtifact coreIntellijSupport/publishAutoChannel + run: sbt coreIntellijSupport/updateIntellij coreIntellijSupport/packageArtifact coreIntellijSupport/packageArtifact coreIntellijSupport/publishAutoChannel if: github.ref == 'refs/heads/main' || github.event_name == 'release' env: IJ_PLUGIN_REPO_TOKEN: ${{ secrets.ij_plugin_repo_token }} diff --git a/coreIntellijSupport/build.sbt b/coreIntellijSupport/build.sbt index 5cd02291..e36f18ee 100644 --- a/coreIntellijSupport/build.sbt +++ b/coreIntellijSupport/build.sbt @@ -11,7 +11,6 @@ packageMethod := PackagingMethod.Standalone() patchPluginXml := pluginXmlOptions { xml => xml.version = version.value xml.sinceBuild = (intellijBuild in ThisBuild).value - xml.untilBuild = "" } val publishAutoChannel = taskKey[Unit]("publishAutoChannel") diff --git a/coreIntellijSupport/src/main/resources/META-INF/plugin.xml b/coreIntellijSupport/src/main/resources/META-INF/plugin.xml index bc943566..7f7f7d6c 100644 --- a/coreIntellijSupport/src/main/resources/META-INF/plugin.xml +++ b/coreIntellijSupport/src/main/resources/META-INF/plugin.xml @@ -6,7 +6,7 @@ Typechecking support for the @react macro annotation in the Slinky framework for writing React apps with Scala. - + org.intellij.scala com.intellij.modules.java