Skip to content

Commit

Permalink
Support IntelliJ IDEA 2022.2 and upgrade dependence (#21)
Browse files Browse the repository at this point in the history
  • Loading branch information
Nayacco authored Jul 26, 2022
1 parent 7420320 commit 2657947
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 8 deletions.
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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() }
Expand Down

0 comments on commit 2657947

Please sign in to comment.