From 5cebc925a1f7fbaefbcfd658cc9d844bf47f040a Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 26 Dec 2021 01:16:20 +0100 Subject: [PATCH 1/6] Update sbt-scalafmt to 2.4.6 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 52f70176..16cffbb0 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -27,5 +27,5 @@ addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.1.1") addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.7") addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1") addSbtPlugin("org.jetbrains" % "sbt-idea-plugin" % "3.8.5") -addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.5") +addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6") addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.33") From 3211d8312a71313a8761e51709191d65537053c2 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 24 Feb 2022 20:46:02 +0100 Subject: [PATCH 2/6] Revert commit(s) 5cebc92 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 16cffbb0..52f70176 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -27,5 +27,5 @@ addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.1.1") addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.7") addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1") addSbtPlugin("org.jetbrains" % "sbt-idea-plugin" % "3.8.5") -addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6") +addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.5") addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.33") From e546029b3442535c6b01bfb4a37b4f60de25e9b8 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 24 Feb 2022 20:46:07 +0100 Subject: [PATCH 3/6] Update sbt-scalafmt to 2.4.6 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 403cc16e..7f7dbfb6 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -27,5 +27,5 @@ addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.1.1") addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.12") addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1") addSbtPlugin("org.jetbrains" % "sbt-idea-plugin" % "3.8.5") -addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.5") +addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6") addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.34") From d624bcbb78822655c30b37c384a709fda869ed83 Mon Sep 17 00:00:00 2001 From: Shadaj Laddad Date: Sat, 26 Feb 2022 19:02:49 -0800 Subject: [PATCH 4/6] Try to not set untilBuild --- coreIntellijSupport/build.sbt | 1 - coreIntellijSupport/src/main/resources/META-INF/plugin.xml | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) 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 From 208a41b98bb1b09645f55c6b95d8a5fe26772f59 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 27 Feb 2022 04:31:08 +0100 Subject: [PATCH 5/6] Revert commit(s) e546029 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 7f7dbfb6..403cc16e 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -27,5 +27,5 @@ addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.1.1") addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.12") addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1") addSbtPlugin("org.jetbrains" % "sbt-idea-plugin" % "3.8.5") -addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6") +addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.5") addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.34") From 2d8f30a46ae669a1d66db963a6154a39e24b22ce Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 27 Feb 2022 04:31:13 +0100 Subject: [PATCH 6/6] Update sbt-scalafmt to 2.4.6 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index b20960a6..a0a540ca 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -27,5 +27,5 @@ addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.1.1") addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.12") addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1") addSbtPlugin("org.jetbrains" % "sbt-idea-plugin" % "3.13.8") -addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.5") +addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6") addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.34")