Skip to content

Commit d643f04

Browse files
committed
Update for 172-EAP-SNAPSHOT
1 parent 2b87bc9 commit d643f04

File tree

4 files changed

+8
-2
lines changed

4 files changed

+8
-2
lines changed

gradle.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# MIT License
99
#
1010
# suppress inspection "UnusedProperty" for whole file
11-
ideaVersion = 172.1909-EAP-CANDIDATE-SNAPSHOT
11+
ideaVersion = 172-EAP-SNAPSHOT
1212
javaVersion = 1.8
1313
kotlinVersion = 1.1.1
1414

@@ -17,3 +17,4 @@ version = 2017.2-0.7.3
1717
downloadIdeaSources = true
1818

1919
org.gradle.script.lang.kotlin.accessors.auto=true
20+
G

src/main/kotlin/com/demonwav/mcdev/buildsystem/gradle/GradleBuildSystem.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ class GradleBuildSystem : BuildSystem() {
205205

206206
try {
207207
val sdkPair = ExternalSystemJdkUtil.getAvailableJdk(project)
208-
if (sdkPair?.second?.homePath != null && ExternalSystemJdkUtil.USE_INTERNAL_JAVA != sdkPair.first) {
208+
if (sdkPair.second?.homePath != null && ExternalSystemJdkUtil.USE_INTERNAL_JAVA != sdkPair.first) {
209209
launcher.setJavaHome(File(sdkPair.second.homePath))
210210
}
211211

src/main/kotlin/com/demonwav/mcdev/facet/MinecraftFacetDetector.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ class MinecraftFacetDetector(project: Project) : AbstractProjectComponent(projec
3535
val connection = project.messageBus.connect()
3636

3737
for (module in ModuleManager.getInstance(project).modules) {
38+
// This only exists for legacy reasons, hence why we are removing the option, so suppress deprecation
39+
@Suppress("DEPRECATION")
3840
module.clearOption(MinecraftModuleType.OPTION)
3941
}
4042

src/main/kotlin/com/demonwav/mcdev/transition/TransitionProjectComponent.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ class TransitionProjectComponent(project: Project) : AbstractProjectComponent(pr
2222
// Reset all Modules back to JavaModuleType
2323
for (module in ModuleManager.getInstance(project).modules) {
2424
for (type in types) {
25+
// This only exists for legacy reasons, to reset the type option (previous versions used to set it).
26+
// It's not actually used anymore, so suppress deprecation
27+
@Suppress("DEPRECATION")
2528
if (module.getOptionValue("type") == type) {
2629
module.setOption("type", JavaModuleType.getModuleType().id)
2730
}

0 commit comments

Comments
 (0)