Prepares both plugins for 2024.1

LukWebsForge · Mar 30, 2024 · 26492ef · 26492ef
1 parent 7b7f2a0
commit 26492ef
Show file tree

Hide file tree

Showing 12 changed files with 31 additions and 13 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -27,7 +27,7 @@ jobs:
     - name: Set up JDK 20
       uses: actions/setup-java@v3
       with:
-        java-version: '20'
+        java-version: '21'
         distribution: 'temurin'
         # Cache Gradle files: https://github.com/actions/setup-java#caching-packages-dependencies
         cache: gradle

diff --git a/DiscordBeam/build.gradle.kts b/DiscordBeam/build.gradle.kts
@@ -1,6 +1,6 @@
 import org.jetbrains.changelog.markdownToHTML
 
-version = "1.20.7"
+version = "1.20.8"
 group = "de.lukweb.share"
 
 plugins {
@@ -21,7 +21,7 @@ java {
 
 dependencies {
     implementation(project(":ShareBase"))
-    implementation("com.squareup.okhttp3:okhttp:4.11.0")
+    implementation("com.squareup.okhttp3:okhttp:4.12.0")
 }
 
 intellij {
@@ -36,6 +36,9 @@ tasks {
     patchPluginXml {
         changeNotes.set(provider {
             """
+            1.20.8:
+            * Prepares for 2024.1 release
+                
             1.20.7:
             * Prepares for 2023.2 release
 

diff --git a/DiscordBeam/src/main/java/de/lukweb/discordbeam/DiscordMenu.java b/DiscordBeam/src/main/java/de/lukweb/discordbeam/DiscordMenu.java
@@ -1,5 +1,6 @@
 package de.lukweb.discordbeam;
 
+import com.intellij.openapi.actionSystem.ActionUpdateThread;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.application.ReadAction;
@@ -8,6 +9,7 @@
 import de.lukweb.discordbeam.uploaders.*;
 import de.lukweb.share.ShareMenu;
 import de.lukweb.share.ShareResult;
+import org.jetbrains.annotations.NotNull;
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -166,4 +168,9 @@ private boolean checkFileSizeLimit(long fileLength) {
 
         return true;
     }
+
+    @Override
+    public @NotNull ActionUpdateThread getActionUpdateThread() {
+        return ActionUpdateThread.BGT;
+    }
 }
diff --git a/DiscordBeam/src/main/java/de/lukweb/discordbeam/DiscordSettingsPage.java b/DiscordBeam/src/main/java/de/lukweb/discordbeam/DiscordSettingsPage.java
@@ -1,7 +1,6 @@
 package de.lukweb.discordbeam;
 
 import com.intellij.openapi.Disposable;
-import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.options.Configurable;
 import com.intellij.openapi.options.ConfigurationException;
 import com.intellij.openapi.options.SearchableConfigurable;

diff --git a/DiscordBeam/src/main/java/de/lukweb/discordbeam/uploaders/GistUploaderImpl.java b/DiscordBeam/src/main/java/de/lukweb/discordbeam/uploaders/GistUploaderImpl.java
@@ -20,7 +20,7 @@
 public class GistUploaderImpl implements GistUploader {
 
     public boolean isGithubConfigured() {
-        return GHAccountsUtil.getAccounts().size() > 0;
+        return !GHAccountsUtil.getAccounts().isEmpty();
     }
 
     public String shareGist(Project project, String fileName, String content) throws IOException {

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="232"/>
+    <idea-version since-build="241"/>
 
     <!-- Depends on 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.kts b/HasteIt/build.gradle.kts
@@ -1,6 +1,6 @@
 import org.jetbrains.changelog.markdownToHTML
 
-version = "1.20.7"
+version = "1.20.8"
 group = "de.lukweb.share"
 
 plugins {
@@ -36,6 +36,9 @@ tasks {
     patchPluginXml {
         changeNotes.set(provider {
             """
+            1.20.8:
+            * Prepares for 2024.1 release
+                
             1.20.7:
             * Prepares for 2023.2 release
             * Implements a new setting to provide an API key for hastebin

diff --git a/HasteIt/src/main/java/de/lukweb/hasteit/HasteMenu.java b/HasteIt/src/main/java/de/lukweb/hasteit/HasteMenu.java
@@ -3,10 +3,12 @@
 import com.intellij.notification.Notification;
 import com.intellij.notification.NotificationAction;
 import com.intellij.notification.NotificationType;
+import com.intellij.openapi.actionSystem.ActionUpdateThread;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
 import de.lukweb.share.ShareMenu;
+import org.jetbrains.annotations.NotNull;
 
 import java.awt.*;
 import java.awt.datatransfer.Clipboard;
@@ -76,4 +78,8 @@ private void copyToClipboard(String text) {
         clipboard.setContents(selection, selection);
     }
 
+    @Override
+    public @NotNull ActionUpdateThread getActionUpdateThread() {
+        return ActionUpdateThread.BGT;
+    }
 }
diff --git a/HasteIt/src/main/resources/META-INF/plugin.xml b/HasteIt/src/main/resources/META-INF/plugin.xml
@@ -8,15 +8,15 @@
     ]]></description>
 
     <!-- Full list of IntelliJ IDEA releases: https://www.jetbrains.com/intellij-repository/releases -->
-    <idea-version since-build="232"/>
+    <idea-version since-build="241"/>
 
-    <!-- Depends tag for compatibility wih all products:
+    <!-- Depends on tag for compatibility wih all products:
          http://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/plugin_compatibility.html -->
     <depends>com.intellij.modules.platform</depends>
 
     <extensions defaultExtensionNs="com.intellij">
         <!-- Add your extensions here -->
-        <projectConfigurable groupId="tools" instance="de.lukweb.hasteit.HasteSettingsPage"/>
+        <projectConfigurable displayName="Haste It" groupId="tools" instance="de.lukweb.hasteit.HasteSettingsPage"/>
         <applicationService serviceImplementation="de.lukweb.hasteit.HasteSettings"/>
         <applicationService serviceImplementation="de.lukweb.hasteit.HasteUploader"/>
         <notificationGroup id="Haste It" displayType="BALLOON" isLogByDefault="false"/>

diff --git a/ShareBase/build.gradle.kts b/ShareBase/build.gradle.kts
@@ -17,7 +17,7 @@ java {
 }
 
 dependencies {
-    compileOnly("org.jetbrains:annotations:24.0.1")
+    compileOnly("org.jetbrains:annotations:24.1.0")
 }
 
 intellij {

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id("org.jetbrains.intellij") version "1.15.0" apply false
+    id("org.jetbrains.intellij") version "1.17.3" apply false
     id("org.jetbrains.changelog") version "2.2.0" apply false
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
 # 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/
-idea.version=2023.2.1
+idea.version=2024.1