From 08c93ce740b3740db7050b0b6d9d893f27a3fd24 Mon Sep 17 00:00:00 2001
From: Alexey Tsvetkov <654232+AlexeyTsvetkov@users.noreply.github.com>
Date: Mon, 23 Jan 2023 16:14:24 +0100
Subject: [PATCH] Redo: set until-build to undefined value (#2658)

Previously we unset until-build in DSL.
However, Intellij SDK Gradle plugin DSL
does not support setting only since-build,
while omitting until-build.

So we effectively made the plugin
compatible with a single version of Intellij.

This change fixes that by disabling patching
since-build/until-build from DSL and setting
since-build version directly in plugin.xml
---
 idea-plugin/build.gradle.kts                       | 6 +-----
 idea-plugin/gradle.properties                      | 4 ++--
 idea-plugin/src/main/resources/META-INF/plugin.xml | 3 +++
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/idea-plugin/build.gradle.kts b/idea-plugin/build.gradle.kts
index afe1b6e9e2..8e7fdb866e 100644
--- a/idea-plugin/build.gradle.kts
+++ b/idea-plugin/build.gradle.kts
@@ -25,6 +25,7 @@ intellij {
     type.set(projectProperties.platformType)
     version.set(projectProperties.platformVersion)
     downloadSources.set(projectProperties.platformDownloadSources)
+    updateSinceUntilBuild.set(false)
 
     plugins.set(
         listOf(
@@ -55,10 +56,6 @@ tasks {
         channels.set(projectProperties.pluginChannels)
     }
 
-    patchPluginXml {
-        sinceBuild.set(projectProperties.pluginSinceBuild)
-    }
-
     runPluginVerifier {
         ideVersions.set(projectProperties.pluginVerifierIdeVersions)
     }
@@ -70,7 +67,6 @@ class ProjectProperties(private val project: Project) {
     val platformVersion get() = stringProperty("platform.version")
     val platformDownloadSources get() = stringProperty("platform.download.sources").toBoolean()
     val pluginChannels get() = listProperty("plugin.channels")
-    val pluginSinceBuild get() = stringProperty("plugin.since.build")
     val pluginVerifierIdeVersions get() = listProperty("plugin.verifier.ide.versions")
 
     private fun stringProperty(key: String): String =
diff --git a/idea-plugin/gradle.properties b/idea-plugin/gradle.properties
index 99d5f93d08..0755c4f3e8 100644
--- a/idea-plugin/gradle.properties
+++ b/idea-plugin/gradle.properties
@@ -5,8 +5,8 @@ kotlin.stdlib.default.dependency=false
 deploy.version=0.1-SNAPSHOT
 
 plugin.channels=snapshots
-plugin.since.build=213
-## See https://jb.gg/intellij-platform-builds-list for available build versions.
+# Intellij since-build should be updated directly in src/main/resources/META-INF/plugin.xml
+# See https://jb.gg/intellij-platform-builds-list for available build versions.
 plugin.verifier.ide.versions=2021.3, 2022.1, 2022.2
 
 platform.type=IC
diff --git a/idea-plugin/src/main/resources/META-INF/plugin.xml b/idea-plugin/src/main/resources/META-INF/plugin.xml
index 9c1c8fcb9f..947d927ea3 100644
--- a/idea-plugin/src/main/resources/META-INF/plugin.xml
+++ b/idea-plugin/src/main/resources/META-INF/plugin.xml
@@ -13,6 +13,9 @@
 
     </description>
 
+    <!-- until-build is omitted, so we don't have to update it after each Intellij release -->
+    <idea-version since-build="213"/>
+
     <!-- Product and plugin compatibility requirements -->
     <!-- https://plugins.jetbrains.com/docs/intellij/plugin-compatibility.html -->
     <depends>com.intellij.modules.platform</depends>