diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d757ec0..94a3a82 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,9 +16,6 @@ jobs: build: name: Build runs-on: ubuntu-latest - outputs: - version: ${{ steps.properties.outputs.version }} - changelog: ${{ steps.properties.outputs.changelog }} steps: # Free GitHub Actions Environment Disk Space @@ -43,20 +40,6 @@ jobs: - name: Setup Gradle uses: gradle/actions/setup-gradle@v4 - # Set environment variables - - name: Export Properties - id: properties - shell: bash - run: | - PROPERTIES="$(./gradlew properties --console=plain -q)" - VERSION="$(echo "$PROPERTIES" | grep "^version:" | cut -f2- -d ' ')" - CHANGELOG="$(./gradlew getChangelog --unreleased --no-header --console=plain -q)" - - echo "version=$VERSION" >> $GITHUB_OUTPUT - echo "changelog<> $GITHUB_OUTPUT - echo "$CHANGELOG" >> $GITHUB_OUTPUT - echo "EOF" >> $GITHUB_OUTPUT - # Build plugin - name: Build plugin run: ./gradlew buildPlugin diff --git a/.gitignore b/.gitignore index fe4b8f3..24dce30 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,6 @@ .gradle .idea .intellijPlatform -.qodana +.kotlin build src/test/fixtures/gen/ -.kotlin diff --git a/CHANGELOG.md b/CHANGELOG.md index 33cc28a..993a332 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ # Modulite Changelog -## [Unreleased] +## 1.1.11 - 06.08.2025 + +- Adapt code for PhpStorm 2025.2 ## 1.1.10 - 04.08.2025 diff --git a/build.gradle.kts b/build.gradle.kts index b3ec2f7..daa753d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -43,6 +43,8 @@ dependencies { plugins(providers.gradleProperty("platformPlugins").map { it.split(',') }) testFramework(TestFrameworkType.Platform) + + bundledModules(providers.gradleProperty("bundledModules").map { it.split(",") }) } } diff --git a/gradle.properties b/gradle.properties index 8f94f3c..97f6cc8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,15 +5,15 @@ pluginName = modulite pluginRepositoryUrl = https://github.com/VKCOM/modulite # SemVer format -> https://semver.org -pluginVersion = 1.1.10 +pluginVersion = 1.1.11 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html -pluginSinceBuild = 251 -pluginUntilBuild = 251.* +pluginSinceBuild = 252 +pluginUntilBuild = 252.* # IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension platformType = PS -platformVersion = 2025.1 +platformVersion = 2025.2 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html # Example: platformPlugins = com.jetbrains.php:203.4449.22, org.intellij.scala:2023.3.27@EAP @@ -21,8 +21,10 @@ platformPlugins = # Example: platformBundledPlugins = com.intellij.java platformBundledPlugins = com.jetbrains.php, org.jetbrains.plugins.yaml, Git4Idea +bundledModules = intellij.spellchecker + # Gradle Releases -> https://github.com/gradle/gradle/releases -gradleVersion = 8.14.3 +gradleVersion = 9.0.0 # Opt-out flag for bundling Kotlin standard library -> https://jb.gg/intellij-platform-kotlin-stdlib kotlin.stdlib.default.dependency = false diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 4e1ffdc..7579eac 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,7 +4,7 @@ junit = "4.13.2" opentest4j = "1.3.0" # plugins -changelog = "2.3.0" +changelog = "2.4.0" intelliJPlatform = "2.7.0" kotlin = "2.2.0" kover = "0.9.1" diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 1b33c55..8bdaf60 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d4081da..2a84e18 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index 23d15a9..ef07e01 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright © 2015-2021 the original authors. +# Copyright © 2015 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/settings.gradle.kts b/settings.gradle.kts index 9772a01..a35d587 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,5 +1,5 @@ +rootProject.name = "modulite" + plugins { id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0" } - -rootProject.name = "modulite" diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml index fe3d6da..22d0755 100644 --- a/src/main/resources/META-INF/plugin.xml +++ b/src/main/resources/META-INF/plugin.xml @@ -133,6 +133,7 @@ enabledByDefault="true" level="INFORMATION" implementationClass="com.vk.modulite.inspections.intentions.AllowInternalAccessEmptyInspection"/> + com.vk.modulite.inspections.intentions.GoToModuliteDefinitionIntention @@ -146,12 +147,6 @@ FindUsagesInModuleIntention - - - - - -