Prepares for the 2020.1 IDEA release

LukWebsForge · Apr 7, 2020 · 0bdac35 · 0bdac35
1 parent 8b37d48
commit 0bdac35
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 14 deletions.
diff --git a/DiscordBeam/build.gradle b/DiscordBeam/build.gradle
@@ -6,7 +6,7 @@ dependencies {
 }
 
 intellij {
-    // Comment the line below to test with IntelliJ 2019.3
+    // Comment the line below to test with the latest snapshot
     // version 'LATEST-EAP-SNAPSHOT'
     updateSinceUntilBuild false
     pluginName 'DiscordBeam'
@@ -15,6 +15,6 @@ intellij {
 
 patchPluginXml {
     changeNotes """
-     1.05: Update for 2020.1 
+     1.05: Prepares for IDEA version 2020.1 
      """
 }
diff --git a/DiscordBeam/src/main/java/de/lukweb/discordbeam/ui/WebhookValidator.java b/DiscordBeam/src/main/java/de/lukweb/discordbeam/ui/WebhookValidator.java
@@ -43,7 +43,7 @@ public static void installOn(Disposable disposable, JTextComponent textComponent
         WebhookValidator validator = new WebhookValidator(textComponent);
 
         new ComponentValidator(disposable)
-                .withValidator(v -> v.updateInfo(validator.validate()))
+                .withValidator(validator::validate)
                 .andStartOnFocusLost()
                 .installOn(textComponent);
 

diff --git a/DiscordBeam/src/main/java/de/lukweb/discordbeam/uploaders/HastebinUploader.java b/DiscordBeam/src/main/java/de/lukweb/discordbeam/uploaders/HastebinUploader.java
@@ -17,7 +17,6 @@ static HastebinServiceStatus works() {
                 return HastebinServiceStatus.OUTDATED;
             }
         } catch (ClassNotFoundException ex) {
-            ex.printStackTrace();
             return HastebinServiceStatus.NOT_INSTALLED;
         }
     }

diff --git a/DiscordBeam/src/main/resources/META-INF/plugin.xml b/DiscordBeam/src/main/resources/META-INF/plugin.xml
@@ -8,7 +8,7 @@
     ]]></description>
 
     <!-- Full list of IntelliJ IDEA releases: https://www.jetbrains.com/intellij-repository/releases -->
-    <idea-version since-build="193.4099"/>
+    <idea-version since-build="201"/>
 
     <!-- Depends tag for compatibility wih all products:
          http://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/plugin_compatibility.html -->

diff --git a/HasteIt/build.gradle b/HasteIt/build.gradle
@@ -1,6 +1,8 @@
-version '1.12'
+version '1.13'
 
 intellij {
+    // Comment the line below to test with the latest snapshot
+    // version 'LATEST-EAP-SNAPSHOT'
     pluginName 'HasteIt'
 }
 
@@ -10,8 +12,6 @@ dependencies {
 
 patchPluginXml {
     changeNotes """
-      <ul>
-      <li>HasteIt now works with <a href="https://plugins.jetbrains.com/plugin/12804-discordbeam">DiscordBeam</a></li>
-      </ul>
+      1.13: Prepares for IDEA version 2020.1 
       """
-}
+}
diff --git a/HasteIt/src/main/java/de/lukweb/hasteit/HasteUploader.java b/HasteIt/src/main/java/de/lukweb/hasteit/HasteUploader.java
@@ -43,7 +43,7 @@ public void upload(String content, String extension, HasteResult result) {
             in.close();
 
             // Get the id of the haste
-            JsonElement json = new JsonParser().parse(response.toString());
+            JsonElement json = JsonParser.parseString(response.toString());
             if (!json.isJsonObject()) {
                 throw new IOException("Can't parse JSON");
             }

diff --git a/HasteIt/src/main/resources/META-INF/plugin.xml b/HasteIt/src/main/resources/META-INF/plugin.xml
@@ -9,7 +9,7 @@
     ]]></description>
 
     <!-- Full list of IntelliJ IDEA releases: https://www.jetbrains.com/intellij-repository/releases -->
-    <idea-version since-build="183.4284.148"/>
+    <idea-version since-build="201"/>
 
     <!-- Depends tag for compatibility wih all products:
          http://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/plugin_compatibility.html -->
@@ -31,4 +31,4 @@
         </action>
     </actions>
 
-</idea-plugin>
+</idea-plugin>
diff --git a/build.gradle b/build.gradle
@@ -27,7 +27,7 @@ subprojects {
         // https://www.jetbrains.org/intellij/sdk/docs/reference_guide/intellij_artifacts.html
         // Full list of IntelliJ IDEA releases: https://www.jetbrains.com/intellij-repository/releases
         // Full list of IntelliJ IDEA snapshots: https://www.jetbrains.com/intellij-repository/snapshots/
-        version '2019.3'
+        version '201-EAP-SNAPSHOT'
         // Disables updating until-build attribute in plugin.xml
         updateSinceUntilBuild false
     }