From a901b45b09b1a99240d96b70974c93603fb12f18 Mon Sep 17 00:00:00 2001 From: Oliver Nybroe Date: Thu, 15 Feb 2024 17:14:14 +0100 Subject: [PATCH] chore: bump dependencies --- CHANGELOG.md | 7 ++++++- build.gradle.kts | 18 ++++++++++++++---- gradle.properties | 10 +++++----- gradle/wrapper/gradle-wrapper.properties | 2 +- .../blade/BladePhpInspectionSuppressor.kt | 4 +++- .../ClosureToArrowFunctionInspection.kt | 2 +- .../nonMatches/collect_on_no_type_variable.php | 2 +- 7 files changed, 31 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 114b317..6a2efc0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,9 +3,14 @@ # collections-intellij Changelog ## [Unreleased] +### Changed +- Bump dependencies to latest versions + +### Fixed +- Fixed api changes in Blade plugin ## [0.4.0] -### Removed +### Removed - Removed type provider for higher order collections as it seemed unstable ## [0.3.5] diff --git a/build.gradle.kts b/build.gradle.kts index 88105da..57e08b2 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,3 +1,4 @@ +import org.jetbrains.changelog.Changelog import org.jetbrains.changelog.markdownToHTML fun properties(key: String) = project.findProperty(key).toString() @@ -6,9 +7,9 @@ plugins { // Java support id("java") // Kotlin support - id("org.jetbrains.kotlin.jvm") version "1.6.21" + id("org.jetbrains.kotlin.jvm") version "1.9.22" // Gradle IntelliJ Plugin - id("org.jetbrains.intellij") version "1.6.0" + id("org.jetbrains.intellij") version "1.17.1" // Gradle Changelog Plugin id("org.jetbrains.changelog") version "2.0.0" } @@ -21,6 +22,15 @@ repositories { mavenCentral() } +java { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + + toolchain { + languageVersion.set(JavaLanguageVersion.of(17)) + } +} + // Configure Gradle IntelliJ Plugin - read more: https://github.com/JetBrains/gradle-intellij-plugin intellij { pluginName.set(properties("pluginName")) @@ -63,9 +73,9 @@ tasks { // Get the latest available change notes from the changelog file changeNotes.set(provider { - changelog.run { + changelog.renderItem(changelog.run { getOrNull(properties("pluginVersion")) ?: getLatest() - }.toHTML() + }, Changelog.OutputType.HTML) }) } diff --git a/gradle.properties b/gradle.properties index 28564bd..b7c086b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,16 +7,16 @@ pluginVersion = 0.4.0 # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html # for insight into build numbers and IntelliJ Platform versions. -pluginSinceBuild = 212 +pluginSinceBuild = 233 pluginUntilBuild = -platformType = IU -platformVersion = 2021.2.2 +platformType = PS +platformVersion = 2023.3 # Get latest version from https://plugins.jetbrains.com/plugin/6610-php/versions # Get latest version from https://plugins.jetbrains.com/plugin/7569-blade/versions -platformPlugins = com.jetbrains.php:212.5284.49, com.jetbrains.php.blade:212.5080.8 +platformPlugins = com.jetbrains.php, com.jetbrains.php.blade -gradleVersion = 7.4 +gradleVersion = 8.4 # Opt-out flag for bundling Kotlin standard library. # See https://kotlinlang.org/docs/reference/using-gradle.html#dependency-on-the-standard-library for details. diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 14e30f7..fce403e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/kotlin/dev/nybroe/collector/blade/BladePhpInspectionSuppressor.kt b/src/main/kotlin/dev/nybroe/collector/blade/BladePhpInspectionSuppressor.kt index 9778962..46494d6 100644 --- a/src/main/kotlin/dev/nybroe/collector/blade/BladePhpInspectionSuppressor.kt +++ b/src/main/kotlin/dev/nybroe/collector/blade/BladePhpInspectionSuppressor.kt @@ -3,6 +3,8 @@ package dev.nybroe.collector.blade import com.intellij.codeInspection.InspectionSuppressor import com.intellij.codeInspection.SuppressQuickFix import com.intellij.psi.PsiElement +import com.jetbrains.php.blade.parser.BladeCompositeElement +import com.jetbrains.php.blade.psi.BladePsiDirective import com.jetbrains.php.blade.psi.BladePsiDirectiveParameter import com.jetbrains.php.blade.psi.BladePsiLanguageInjectionHost import com.jetbrains.php.blade.psi.BladePsiPhpBlock @@ -15,7 +17,7 @@ class BladePhpInspectionSuppressor : InspectionSuppressor { } override fun isSuppressedFor(element: PsiElement, toolId: String): Boolean { - if (element !is BladePsiLanguageInjectionHost) { + if (element !is BladeCompositeElement) { return false } diff --git a/src/main/kotlin/dev/nybroe/collector/inspections/ClosureToArrowFunctionInspection.kt b/src/main/kotlin/dev/nybroe/collector/inspections/ClosureToArrowFunctionInspection.kt index 5433330..f0eea0c 100644 --- a/src/main/kotlin/dev/nybroe/collector/inspections/ClosureToArrowFunctionInspection.kt +++ b/src/main/kotlin/dev/nybroe/collector/inspections/ClosureToArrowFunctionInspection.kt @@ -47,7 +47,7 @@ class ClosureToArrowFunctionInspection : PhpInspection() { // And closure is inside a collection. val methodReference = PhpPsiUtil - .getParentByCondition(closure, ParameterList.INSTANCEOF) + .getParentByCondition(closure, true, ParameterList.INSTANCEOF, null) ?.parent as? MethodReference ?: return if (!methodReference.isCollectionMethod) { diff --git a/src/test/resources/inspections/CollectFunctionInCollectionInspection/nonMatches/collect_on_no_type_variable.php b/src/test/resources/inspections/CollectFunctionInCollectionInspection/nonMatches/collect_on_no_type_variable.php index cc8215c..d60c064 100644 --- a/src/test/resources/inspections/CollectFunctionInCollectionInspection/nonMatches/collect_on_no_type_variable.php +++ b/src/test/resources/inspections/CollectFunctionInCollectionInspection/nonMatches/collect_on_no_type_variable.php @@ -2,4 +2,4 @@ function($variable) { collect($variable); -} +};