Skip to content

Commit

Permalink
update build dependencies & and remove setting untilBuild
Browse files Browse the repository at this point in the history
  • Loading branch information
hrach committed Jul 30, 2021
1 parent 24b39b0 commit 3cf6e74
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 16 deletions.
15 changes: 7 additions & 8 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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 {
Expand All @@ -47,7 +47,6 @@ tasks {

patchPluginXml {
version.set(properties("pluginVersion"))
sinceBuild.set(properties("pluginSinceBuild"))

pluginDescription.set(
File(projectDir, "readme.md").readText().lines().run {
Expand Down
3 changes: 3 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
12 changes: 4 additions & 8 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -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
2 changes: 2 additions & 0 deletions src/main/resources/META-INF/plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
<depends>com.intellij.modules.platform</depends>
<depends>com.jetbrains.php</depends>

<idea-version since-build="201.3119"/>

<extensions defaultExtensionNs="com.intellij">
<psi.referenceContributor
language="PHP"
Expand Down

0 comments on commit 3cf6e74

Please sign in to comment.