Skip to content

Commit c1662b8

Browse files
committed
Merge branch 'dev' into 2020.2
2 parents a856017 + 7cdb188 commit c1662b8

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

build.gradle.kts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,8 @@ tasks.withType<KotlinCompile>().configureEach {
153153

154154
tasks.withType<GroovyCompile>().configureEach {
155155
options.compilerArgs = listOf("-proc:none")
156+
sourceCompatibility = "1.5"
157+
targetCompatibility = "1.5"
156158
}
157159

158160
tasks.processResources {
@@ -167,7 +169,7 @@ tasks.processResources {
167169
exclude("fileTemplates/j2ee/**")
168170
from(fileTree("src/main/resources/fileTemplates/j2ee").files) {
169171
eachFile {
170-
this.relativePath = RelativePath(true, "fileTemplates", "j2ee", this.name)
172+
relativePath = RelativePath(true, "fileTemplates", "j2ee", this.name)
171173
}
172174
}
173175
}

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ kotlin.code.style=official
1414
ideaVersion = 2020.2
1515
ideaVersionName = 2020.2
1616

17-
coreVersion = 1.5.5
17+
coreVersion = 1.5.6
1818
downloadIdeaSources = true
1919

2020
pluginTomlVersion = 0.2.140.3644-202

readme.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Minecraft Development for IntelliJ
4040
</tr>
4141
</table>
4242

43-
Info and Documentation [![Current Release](https://img.shields.io/badge/release-1.5.5-orange.svg?style=flat-square)](https://plugins.jetbrains.com/plugin/8327)
43+
Info and Documentation [![Current Release](https://img.shields.io/badge/release-1.5.6-orange.svg?style=flat-square)](https://plugins.jetbrains.com/plugin/8327)
4444
----------------------
4545

4646
<a href="https://discord.gg/j6UNcfr"><img src="https://i.imgur.com/JXu9C1G.png" height="48px"></img></a>

0 commit comments

Comments
 (0)