diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS new file mode 100644 index 00000000..24202143 --- /dev/null +++ b/.github/CODEOWNERS @@ -0,0 +1 @@ +.github/ @VKCOM/vk-sec diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 00000000..5d626778 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,22 @@ +version: 2 +updates: + - package-ecosystem: "gradle" + directory: "/" + schedule: + interval: "daily" + allow: + - dependency-type: "direct" + reviewers: + - "VKCOM/vk-sec" + - "VKCOM/kphp-developers" + open-pull-requests-limit: 0 + - package-ecosystem: "github-actions" + # Workflow files stored in the + # default location of `.github/workflows` + directory: "/" + schedule: + interval: "daily" + reviewers: + - "VKCOM/vk-sec" + - "VKCOM/kphp-developers" + open-pull-requests-limit: 0 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 21c8ca9b..23514298 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -38,9 +38,7 @@ jobs: # Setup Gradle - name: Setup Gradle - uses: gradle/actions/setup-gradle@v3 - with: - gradle-home-cache-cleanup: true + uses: gradle/actions/setup-gradle@v4 # Set environment variables - name: Export Properties @@ -89,9 +87,7 @@ jobs: # Setup Gradle - name: Setup Gradle - uses: gradle/actions/setup-gradle@v3 - with: - gradle-home-cache-cleanup: true + uses: gradle/actions/setup-gradle@v4 # Run tests - name: Run Tests @@ -125,9 +121,7 @@ jobs: # Setup Gradle - name: Setup Gradle - uses: gradle/actions/setup-gradle@v3 - with: - gradle-home-cache-cleanup: true + uses: gradle/actions/setup-gradle@v4 # Run Verify Plugin task and IntelliJ Plugin Verifier tool - name: Run Plugin Verification tasks diff --git a/.run/Run Plugin.run.xml b/.run/Run Plugin.run.xml index d15ff681..c4ec3d67 100644 --- a/.run/Run Plugin.run.xml +++ b/.run/Run Plugin.run.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 26fcc7f6..e53ad1c3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## [Unreleased] +## [1.2.14] - 01.03.2024 + +- adapt code for 2024.3 + ## [1.2.13] - 16.09.2024 - adapt code for 2024.2 diff --git a/build.gradle.kts b/build.gradle.kts index 140650ea..3e435eb3 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -28,7 +28,6 @@ repositories { // Dependencies are managed with Gradle version catalog - read more: https://docs.gradle.org/current/userguide/platforms.html#sub:version-catalog dependencies { - testImplementation("org.opentest4j:opentest4j:1.3.0") // TODO: remove in the next update testImplementation(libs.junit) // IntelliJ Platform Gradle Plugin Dependencies Extension - read more: https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-dependencies-extension.html @@ -87,7 +86,6 @@ changelog { repositoryUrl = providers.gradleProperty("pluginRepositoryUrl") } - tasks { wrapper { gradleVersion = providers.gradleProperty("gradleVersion").get() diff --git a/gradle.properties b/gradle.properties index 45242968..3600c442 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,24 +4,24 @@ pluginGroup = com.vk pluginName = kphpstorm pluginRepositoryUrl = https://github.com/VKCOM/kphpstorm # SemVer format -> https://semver.org -pluginVersion = 1.2.13 +pluginVersion = 1.2.14 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html -pluginSinceBuild = 242 -pluginUntilBuild = 242.* +pluginSinceBuild = 243 +pluginUntilBuild = 243.* # IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension platformType = IU -platformVersion = 2024.2 +platformVersion = 2024.3 # 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 -platformPlugins = com.jetbrains.php:242.20224.427 +platformPlugins = com.jetbrains.php:243.21565.211 # Example: platformBundledPlugins = com.intellij.java platformBundledPlugins = com.intellij.java # Gradle Releases -> https://github.com/gradle/gradle/releases -gradleVersion = 8.9 +gradleVersion = 8.10.2 # 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 f21a08d1..75b9f011 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,7 +4,7 @@ junit = "4.13.2" # plugins changelog = "2.2.1" -intelliJPlatform = "2.0.1" +intelliJPlatform = "2.0.1" # TODO: update this in next update: https://youtrack.jetbrains.com/issue/MP-7019 kotlin = "1.9.25" [libraries] diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 2c352119..a4b76b95 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 09523c0e..df97d72b 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.9-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME