Skip to content

Commit d73d01f

Browse files
Danil42RussiaDanil42Russia
authored
version 2.0.2 for PhpStorm 2023.2 (#203)
1 parent 6a2bfba commit d73d01f

22 files changed

+389
-343
lines changed

‎.github/workflows/build.yml

+13-14
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,20 @@ jobs:
1818

1919
# Validate wrapper
2020
- name: Gradle Wrapper Validation
21-
uses: gradle/wrapper-validation-action@v1.0.6
21+
uses: gradle/wrapper-validation-action@v1.1.0
2222

23-
# Setup Java 11 environment for the next steps
23+
# Set up Java environment for the next steps
2424
- name: Setup Java
2525
uses: actions/setup-java@v3
2626
with:
2727
distribution: zulu
28-
java-version: 11
28+
java-version: 17
29+
30+
# Setup Gradle
31+
- name: Setup Gradle
32+
uses: gradle/gradle-build-action@v2
33+
with:
34+
gradle-home-cache-cleanup: true
2935

3036
# Set environment variables
3137
- name: Export Properties
@@ -34,27 +40,20 @@ jobs:
3440
run: |
3541
PROPERTIES="$(./gradlew properties --console=plain -q)"
3642
VERSION="$(echo "$PROPERTIES" | grep "^version:" | cut -f2- -d ' ')"
37-
NAME="$(echo "$PROPERTIES" | grep "^pluginName:" | cut -f2- -d ' ')"
3843
CHANGELOG="$(./gradlew getChangelog --unreleased --no-header --console=plain -q)"
44+
3945
echo "version=$VERSION" >> $GITHUB_OUTPUT
40-
echo "name=$NAME" >> $GITHUB_OUTPUT
4146
echo "pluginVerifierHomeDir=~/.pluginVerifier" >> $GITHUB_OUTPUT
4247
4348
echo "changelog<<EOF" >> $GITHUB_OUTPUT
4449
echo "$CHANGELOG" >> $GITHUB_OUTPUT
4550
echo "EOF" >> $GITHUB_OUTPUT
4651
4752
./gradlew listProductsReleases # prepare list of IDEs for Plugin Verifier
48-
# Run tests
49-
- name: Run Tests
50-
run: ./gradlew test
5153
52-
# Cache Plugin Verifier IDEs
53-
- name: Setup Plugin Verifier IDEs Cache
54-
uses: actions/cache@v3
55-
with:
56-
path: ${{ steps.properties.outputs.pluginVerifierHomeDir }}/ides
57-
key: plugin-verifier-${{ hashFiles('build/listProductsReleases.txt') }}
54+
# Build plugin
55+
- name: Build plugin
56+
run: ./gradlew buildPlugin
5857

5958
# Run Verify Plugin task and IntelliJ Plugin Verifier tool
6059
- name: Run Plugin Verification tasks

‎.run/Run Diktat.run.xml

+22-21
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,24 @@
11
<component name="ProjectRunConfigurationManager">
2-
<configuration default="false" name="Run Diktat" type="GradleRunConfiguration" factoryName="Gradle">
3-
<ExternalSystemSettings>
4-
<option name="executionName"/>
5-
<option name="externalProjectPath" value="$PROJECT_DIR$"/>
6-
<option name="externalSystemIdString" value="GRADLE"/>
7-
<option name="scriptParameters" value=""/>
8-
<option name="taskDescriptions">
9-
<list/>
10-
</option>
11-
<option name="taskNames">
12-
<list>
13-
<option value="diktatCheck"/>
14-
</list>
15-
</option>
16-
<option name="vmOptions"/>
17-
</ExternalSystemSettings>
18-
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
19-
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
20-
<DebugAllEnabled>false</DebugAllEnabled>
21-
<method v="2"/>
22-
</configuration>
2+
<configuration default="false" name="Run Diktat" type="GradleRunConfiguration" factoryName="Gradle">
3+
<ExternalSystemSettings>
4+
<option name="executionName" />
5+
<option name="externalProjectPath" value="$PROJECT_DIR$" />
6+
<option name="externalSystemIdString" value="GRADLE" />
7+
<option name="scriptParameters" value="--stacktrace" />
8+
<option name="taskDescriptions">
9+
<list />
10+
</option>
11+
<option name="taskNames">
12+
<list>
13+
<option value="diktatCheck" />
14+
</list>
15+
</option>
16+
<option name="vmOptions" />
17+
</ExternalSystemSettings>
18+
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
19+
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
20+
<DebugAllEnabled>false</DebugAllEnabled>
21+
<RunAsTest>false</RunAsTest>
22+
<method v="2" />
23+
</configuration>
2324
</component>

‎.run/Run IDE with Plugin.run.xml ‎.run/Run Plugin.run.xml

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
<component name="ProjectRunConfigurationManager">
22
<configuration default="false" name="Run Plugin" type="GradleRunConfiguration" factoryName="Gradle">
3-
<log_file alias="idea.log" path="$PROJECT_DIR$/build/idea-sandbox/system/log/idea.log"/>
3+
<log_file alias="idea.log" path="$PROJECT_DIR$/build/idea-sandbox/system/log/idea.log" />
44
<ExternalSystemSettings>
5-
<option name="executionName"/>
6-
<option name="externalProjectPath" value="$PROJECT_DIR$"/>
7-
<option name="externalSystemIdString" value="GRADLE"/>
8-
<option name="scriptParameters" value=""/>
5+
<option name="executionName" />
6+
<option name="externalProjectPath" value="$PROJECT_DIR$" />
7+
<option name="externalSystemIdString" value="GRADLE" />
8+
<option name="scriptParameters" value="" />
99
<option name="taskDescriptions">
10-
<list/>
10+
<list />
1111
</option>
1212
<option name="taskNames">
1313
<list>
14-
<option value="runIde"/>
14+
<option value="runIde" />
1515
</list>
1616
</option>
17-
<option name="vmOptions" value=""/>
17+
<option name="vmOptions" value="" />
1818
</ExternalSystemSettings>
1919
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
2020
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
2121
<DebugAllEnabled>false</DebugAllEnabled>
22-
<method v="2"/>
22+
<method v="2" />
2323
</configuration>
24-
</component>
24+
</component>

‎.run/Run Plugin Tests.run.xml ‎.run/Run Tests.run.xml

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
<component name="ProjectRunConfigurationManager">
22
<configuration default="false" name="Run Tests" type="GradleRunConfiguration" factoryName="Gradle">
3-
<log_file alias="idea.log" path="$PROJECT_DIR$/build/idea-sandbox/system/log/idea.log"/>
3+
<log_file alias="idea.log" path="$PROJECT_DIR$/build/idea-sandbox/system/log/idea.log" />
44
<ExternalSystemSettings>
5-
<option name="executionName"/>
6-
<option name="externalProjectPath" value="$PROJECT_DIR$"/>
7-
<option name="externalSystemIdString" value="GRADLE"/>
8-
<option name="scriptParameters" value=""/>
5+
<option name="executionName" />
6+
<option name="externalProjectPath" value="$PROJECT_DIR$" />
7+
<option name="externalSystemIdString" value="GRADLE" />
8+
<option name="scriptParameters" value="" />
99
<option name="taskDescriptions">
10-
<list/>
10+
<list />
1111
</option>
1212
<option name="taskNames">
1313
<list>
14-
<option value="check"/>
14+
<option value="check" />
1515
</list>
1616
</option>
17-
<option name="vmOptions" value=""/>
17+
<option name="vmOptions" value="" />
1818
</ExternalSystemSettings>
1919
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
2020
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
21-
<DebugAllEnabled>true</DebugAllEnabled>
22-
<method v="2"/>
21+
<DebugAllEnabled>false</DebugAllEnabled>
22+
<method v="2" />
2323
</configuration>
24-
</component>
24+
</component>

‎.run/Run Plugin Verification.run.xml ‎.run/Run Verifications.run.xml

+10-12
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,25 @@
11
<component name="ProjectRunConfigurationManager">
22
<configuration default="false" name="Run Verifications" type="GradleRunConfiguration" factoryName="Gradle">
3-
<log_file alias="idea.log" path="$PROJECT_DIR$/build/idea-sandbox/system/log/idea.log"/>
3+
<log_file alias="idea.log" path="$PROJECT_DIR$/build/idea-sandbox/system/log/idea.log" />
44
<ExternalSystemSettings>
5-
<option name="executionName"/>
6-
<option name="externalProjectPath" value="$PROJECT_DIR$"/>
7-
<option name="externalSystemIdString" value="GRADLE"/>
8-
<option name="scriptParameters" value=""/>
5+
<option name="executionName" />
6+
<option name="externalProjectPath" value="$PROJECT_DIR$" />
7+
<option name="externalSystemIdString" value="GRADLE" />
8+
<option name="scriptParameters" value="" />
99
<option name="taskDescriptions">
10-
<list/>
10+
<list />
1111
</option>
1212
<option name="taskNames">
1313
<list>
14-
<option value="runPluginVerifier"/>
14+
<option value="runPluginVerifier" />
1515
</list>
1616
</option>
17-
<option name="vmOptions" value=""/>
17+
<option name="vmOptions" value="" />
1818
</ExternalSystemSettings>
1919
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
2020
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
2121
<DebugAllEnabled>false</DebugAllEnabled>
22-
<method v="2">
23-
<option name="Gradle.BeforeRunTask" enabled="true" tasks="clean" externalProjectPath="$PROJECT_DIR$" vmOptions=""
24-
scriptParameters=""/>
25-
</method>
22+
<RunAsTest>false</RunAsTest>
23+
<method v="2" />
2624
</configuration>
2725
</component>

‎CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
## [Unreleased]
44

5+
## 2.0.2 — 21.08.2023
6+
7+
- Adapt code for PhpStorm 2023.2
8+
59
## 2.0.1 — 14.08.2023
610

711
- Adapt code for PhpStorm 2023.1

‎build.gradle.kts

+24-37
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,13 @@ import org.jetbrains.changelog.Changelog
44
fun properties(key: String) = providers.gradleProperty(key)
55

66
plugins {
7-
// Java support
8-
id("java")
9-
// Kotlin support
10-
id("org.jetbrains.kotlin.jvm") version "1.8.10"
11-
// gradle-intellij-plugin - read more: https://github.com/JetBrains/gradle-intellij-plugin
12-
id("org.jetbrains.intellij") version "1.13.2"
13-
// gradle-changelog-plugin - read more: https://github.com/JetBrains/gradle-changelog-plugin
14-
id("org.jetbrains.changelog") version "2.0.0"
15-
// kotlinx serialization - read more: https://github.com/Kotlin/kotlinx.serialization
16-
kotlin("plugin.serialization") version "1.6.21"
17-
// detekt linter - read more: https://github.com/detekt/detekt
18-
id("io.gitlab.arturbosch.detekt") version "1.22.0"
19-
// diktat linter - read more: https://github.com/saveourtool/diktat
20-
id("org.cqfn.diktat.diktat-gradle-plugin") version "1.2.5"
21-
// Gradle Kover Plugin
22-
id("org.jetbrains.kotlinx.kover") version "0.6.1"
7+
id("java") // Java support
8+
alias(libs.plugins.kotlin) // Kotlin support
9+
alias(libs.plugins.gradleIntelliJPlugin) // Gradle IntelliJ Plugin
10+
alias(libs.plugins.changelog) // Gradle Changelog Plugin
11+
alias(libs.plugins.kotlinSerialization) // Kotlinx serialization
12+
alias(libs.plugins.gradleDetektPlugin) // Gradle Detekt Plugin
13+
alias(libs.plugins.gradleDiktatPlugin) // Gradle Diktat Plugin
2314
}
2415

2516
group = properties("pluginGroup").get()
@@ -35,39 +26,35 @@ kotlin {
3526
jvmToolchain(17)
3627
}
3728

29+
// Dependencies are managed with Gradle version catalog - read more: https://docs.gradle.org/current/userguide/platforms.html#sub:version-catalog
3830
dependencies {
39-
detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.22.0")
31+
detektPlugins(libs.detektFormatting)
4032

41-
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.3")
42-
implementation("org.jetbrains:markdown:0.2.4")
43-
implementation("io.sentry:sentry:6.1.0")
33+
implementation(libs.kotlinxSerializationJson)
34+
implementation(libs.markdown)
35+
implementation(libs.sentry)
4436
}
4537

4638
// Configure Gradle IntelliJ Plugin - read more: https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html
4739
intellij {
48-
pluginName.set(properties("pluginName"))
49-
version.set(properties("platformVersion"))
50-
type.set(properties("platformType"))
40+
pluginName = properties("pluginName")
41+
version = properties("platformVersion")
42+
type = properties("platformType")
5143

5244
// Plugin Dependencies. Uses `platformPlugins` property from the gradle.properties file.
53-
plugins.set(properties("platformPlugins").map { it.split(',').map(String::trim).filter(String::isNotEmpty) })
45+
plugins = properties("platformPlugins").map { it.split(',').map(String::trim).filter(String::isNotEmpty) }
5446
}
5547

5648
// Configure Gradle Changelog Plugin - read more: https://github.com/JetBrains/gradle-changelog-plugin
5749
changelog {
5850
groups.empty()
59-
repositoryUrl.set(properties("pluginRepositoryUrl"))
60-
}
61-
62-
// Configure Gradle Kover Plugin - read more: https://github.com/Kotlin/kotlinx-kover#configuration
63-
kover.xmlReport {
64-
onCheck.set(true)
51+
repositoryUrl = properties("pluginRepositoryUrl")
6552
}
6653

6754
// Configure detekt plugin.
6855
// Read more: https://detekt.github.io/detekt/kotlindsl.html
6956
detekt {
70-
config = files("./detekt-config.yml")
57+
config.setFrom("./detekt-config.yml")
7158
buildUponDefaultConfig = true
7259
}
7360

@@ -88,13 +75,13 @@ tasks {
8875
}
8976

9077
patchPluginXml {
91-
version.set(properties("pluginVersion"))
92-
sinceBuild.set(properties("pluginSinceBuild"))
93-
untilBuild.set(properties("pluginUntilBuild"))
78+
version = properties("pluginVersion")
79+
sinceBuild = properties("pluginSinceBuild")
80+
untilBuild = properties("pluginUntilBuild")
9481

9582
val changelog = project.changelog // local variable for configuration cache compatibility
9683
// Get the latest available change notes from the changelog file
97-
changeNotes.set(properties("pluginVersion").map { pluginVersion ->
84+
changeNotes = properties("pluginVersion").map { pluginVersion ->
9885
with(changelog) {
9986
renderItem(
10087
(getOrNull(pluginVersion) ?: getUnreleased())
@@ -103,11 +90,11 @@ tasks {
10390
Changelog.OutputType.HTML,
10491
)
10592
}
106-
})
93+
}
10794
}
10895

10996
runIde {
110-
maxHeapSize = "2g"
97+
maxHeapSize = "8g"
11198
}
11299

113100
detekt.configure {

‎gradle.properties

+13-11
Original file line numberDiff line numberDiff line change
@@ -5,28 +5,30 @@ pluginName = admstorm
55
pluginRepositoryUrl = https://github.com/VKCOM/admstorm
66

77
# SemVer format -> https://semver.org
8-
pluginVersion = 2.0.1
8+
pluginVersion = 2.0.2
99

1010
# Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
11-
pluginSinceBuild = 231
12-
pluginUntilBuild = 231.*
11+
pluginSinceBuild = 232
12+
pluginUntilBuild = 232.*
1313

1414
# IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension
1515
platformType = IU
16-
platformVersion = 2023.1
16+
platformVersion = 2023.2
1717

1818
# Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
1919
# Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22
2020
# PHP Plugin - https://plugins.jetbrains.com/plugin/6610-php/versions
2121
# Terminal Plugin - https://plugins.jetbrains.com/plugin/13123-terminal/versions
22-
platformPlugins = com.jetbrains.php:231.8109.199, Git4Idea, org.jetbrains.plugins.terminal:231.8109.126, org.jetbrains.plugins.remote-run
22+
platformPlugins = com.jetbrains.php:232.8660.205, Git4Idea, org.jetbrains.plugins.terminal:232.8660.88, org.jetbrains.plugins.remote-run
2323

2424
# Gradle Releases -> https://github.com/gradle/gradle/releases
25-
gradleVersion = 8.0.2
26-
27-
# Opt-out flag for bundling Kotlin standard library -> https://jb.gg/intellij-platform-kotlin-stdlib
28-
# suppress inspection "UnusedProperty"
29-
kotlin.stdlib.default.dependency = false
25+
gradleVersion = 8.3
3026

3127
# Enable Gradle Configuration Cache -> https://docs.gradle.org/current/userguide/configuration_cache.html
32-
org.gradle.unsafe.configuration-cache = true
28+
org.gradle.configuration-cache = true
29+
30+
# Enable Gradle Build Cache -> https://docs.gradle.org/current/userguide/build_cache.html
31+
org.gradle.caching = true
32+
33+
# Enable Gradle Kotlin DSL Lazy Property Assignment -> https://docs.gradle.org/current/userguide/kotlin_dsl.html#kotdsl:assignment
34+
systemProp.org.gradle.unsafe.kotlin.assignment = true

0 commit comments

Comments
 (0)