18.0.0

UniFormal · Sep 4, 2019 · cac36b4 · cac36b4
1 parent 0c5e52b
commit cac36b4
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/build.gradle b/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id 'java'
-    id 'org.jetbrains.intellij' version '0.4.7'
-    id "org.jetbrains.grammarkit" version "2018.3.1"
+    id 'org.jetbrains.intellij' version '0.4.10'
+    id "org.jetbrains.grammarkit" version "2019.2.1"
 }
 sourceCompatibility = 1.8
 
@@ -35,9 +35,9 @@ dependencies {
 
 apply plugin: 'org.jetbrains.intellij'
 intellij {
-    version '2019.1'
+    version '2019.2.+'
     pluginName 'MMT'
-    plugins 'org.intellij.scala:2019.1.3'
+    plugins 'org.intellij.scala:2019.2.13','java'
 }
 group 'info.kwarc.mmt.intellij'
 version '18.0.1'
@@ -46,6 +46,8 @@ patchPluginXml {
         <ul>
 	     <li>Fixed Grammar somewhat</li>
          <li>Highlighting for URI literals</li>
+         <li>Compatible with MMT 18.0.0</li>
+         <li>Compatible with Intellij 2019.2</li>
         </ul>
       """
 }
@@ -79,9 +81,8 @@ idea {
 
 apply from: "gradle.properties"
 publishPlugin {
-    channels 'devel'
-    username intellijPublishUsername
-    password intellijPublishPassword
+    // channels 'devel'
+    token intellijPublishToken
 }
 
 /*

diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -38,4 +38,5 @@
 
     </actions>
     <depends>org.intellij.scala</depends>
+    <depends>com.intellij.modules.java</depends>
 </idea-plugin>
diff --git a/src/main/scala/info/kwarc/mmt/intellij/Plugin.scala b/src/main/scala/info/kwarc/mmt/intellij/Plugin.scala
@@ -27,7 +27,7 @@ import javax.swing.Icon
 import scala.util.Try
 
 object MMT {
-  val requiredVersion = Version("15.0.0")
+  val requiredVersion = Version("18.0.0")
 
   lazy val icon: Icon = IconLoader.getIcon("/img/icon.png")
 

diff --git a/src/main/scala/info/kwarc/mmt/intellij/ui/ProjectView.scala b/src/main/scala/info/kwarc/mmt/intellij/ui/ProjectView.scala
@@ -69,7 +69,8 @@ class MathHubTreeNode(project : Project) extends AbstractTreeNode[Project](proje
           val helper = ProjectViewDirectoryHelper.getInstance(project)
           helper.createFileAndDirectoryNodes(List(toVF(mmt.mmtrc), toVF(mmt.msl), toVF(mmt.logfile)), viewSettings) ::: ls
         }
-      case _ => Nil.asInstanceOf[List[AbstractTreeNode[_]]]
+      case _ =>
+        Nil.asInstanceOf[List[AbstractTreeNode[_]]]
     }
   }
   override def update(presentation: PresentationData): Unit = {