From 2657947007eecd4f16e18172d494fac0ea43ae3a Mon Sep 17 00:00:00 2001
From: GoldSubmarine <997462392@qq.com>
Date: Wed, 27 Jul 2022 02:39:31 +0800
Subject: [PATCH] Support IntelliJ IDEA 2022.2 and upgrade dependence (#21)

---
 CHANGELOG.md                                                | 6 +++++-
 build.gradle.kts                                            | 6 +++---
 gradle.properties                                           | 4 ++--
 gradle/wrapper/gradle-wrapper.properties                    | 2 +-
 .../contributor/KotlinRequestMappingContributor.kt          | 1 -
 5 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 95b6eef..98758dc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,8 +4,12 @@
 
 
 ## [Unreleased]
-## [0.2.6-stable]
 - Support IntelliJ IDEA 2022.2
+- Upgrade Java to 17
+- Remove deprecated api
+- Upgrade Gradle to 7.5
+- Upgrade org.jetbrains.intellij to 1.7.0
+- Upgrade org.jetbrains.changelog to 1.3.1
 
 ## [0.2.5-stable]
 - Support IntelliJ IDEA 2022.1
diff --git a/build.gradle.kts b/build.gradle.kts
index d839519..0223165 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -7,11 +7,11 @@ plugins {
     // Java support
     id("java")
     // Kotlin support
-    id("org.jetbrains.kotlin.jvm") version "1.6.20"
+    id("org.jetbrains.kotlin.jvm") version "1.7.10"
     // gradle-intellij-plugin - read more: https://github.com/JetBrains/gradle-intellij-plugin
-    id("org.jetbrains.intellij") version "1.5.2"
+    id("org.jetbrains.intellij") version "1.7.0"
     // gradle-changelog-plugin - read more: https://github.com/JetBrains/gradle-changelog-plugin
-    id("org.jetbrains.changelog") version "1.2.1"
+    id("org.jetbrains.changelog") version "1.3.1"
 }
 
 group = properties("pluginGroup")
diff --git a/gradle.properties b/gradle.properties
index 00b4df8..c9773af 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -24,9 +24,9 @@ platformDownloadSources = true
 platformPlugins = com.intellij.java, org.jetbrains.kotlin
 
 # Java language level used to compile sources and to generate the files for - Java 11 is required since 2020.3
-javaVersion = 11
+javaVersion = 17
 
-gradleVersion = 7.4.2
+gradleVersion = 7.5
 
 # Opt-out flag for bundling Kotlin standard library.
 # See https://plugins.jetbrains.com/docs/intellij/kotlin.html#kotlin-standard-library for details.
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index aa991fc..8049c68 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-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/kotlin/com/github/goldsubmarine/restfulhelper/contributor/KotlinRequestMappingContributor.kt b/src/main/kotlin/com/github/goldsubmarine/restfulhelper/contributor/KotlinRequestMappingContributor.kt
index d241b88..3b4cba7 100644
--- a/src/main/kotlin/com/github/goldsubmarine/restfulhelper/contributor/KotlinRequestMappingContributor.kt
+++ b/src/main/kotlin/com/github/goldsubmarine/restfulhelper/contributor/KotlinRequestMappingContributor.kt
@@ -10,7 +10,6 @@ class KotlinRequestMappingContributor : RequestMappingByNameContributor() {
 
     override fun getAnnotationSearchers(annotationName: String, project: Project): Sequence<PsiAnnotation> {
         return KotlinAnnotationsIndex
-            .getInstance()
             .get(annotationName, project, projectScope(project))
             .asSequence()
             .mapNotNull { it.toLightAnnotation() }