Support for 2018.1

Author: DenWav

gradle.properties

@@ -8,10 +8,10 @@
 # MIT License
 #
 # suppress inspection "UnusedProperty" for whole file
-ideaVersion = 2017.3.2
+ideaVersion = 181-SNAPSHOT
 javaVersion = 1.8
 kotlinVersion = 1.2.10
 
 group = com.demonwav.minecraft-dev
-version = 2017.3-1.0.0
+version = 2018.1-1.0.0
 downloadIdeaSources = true

readme.md

@@ -10,7 +10,7 @@ Minecraft Development for IntelliJ
 |**CircleCI**|[![Travis Build Status](https://img.shields.io/circleci/project/github/minecraft-dev/MinecraftDev/dev.svg?style=flat-square)](https://circleci.com/gh/minecraft-dev/MinecraftDev)|
 | **Travis** |[![CircleCI Build Status](https://img.shields.io/travis/minecraft-dev/MinecraftDev/dev.svg?style=flat-square)](https://travis-ci.org/minecraft-dev/MinecraftDev/)|
 
-Info and Documentation [![Current Release](https://img.shields.io/badge/release-2017.3--1.0.0-orange.svg?style=flat-square)](https://plugins.jetbrains.com/plugin/8327)
+Info and Documentation [![Current Release](https://img.shields.io/badge/release-2018.1--1.0.0-orange.svg?style=flat-square)](https://plugins.jetbrains.com/plugin/8327)
 ----------------------
 
 Visit [https://minecraftdev.org](https://minecraftdev.org) for information about the project, change logs, features, FAQs, and chat.

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

@@ -13,11 +13,10 @@ package com.demonwav.mcdev.facet
 import com.demonwav.mcdev.platform.PlatformType
 import com.intellij.facet.FacetConfiguration
 import com.intellij.facet.ui.FacetEditorContext
-import com.intellij.facet.ui.FacetEditorTab
 import com.intellij.facet.ui.FacetValidatorsManager
 import com.intellij.openapi.components.PersistentStateComponent
-import com.intellij.util.xmlb.annotations.AbstractCollection
 import com.intellij.util.xmlb.annotations.Tag
+import com.intellij.util.xmlb.annotations.XCollection
 import org.jdom.Element
 
 class MinecraftFacetConfiguration : FacetConfiguration, PersistentStateComponent<MinecraftFacetConfigurationData> {
@@ -33,15 +32,15 @@ class MinecraftFacetConfiguration : FacetConfiguration, PersistentStateComponent
         this.state = state
     }
 
-    override fun readExternal(element: Element?) {}
-    override fun writeExternal(element: Element?) {}
+    @Suppress("OverridingDeprecatedMember") override fun readExternal(element: Element?) {}
+    @Suppress("OverridingDeprecatedMember") override fun writeExternal(element: Element?) {}
 }
 
 data class MinecraftFacetConfigurationData(
     @Tag("userChosenTypes")
     var userChosenTypes: MutableMap<PlatformType, Boolean> = mutableMapOf(),
     @Tag("autoDetectTypes")
-    @AbstractCollection(surroundWithTag = false, elementTag = "platformType", elementValueAttribute = "")
+    @XCollection(elementName = "platformType", valueAttributeName = "", style = XCollection.Style.v2)
     var autoDetectTypes: MutableSet<PlatformType> = mutableSetOf(),
     @Tag("forgePatcher")
     var forgePatcher: Boolean = false

src/main/kotlin/com/demonwav/mcdev/platform/mixin/action/GenerateShadowAction.kt

@@ -19,6 +19,7 @@ import com.demonwav.mcdev.util.findLastChild
 import com.demonwav.mcdev.util.findNextMember
 import com.demonwav.mcdev.util.ifEmpty
 import com.demonwav.mcdev.util.toTypedArray
+import com.intellij.application.options.CodeStyle
 import com.intellij.codeInsight.generation.GenerateMembersUtil
 import com.intellij.codeInsight.generation.GenerationInfo
 import com.intellij.codeInsight.generation.OverrideImplementUtil
@@ -45,8 +46,7 @@ import com.intellij.psi.PsiModifier
 import com.intellij.psi.PsiModifierList
 import com.intellij.psi.PsiModifierListOwner
 import com.intellij.psi.PsiSubstitutor
-import com.intellij.psi.codeStyle.CodeStyleSettings
-import com.intellij.psi.codeStyle.CodeStyleSettingsManager
+import com.intellij.psi.codeStyle.CommonCodeStyleSettings
 import java.util.stream.Stream
 import kotlin.streams.toList
 
@@ -207,11 +207,11 @@ private fun copyAnnotation(modifiers: PsiModifierList, newModifiers: PsiModifier
 }
 
 inline fun disableAnnotationWrapping(project: Project, func: () -> Unit) {
-    val settings = CodeStyleSettingsManager.getSettings(project).getCommonSettings(JavaLanguage.INSTANCE)
+    val settings = CodeStyle.getSettings(project).getCommonSettings(JavaLanguage.INSTANCE)
     val methodWrap = settings.METHOD_ANNOTATION_WRAP
     val fieldWrap = settings.FIELD_ANNOTATION_WRAP
-    settings.METHOD_ANNOTATION_WRAP = CodeStyleSettings.DO_NOT_WRAP
-    settings.FIELD_ANNOTATION_WRAP = CodeStyleSettings.DO_NOT_WRAP
+    settings.METHOD_ANNOTATION_WRAP = CommonCodeStyleSettings.DO_NOT_WRAP
+    settings.FIELD_ANNOTATION_WRAP = CommonCodeStyleSettings.DO_NOT_WRAP
 
     try {
         func()

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

@@ -28,13 +28,13 @@
       <div>
         Please report issues to <a href="https://github.com/minecraft-dev/MinecraftDev/issues">the issue tracker</a>!
         <p>
-        v. 2017.3-1.0.0
+        v. 2018.1-1.0.0
       </div>
     ]]>
     </change-notes>
 
     <!-- please see https://confluence.jetbrains.com/display/IDEADEV/Build+Number+Ranges for description -->
-    <idea-version since-build="173" until-build="173.*"/>
+    <idea-version since-build="181" until-build="181.*"/>
 
     <extensions defaultExtensionNs="com.intellij">
         <!-- This is grouped in the following order EXCEPT for localInspections and moduleTypes. All localInspections are grouped at the