diff --git a/build.gradle.kts b/build.gradle.kts index 0d324861..92cb275e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -17,7 +17,8 @@ fun getVersionNumber() : String { val build = System.getenv("BUILD_NUMBER") ?: 3 - val branchName = System.getenv("BRANCH_NAME") ?: "undefined" + // Branch names like "fix/foo" would otherwise put a path separator into the distribution zip's file name + val branchName = (System.getenv("BRANCH_NAME") ?: "undefined").replace(Regex("[^A-Za-z0-9._-]"), "-") if (branchName.matches(Regex("""[0-9]{3}\.x"""))) { return "${major}.${minor}.${build}" @@ -29,7 +30,7 @@ fun getVersionNumber() : String { plugins { id("java") - id("org.jetbrains.intellij.platform") version "2.18.1" + id("org.jetbrains.intellij.platform") version "2.19.0" id("org.jetbrains.grammarkit") version "2023.3.0.4" id("checkstyle") id("com.avast.gradle.docker-compose") version "0.17.21" @@ -404,5 +405,5 @@ tasks.register(" host.set("https://plugins.jetbrains.com") // Set the distribution file in gradle build to the archive file of the buildPlugin task - archiveFile.set(project.file("build/distributions/${project.name}-${project.version}.zip")) + archiveFiles.from(project.file("build/distributions/${project.name}-${project.version}.zip")) } diff --git a/ci/release-branch-automation.Jenkinsfile b/ci/release-branch-automation.Jenkinsfile index 84a43f96..8b3cfcf2 100644 --- a/ci/release-branch-automation.Jenkinsfile +++ b/ci/release-branch-automation.Jenkinsfile @@ -91,6 +91,8 @@ pipeline { echo \$BRANCH_NAME | sed -E "s/([0-9][0-9])([0-9]).x/intellijVersion=20\\1.\\2/" >> systemdUnitFilePlugin/gradle.properties echo \$BRANCH_NAME | sed -E "s/([0-9][0-9])([0-9]).x/sinceVersion=\\1\\2.0/" >> systemdUnitFilePlugin/gradle.properties echo \$BRANCH_NAME | sed -E "s/([0-9][0-9])([0-9]).x/pluginMajorVersion=\\1\\2/" >> systemdUnitFilePlugin/gradle.properties + echo "kotlin.stdlib.default.dependency=true" >> systemdUnitFilePlugin/gradle.properties + echo "org.jetbrains.intellij.platform.useDefaultSandboxExclusions=false" >> systemdUnitFilePlugin/gradle.properties git -C systemdUnitFilePlugin add gradle.properties cat systemdUnitFilePlugin/gradle.properties diff --git a/gradle.properties b/gradle.properties index 5fb63245..a9682605 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,3 +3,5 @@ platformType=IC intellijVersion=2024.2 sinceVersion=242.0 pluginMajorVersion=242 +kotlin.stdlib.default.dependency=true +org.jetbrains.intellij.platform.useDefaultSandboxExclusions=false