OPENIDE fix build number

(cherry picked from commit 6616969f90)
(cherry picked from commit 93f8364c25)
This commit is contained in:
Nikita Iarychenko
2025-10-29 11:40:56 +04:00
parent 8fce30f738
commit 6df8a5c628
2 changed files with 16 additions and 10 deletions

View File

@@ -1,4 +1,7 @@
// Copyright 2000-2026 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
//
// Modified by Nikita Iarychenko at 2025 as part of the OpenIDE project(https://openide.ru).
// Any modifications are available on the same license terms as the original source code.
@file:Suppress("ReplaceGetOrSet")
package org.jetbrains.intellij.build.impl
@@ -177,9 +180,9 @@ class BuildContextImpl internal constructor(
if (isNightly(value)) {
value = "$value.0"
}
check(SemVer.parseFromText(value) != null) {
"The plugin build number $value is expected to match the Semantic Versioning, see https://semver.org"
}
//check(SemVer.parseFromText(value) != null) {
// "The plugin build number $value is expected to match the Semantic Versioning, see https://semver.org"
//}
value
}

View File

@@ -1,4 +1,7 @@
// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
//
// Modified by Nikita Iarychenko at 2025 as part of the OpenIDE project(https://openide.ru).
// Any modifications are available on the same license terms as the original source code.
package org.jetbrains.intellij.build.impl
import com.intellij.openapi.util.JDOMUtil
@@ -125,13 +128,13 @@ private val DEV_BUILD_SCHEME: Regex = Regex("^${SnapshotBuildNumber.BASE.replace
private suspend fun getPluginVersion(plugin: PluginLayout, descriptorContent: String, context: BuildContext): PluginVersionEvaluatorResult {
val pluginVersion = plugin.versionEvaluator.evaluate(pluginXmlSupplier = { descriptorContent }, ideBuildVersion = context.pluginBuildNumber, context = context)
check(
!plugin.semanticVersioning ||
SemVer.parseFromText(pluginVersion.pluginVersion) != null ||
DEV_BUILD_SCHEME.matches(pluginVersion.pluginVersion)
) {
"$plugin version '${pluginVersion.pluginVersion}' is expected to match either '$DEV_BUILD_SCHEME' or the Semantic Versioning, see https://semver.org"
}
//check(
// !plugin.semanticVersioning ||
// SemVer.parseFromText(pluginVersion.pluginVersion) != null ||
// DEV_BUILD_SCHEME.matches(pluginVersion.pluginVersion)
//) {
// "$plugin version '${pluginVersion.pluginVersion}' is expected to match either '$DEV_BUILD_SCHEME' or the Semantic Versioning, see https://semver.org"
//}
return pluginVersion
}