Skip to content

Commit 4486da2

Browse files
committed
Fixed compatibility issue with 2021.2+
1 parent 11093fb commit 4486da2

File tree

4 files changed

+8
-12
lines changed

4 files changed

+8
-12
lines changed

build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ project(":") {
4242
version = ideaVersion
4343
downloadSources = downloadIdeaSources.toBoolean()
4444
updateSinceUntilBuild = false
45-
setPlugins("Spring", "java-i18n", "properties"/*, "java"*/)
45+
setPlugins("Spring", "java-i18n", "properties", "java")
4646

4747
tasks.withType<PublishTask> {
4848
username(publishUsername)

gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
org.gradle.jvmargs=-Xmx2G
22

3-
ideaVersion=IU-2018.3
3+
ideaVersion=IU-2021.2
44
kotlin.incremental=true
55
buildNumber=SNAPSHOT
66
downloadIdeaSources=true

src/main/kotlin/com/github/bjansen/intellij/pebble/ext/SpringExtension.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import com.intellij.psi.*
1919
import com.intellij.psi.PsiElementResolveResult.createResults
2020
import com.intellij.psi.search.GlobalSearchScope
2121
import com.intellij.psi.util.PsiTypesUtil
22+
import com.intellij.spring.SpringApiIcons
2223
import com.intellij.spring.SpringManager
2324
import com.intellij.spring.contexts.model.SpringModel
2425
import com.intellij.spring.model.CommonSpringBean
@@ -28,7 +29,6 @@ import com.intellij.spring.model.pom.SpringBeanPomTargetUtils
2829
import com.intellij.spring.model.utils.SpringModelSearchers
2930
import com.intellij.spring.model.xml.AbstractDomSpringBean
3031
import com.intellij.util.ProcessingContext
31-
import icons.SpringApiIcons
3232

3333
object SpringExtension {
3434
private val key = Key.create<PsiClass>("PEBBLE_SPRING_CLASS")

src/main/resources/META-INF/plugin.xml

+5-9
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,24 @@
11
<idea-plugin>
22
<id>com.github.bjansen.intellij.pebble</id>
33
<name>Pebble</name>
4-
<version>0.9</version>
4+
<version>0.9.1</version>
55
<vendor url="https://github.com/bjansen">Bastien Jansen</vendor>
66

77
<description><![CDATA[
88
Support for the Pebble templating engine.
99
]]></description>
1010

1111
<change-notes><![CDATA[
12-
<b>v0.9</b>
12+
<b>v0.9.1</b>
1313
<ul>
14-
<li>Fixed many bugs related to the formatter, that appeared in 2020.3 (#58, #69, #71, #74, #75)</li>
15-
<li>Use double quotes by default in live templates (<a href="https://github.com/bjansen/pebble-intellij/issues/66">#66</a>)</li>
16-
<li>Support Scala iterables in `for` loops (<a href="https://github.com/bjansen/pebble-intellij/issues/73">#73</a>)</li>
17-
<li>Support new identifier pattern (<a href="https://github.com/bjansen/pebble-intellij/issues/63">#63</a>)</li>
18-
<li>Support `import ... as ...` (<a href="https://github.com/bjansen/pebble-intellij/issues/52">#52</a>)</li>
14+
<li>Fixed compatibility with IDEA 2021.2+</li>
1915
</ul>
2016
2117
Full changelog at https://github.com/bjansen/pebble-intellij/milestone/9?closed=1
2218
]]></change-notes>
2319

24-
<!-- IDEA 2017.3 and later -->
25-
<idea-version since-build="173.0"/>
20+
<!-- IDEA 2021.2 and later -->
21+
<idea-version since-build="212.0"/>
2622

2723
<depends>com.intellij.modules.lang</depends>
2824
<depends>com.intellij.modules.java</depends>

0 commit comments

Comments
 (0)