From 3cf6e74316a77cf4973a0575a9097be80699cf32 Mon Sep 17 00:00:00 2001 From: Jan Skrasek Date: Fri, 30 Jul 2021 22:23:22 +0200 Subject: [PATCH] update build dependencies & and remove setting untilBuild --- build.gradle.kts | 15 +++++++-------- changelog.md | 3 +++ gradle.properties | 12 ++++-------- src/main/resources/META-INF/plugin.xml | 2 ++ 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index f77921f..9764b29 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,9 +5,9 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile fun properties(key: String) = project.findProperty(key).toString() plugins { - id("org.jetbrains.kotlin.jvm") version "1.5.20" - id("org.jetbrains.intellij") version "1.1.2" - id("org.jetbrains.changelog") version "1.1.2" + id("org.jetbrains.kotlin.jvm") version "1.5.21" + id("org.jetbrains.intellij") version "1.1.4" + id("org.jetbrains.changelog") version "1.2.1" } group = properties("pluginGroup") @@ -26,14 +26,14 @@ intellij { version.set(properties("platformVersion")) type.set(properties("platformType")) downloadSources.set(properties("platformDownloadSources").toBoolean()) - updateSinceUntilBuild.set(true) plugins.set(properties("platformPlugins").split(',').map(String::trim).filter(String::isNotEmpty)) + updateSinceUntilBuild.set(false) } changelog { - version = properties("pluginVersion") - path = "${project.projectDir}/changelog.md" - groups = listOf("Changed") + version.set(properties("pluginVersion")) + path.set("${project.projectDir}/changelog.md") + groups.set(listOf("Changed")) } tasks { @@ -47,7 +47,6 @@ tasks { patchPluginXml { version.set(properties("pluginVersion")) - sinceBuild.set(properties("pluginSinceBuild")) pluginDescription.set( File(projectDir, "readme.md").readText().lines().run { diff --git a/changelog.md b/changelog.md index 104838e..0f11d41 100644 --- a/changelog.md +++ b/changelog.md @@ -2,6 +2,9 @@ ## [Unreleased] ### Changed +- Removed upper bound of compatibility constraint for latest PhpStorm. (Second try) +- Updated build dependencies. + ## [0.8.2] ### Changed - Removed upper bound of compatibility constraint for latest PhpStorm. diff --git a/gradle.properties b/gradle.properties index e2ede34..568e04e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,18 +1,14 @@ pluginGroup = org.nextras.orm.intellij pluginName = Nextras Orm Plugin -pluginVersion = 0.8.2 - -# See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html#intellij-platform-based-products-of-recent-ide-versions -# for insight into build numbers and IntelliJ Platform versions. -pluginSinceBuild = 201.3119 +pluginVersion = 0.8.3 # Plugin Verifier integration -> https://github.com/JetBrains/gradle-intellij-plugin#plugin-verifier-dsl # See https://jb.gg/intellij-platform-builds-list for available build versions. -pluginVerifierIdeVersions = PS-2020.2.4, PS-2020.3.3, PS-2021.1 +pluginVerifierIdeVersions = PS-2020.3.3, PS-2021.1, PS-2021.2 platformType = IU -platformVersion = 2020.1 +platformVersion = 2021.2 platformDownloadSources = true # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html # Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22 -platformPlugins = com.jetbrains.php:201.6668.153 +platformPlugins = com.jetbrains.php:212.4746.100 diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml index 4090b05..a4e53b3 100644 --- a/src/main/resources/META-INF/plugin.xml +++ b/src/main/resources/META-INF/plugin.xml @@ -6,6 +6,8 @@ com.intellij.modules.platform com.jetbrains.php + +