Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 41 additions & 31 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,63 +10,73 @@ buildscript {
// 这两个插件是必备
plugins {
id 'java'
id 'org.jetbrains.intellij' version '0.7.3'
id 'org.jetbrains.intellij.platform' version '2.7.1'
}


group 'com.sjhy'
version '1.2.9-java.RELEASE'
version '1.3.0-java.RELEASE'

sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
compileJava.options.encoding = "UTF-8"
compileTestJava.options.encoding = "UTF-8"

repositories {
mavenCentral()
intellijPlatform {
defaultRepositories()
}
}

// http://www.jetbrains.org/intellij/sdk/docs/tutorials/build_system/prerequisites.html
// https://plugins.jetbrains.com/docs/intellij/gradle-guide.html 官网gradle构建教程

intellij {
// 插件名称
pluginName 'EasyCode'
// 沙箱目录位置,用于保存IDEA的设置,默认在build文件下面,防止clean,放在根目录下。
sandboxDirectory = "${rootProject.rootDir}/idea-sandbox"
// 开发环境运行时使用的版本
version '2021.2.2'
// 社区版
// type 'IC'
// 企业版
type 'IU'
// 各种IDEA版本去这里找
// https://www.jetbrains.com/intellij-repository/releases
// 依赖的插件
plugins = ['com.intellij.java', 'com.intellij.database']
//Disables updating since-build attribute in plugin.xml
updateSinceUntilBuild false
downloadSources = true
}
//
//intellijPlatform {
//// 插件名称
// pluginName = 'EasyCode'
// // 沙箱目录位置,用于保存IDEA的设置,默认在build文件下面,防止clean,放在根目录下。
// //sandboxDirectory = "${rootProject.rootDir}/idea-sandbox"
// // 开发环境运行时使用的版本
// version = '2025.1.1.1'
// // 社区版
//// type 'IC'
// // 企业版
// type = 'IU'
//// localPath = 'C:\\Users\\M\\AppData\\Local\\Programs\\IntelliJ IDEA Ultimate' // 根据实际安装路径调整
// // 各种IDEA版本去这里找
// // https://www.jetbrains.com/intellij-repository/releases
// // 依赖的插件
// plugins = ['com.intellij.java', 'com.intellij.database']
// //Disables updating since-build attribute in plugin.xml
// updateSinceUntilBuild = false
// downloadSources = true
//}

dependencies {
// jackson工具
compile 'com.fasterxml.jackson.core:jackson-databind:2.9.6'
//compile 'com.fasterxml.jackson.core:jackson-databind:2.14.2'
// guava工具
// compile 'com.google.guava:guava:29.0-jre'
// implementation 'com.google.guava:guava:29.0-jre'
// velocity支持
// compile 'org.apache.velocity:velocity:1.7'
// implementation 'org.apache.velocity:velocity:2.3'
// groovy支持
// compile 'org.codehaus.groovy:groovy:3.0.2'
// beetl支持
// compile 'com.ibeetl:beetl:3.3.0.RELEASE'
// freemarker支持
// compile 'org.freemarker:freemarker:2.3.30'
// lombok 支持
compileOnly 'org.projectlombok:lombok:1.18.2'
annotationProcessor 'org.projectlombok:lombok:1.18.2'
testAnnotationProcessor 'org.projectlombok:lombok:1.18.2'
compileOnly 'org.projectlombok:lombok:1.18.24'
annotationProcessor 'org.projectlombok:lombok:1.18.24'
testAnnotationProcessor 'org.projectlombok:lombok:1.18.24'
// 测试用例
testCompile 'junit:junit:4.12'
testImplementation 'junit:junit:4.13.2'

intellijPlatform {
bundledPlugin 'com.intellij.java'
bundledPlugin 'com.intellij.database'
create('IU', '2025.1.1.1')
}
}

2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://downloads.gradle.org/distributions/gradle-6.9-bin.zip
distributionUrl=https\://downloads.gradle.org/distributions/gradle-8.6-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion src/main/java/com/sjhy/plugin/dict/GlobalDict.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public interface GlobalDict {
/**
* 版本号
*/
String VERSION = "1.2.9";
String VERSION = "1.3.0";
/**
* 作者名称
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public void exportConfig(SettingsStorageDTO settingsStorage) {

// 发起通知
Notification notification = new Notification(
Notifications.SYSTEM_MESSAGES_GROUP_ID,
"System Messages",
"Easy code notify",
"Easy code config file export to",
NotificationType.INFORMATION);
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/sjhy/plugin/tool/VelocityUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public class VelocityUtils {
// 设置初始化配置
INIT_PROP = new Properties();
// 修复部分用户的velocity日志记录无权访问velocity.log文件问题
INIT_PROP.setProperty(RuntimeConstants.RUNTIME_LOG_LOGSYSTEM_CLASS, "org.apache.velocity.runtime.log.Log4JLogChute");
INIT_PROP.setProperty("runtime.log.logsystem.class","org.apache.velocity.runtime.log.SLF4JLogChute");
INIT_PROP.setProperty("runtime.log.logsystem.log4j.logger", "velocity");
}

Expand Down
9 changes: 8 additions & 1 deletion src/main/resources/META-INF/plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,13 @@


<change-notes><![CDATA[
<p>1.3.0-java.RELEASE</p>
<ul>
<li>1.Support with idea 2025.1</li>
</ul>
<ul>
<li>1.支持idea 2025.1</li>
</ul>
<p>1.2.9-java.RELEASE</p>
<ul>
<li>1.Fix the incorrect configuration information of some user prompt tables</li>
Expand Down Expand Up @@ -269,7 +276,7 @@
]]></change-notes>

<!-- please see http://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/build_number_ranges.html for description -->
<idea-version since-build="171.3780.107"/>
<idea-version since-build="251.*"/>

<!-- please see http://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/plugin_compatibility.html
on how to target different products -->
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/defaultConfig.json

Large diffs are not rendered by default.