Browse Source

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
pull/2662/head
Alexey Tsvetkov 2 years ago committed by GitHub
parent
commit
08c93ce740
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      idea-plugin/build.gradle.kts
  2. 4
      idea-plugin/gradle.properties
  3. 3
      idea-plugin/src/main/resources/META-INF/plugin.xml

6
idea-plugin/build.gradle.kts

@ -25,6 +25,7 @@ intellij {
type.set(projectProperties.platformType) type.set(projectProperties.platformType)
version.set(projectProperties.platformVersion) version.set(projectProperties.platformVersion)
downloadSources.set(projectProperties.platformDownloadSources) downloadSources.set(projectProperties.platformDownloadSources)
updateSinceUntilBuild.set(false)
plugins.set( plugins.set(
listOf( listOf(
@ -55,10 +56,6 @@ tasks {
channels.set(projectProperties.pluginChannels) channels.set(projectProperties.pluginChannels)
} }
patchPluginXml {
sinceBuild.set(projectProperties.pluginSinceBuild)
}
runPluginVerifier { runPluginVerifier {
ideVersions.set(projectProperties.pluginVerifierIdeVersions) ideVersions.set(projectProperties.pluginVerifierIdeVersions)
} }
@ -70,7 +67,6 @@ class ProjectProperties(private val project: Project) {
val platformVersion get() = stringProperty("platform.version") val platformVersion get() = stringProperty("platform.version")
val platformDownloadSources get() = stringProperty("platform.download.sources").toBoolean() val platformDownloadSources get() = stringProperty("platform.download.sources").toBoolean()
val pluginChannels get() = listProperty("plugin.channels") val pluginChannels get() = listProperty("plugin.channels")
val pluginSinceBuild get() = stringProperty("plugin.since.build")
val pluginVerifierIdeVersions get() = listProperty("plugin.verifier.ide.versions") val pluginVerifierIdeVersions get() = listProperty("plugin.verifier.ide.versions")
private fun stringProperty(key: String): String = private fun stringProperty(key: String): String =

4
idea-plugin/gradle.properties

@ -5,8 +5,8 @@ kotlin.stdlib.default.dependency=false
deploy.version=0.1-SNAPSHOT deploy.version=0.1-SNAPSHOT
plugin.channels=snapshots plugin.channels=snapshots
plugin.since.build=213 # 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. # See https://jb.gg/intellij-platform-builds-list for available build versions.
plugin.verifier.ide.versions=2021.3, 2022.1, 2022.2 plugin.verifier.ide.versions=2021.3, 2022.1, 2022.2
platform.type=IC platform.type=IC

3
idea-plugin/src/main/resources/META-INF/plugin.xml

@ -13,6 +13,9 @@
</description> </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 --> <!-- Product and plugin compatibility requirements -->
<!-- https://plugins.jetbrains.com/docs/intellij/plugin-compatibility.html --> <!-- https://plugins.jetbrains.com/docs/intellij/plugin-compatibility.html -->
<depends>com.intellij.modules.platform</depends> <depends>com.intellij.modules.platform</depends>

Loading…
Cancel
Save