diff --git a/build.gradle b/build.gradle
deleted file mode 100644
index 38f43c1..0000000
--- a/build.gradle
+++ /dev/null
@@ -1,61 +0,0 @@
-plugins {
- // Java support
- id "java"
- // Kotlin support
- id "org.jetbrains.kotlin.jvm" version "1.4.32"
- id 'org.jetbrains.intellij' version '0.7.2'
-}
-sourceCompatibility = JavaVersion.VERSION_1_10
-targetCompatibility = JavaVersion.VERSION_1_10
-
-repositories {
-// mavenCentral()
- maven {
- url 'https://maven.aliyun.com/repository/public/'
- }
- mavenLocal()
- mavenCentral()
-}
-
-dependencies {
- testCompile group: 'junit', name: 'junit', version: '4.12'
-
- //noinspection SpellCheckingInspection
- implementation('cn.hutool:hutool-all:5.7.16')
-
- implementation('org.dom4j:dom4j:2.1.3')
-}
-
-intellij {
- updateSinceUntilBuild false
- type 'IC'
-// version '2020.2'
- version 'LATEST-EAP-SNAPSHOT'
-// version '2021.2'
- pluginName 'RestfulTool'
-
- plugins = ['java', 'properties', 'yaml', 'Kotlin']
-}
-
-publishPlugin {
- // 发布插件,token在`https://plugins.jetbrains.com/author/me/tokens`申请
- token System.getenv("IdeaToken")
- // channels 'beta'
- channels 'stable'
-}
-
-group 'cn.cloud.auto.restful.tool'
-version '1.4.5'
-patchPluginXml {
- changeNotes """
-
- """
-}
-
-//编译JAVA文件时采用UTF-8
-//noinspection GroovyAssignabilityCheck
-tasks.withType(JavaCompile) {
- options.encoding = "UTF-8"
-}
diff --git a/build.gradle.kts b/build.gradle.kts
new file mode 100644
index 0000000..d5323c7
--- /dev/null
+++ b/build.gradle.kts
@@ -0,0 +1,58 @@
+plugins {
+ id("java")
+ id("org.jetbrains.kotlin.jvm") version "2.0.20"
+ id("org.jetbrains.intellij") version "1.17.4"
+}
+
+dependencies {
+ implementation("cn.hutool:hutool-all:5.8.18")
+ implementation("org.dom4j:dom4j:2.1.4")
+}
+
+group = "cn.cloud.auto.restful.tool"
+version = "1.5.2"
+
+repositories {
+ mavenLocal()
+ maven("https://maven.aliyun.com/nexus/content/repositories/central/")
+ mavenCentral()
+}
+
+java {
+ sourceCompatibility = JavaVersion.VERSION_17
+}
+
+intellij {
+ updateSinceUntilBuild.set(true)
+ version.set("2023.3.7")
+ type.set("IC") // Target IDE Platform
+ pluginName.set("RestfulTool")
+ plugins.set(listOf("java","properties","yaml","Kotlin"))
+
+}
+
+
+tasks {
+ // Set the JVM compatibility versions
+ withType {
+ sourceCompatibility = "17"
+ targetCompatibility = "17"
+ }
+
+ patchPluginXml {
+ // 最低版本
+ sinceBuild.set("233")
+ // 最高版本
+ untilBuild.set("242.*")
+ }
+
+ signPlugin {
+ certificateChain.set(System.getenv("CERTIFICATE_CHAIN"))
+ privateKey.set(System.getenv("PRIVATE_KEY"))
+ password.set(System.getenv("PRIVATE_KEY_PASSWORD"))
+ }
+
+ publishPlugin {
+ token.set(System.getenv("PUBLISH_TOKEN"))
+ }
+}
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..e4a5f61
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,7 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
deleted file mode 100644
index 6dc6e0e..0000000
--- a/settings.gradle
+++ /dev/null
@@ -1,2 +0,0 @@
-rootProject.name = 'RestfulTool'
-
diff --git a/settings.gradle.kts b/settings.gradle.kts
new file mode 100644
index 0000000..a574476
--- /dev/null
+++ b/settings.gradle.kts
@@ -0,0 +1,2 @@
+rootProject.name = "RestfulTool"
+
diff --git a/src/main/java/com/github/restful/tool/actions/WithLibraryAction.java b/src/main/java/com/github/restful/tool/actions/WithLibraryAction.java
index 36c23c7..876ba9f 100644
--- a/src/main/java/com/github/restful/tool/actions/WithLibraryAction.java
+++ b/src/main/java/com/github/restful/tool/actions/WithLibraryAction.java
@@ -15,6 +15,7 @@
import com.github.restful.tool.view.window.WindowFactory;
import com.github.restful.tool.view.window.frame.Window;
import com.intellij.icons.AllIcons;
+import com.intellij.openapi.actionSystem.ActionUpdateThread;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.CommonDataKeys;
import com.intellij.openapi.actionSystem.ToggleAction;
@@ -38,6 +39,10 @@ public WithLibraryAction() {
@Override
public boolean isSelected(@NotNull AnActionEvent e) {
+ Project data = e.getData(CommonDataKeys.PROJECT);
+ if (null == data) {
+ return false;
+ }
return Storage.scanServiceWithLibrary(e.getRequiredData(CommonDataKeys.PROJECT));
}
@@ -59,4 +64,10 @@ private Window getToolWindow(@Nullable Project project) {
}
return (toolWindow = WindowFactory.getToolWindow(project));
}
+
+ @Override
+ public @NotNull ActionUpdateThread getActionUpdateThread() {
+ return ActionUpdateThread.EDT;
+ }
+
}
diff --git a/src/main/java/com/github/restful/tool/service/ToolWindowService.java b/src/main/java/com/github/restful/tool/service/ToolWindowService.java
index e6509aa..4767dda 100644
--- a/src/main/java/com/github/restful/tool/service/ToolWindowService.java
+++ b/src/main/java/com/github/restful/tool/service/ToolWindowService.java
@@ -37,7 +37,7 @@ static ToolWindowService getInstance(@NotNull Project project) {
* @param toolWindow toolWindow
*/
default void init(@NotNull ToolWindow toolWindow) {
- ContentFactory contentFactory = ContentFactory.SERVICE.getInstance();
+ ContentFactory contentFactory = ContentFactory.getInstance();
Content content = contentFactory.createContent(getContent(), "", false);
toolWindow.getContentManager().addContent(content);
diff --git a/src/main/java/com/github/restful/tool/utils/diagnostic/FileAppender.java b/src/main/java/com/github/restful/tool/utils/diagnostic/FileAppender.java
index d49dacb..9463b25 100644
--- a/src/main/java/com/github/restful/tool/utils/diagnostic/FileAppender.java
+++ b/src/main/java/com/github/restful/tool/utils/diagnostic/FileAppender.java
@@ -1,57 +1,58 @@
-/*
- Copyright (C), 2018-2020, ZhangYuanSheng
- FileName: FileAppender
- Author: ZhangYuanSheng
- Date: 2020/7/17 17:05
- Description:
- History:
-