From bc85b531eeee96d3b5a7dff93ffb50a06f65560b Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Fri, 1 Jun 2018 16:17:41 +0300 Subject: [PATCH] Include jre -> jdk library replacement to cleanup --- .../gradle/DeprecatedGradleDependencyInspection.kt | 3 ++- .../maven/inspections/DeprecatedMavenDependencyInspection.kt | 5 ++++- idea/src/META-INF/gradle-java.xml | 1 + idea/src/META-INF/gradle-java.xml.as33 | 1 + idea/src/META-INF/gradle-java.xml.as34 | 1 + idea/src/META-INF/gradle.xml.173 | 1 + idea/src/META-INF/gradle.xml.181 | 1 + idea/src/META-INF/maven.xml | 1 + 8 files changed, 12 insertions(+), 2 deletions(-) diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/inspections/gradle/DeprecatedGradleDependencyInspection.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/inspections/gradle/DeprecatedGradleDependencyInspection.kt index c7359c0f367..0ce5ca3c0f0 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/inspections/gradle/DeprecatedGradleDependencyInspection.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/inspections/gradle/DeprecatedGradleDependencyInspection.kt @@ -16,6 +16,7 @@ package org.jetbrains.kotlin.idea.inspections.gradle +import com.intellij.codeInspection.CleanupLocalInspectionTool import com.intellij.codeInspection.ProblemHighlightType import com.intellij.openapi.roots.ModuleRootManager import com.intellij.openapi.roots.ProjectRootManager @@ -39,7 +40,7 @@ import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.path.GrC private val LibInfo.gradleMarker get() = "$groupId:$name" -class DeprecatedGradleDependencyInspection : GradleBaseInspection() { +class DeprecatedGradleDependencyInspection : GradleBaseInspection(), CleanupLocalInspectionTool { override fun buildVisitor(): BaseInspectionVisitor = DependencyFinder() private open class DependencyFinder : KotlinGradleInspectionVisitor() { diff --git a/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/inspections/DeprecatedMavenDependencyInspection.kt b/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/inspections/DeprecatedMavenDependencyInspection.kt index 67b493e46ea..32c64026dca 100644 --- a/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/inspections/DeprecatedMavenDependencyInspection.kt +++ b/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/inspections/DeprecatedMavenDependencyInspection.kt @@ -16,6 +16,7 @@ package org.jetbrains.kotlin.idea.maven.inspections +import com.intellij.codeInspection.CleanupLocalInspectionTool import com.intellij.codeInspection.ProblemHighlightType import com.intellij.util.text.VersionComparatorUtil import com.intellij.util.xml.DomFileElement @@ -29,7 +30,9 @@ import org.jetbrains.kotlin.idea.maven.PomFile import org.jetbrains.kotlin.idea.maven.findDependencies import org.jetbrains.kotlin.idea.versions.DEPRECATED_LIBRARIES_INFORMATION -class DeprecatedMavenDependencyInspection : DomElementsInspection(MavenDomProjectModel::class.java) { +class DeprecatedMavenDependencyInspection : + DomElementsInspection(MavenDomProjectModel::class.java), CleanupLocalInspectionTool { + override fun checkFileElement(domFileElement: DomFileElement?, holder: DomElementAnnotationHolder?) { if (domFileElement == null || holder == null) return diff --git a/idea/src/META-INF/gradle-java.xml b/idea/src/META-INF/gradle-java.xml index 7b6e8877a91..5d00c7496f9 100644 --- a/idea/src/META-INF/gradle-java.xml +++ b/idea/src/META-INF/gradle-java.xml @@ -46,6 +46,7 @@ displayName="Deprecated library is used in Gradle" groupName="Kotlin" enabledByDefault="true" + cleanupTool="true" language="Groovy" hasStaticDescription="true" level="WARNING"/> diff --git a/idea/src/META-INF/gradle-java.xml.as33 b/idea/src/META-INF/gradle-java.xml.as33 index f6fb58a1c94..2e971b9767d 100644 --- a/idea/src/META-INF/gradle-java.xml.as33 +++ b/idea/src/META-INF/gradle-java.xml.as33 @@ -45,6 +45,7 @@ displayName="Deprecated library is used in Gradle" groupName="Kotlin" enabledByDefault="true" + cleanupTool="true" language="Groovy" hasStaticDescription="true" level="WARNING"/> diff --git a/idea/src/META-INF/gradle-java.xml.as34 b/idea/src/META-INF/gradle-java.xml.as34 index f6fb58a1c94..2e971b9767d 100644 --- a/idea/src/META-INF/gradle-java.xml.as34 +++ b/idea/src/META-INF/gradle-java.xml.as34 @@ -45,6 +45,7 @@ displayName="Deprecated library is used in Gradle" groupName="Kotlin" enabledByDefault="true" + cleanupTool="true" language="Groovy" hasStaticDescription="true" level="WARNING"/> diff --git a/idea/src/META-INF/gradle.xml.173 b/idea/src/META-INF/gradle.xml.173 index d0abb8db199..eef578d0514 100644 --- a/idea/src/META-INF/gradle.xml.173 +++ b/idea/src/META-INF/gradle.xml.173 @@ -54,6 +54,7 @@ displayName="Deprecated library is used in Gradle" groupName="Kotlin" enabledByDefault="true" + cleanupTool="true" language="Groovy" hasStaticDescription="true" level="WARNING"/> diff --git a/idea/src/META-INF/gradle.xml.181 b/idea/src/META-INF/gradle.xml.181 index dc97d6b44b2..0cd688421d0 100644 --- a/idea/src/META-INF/gradle.xml.181 +++ b/idea/src/META-INF/gradle.xml.181 @@ -54,6 +54,7 @@ displayName="Deprecated library is used in Gradle" groupName="Kotlin" enabledByDefault="true" + cleanupTool="true" language="Groovy" hasStaticDescription="true" level="WARNING"/> diff --git a/idea/src/META-INF/maven.xml b/idea/src/META-INF/maven.xml index ff90e776ce7..0ff06dae300 100644 --- a/idea/src/META-INF/maven.xml +++ b/idea/src/META-INF/maven.xml @@ -83,6 +83,7 @@ displayName="Deprecated library is used in Maven" groupName="Kotlin" enabledByDefault="true" + cleanupTool="true" language="XML" hasStaticDescription="true" level="WARNING" />