Skip to content

Commit

Permalink
update to 3.8.3
Browse files Browse the repository at this point in the history
  • Loading branch information
zengkid committed Feb 16, 2021
1 parent 4f3ae18 commit 3dba727
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 15 deletions.
12 changes: 8 additions & 4 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
val intellijPublishToken: String by project

plugins {
id("org.jetbrains.intellij") version "0.5.0"
id("org.jetbrains.intellij") version "0.6.5"
java
kotlin("jvm") version "1.3.72"
}

version = "3.8.2"
version = "3.8.3"

repositories {
mavenCentral()
Expand All @@ -24,6 +24,7 @@ intellij {
pluginName = "SmartTomcat"
updateSinceUntilBuild = false
}

configure<JavaPluginConvention> {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
Expand All @@ -37,12 +38,15 @@ tasks.getByName<org.jetbrains.intellij.tasks.PatchPluginXmlTask>("patchPluginXml
sinceBuild("193")
changeNotes("""
<ul>
<li>1.remove default en_US JVM options</li>
<li>2.load property file instead of executing java cmd to get tomcat info</li>
<li>update version to 3.8.3</li>
</ul>
""")
}

//tasks.getByName<org.jetbrains.intellij.tasks.RunPluginVerifierTask>("runPluginVerifier") {
// ideVersions("2022.1")
//}

tasks.getByName<org.jetbrains.intellij.tasks.PublishTask>("publishPlugin") {
token(intellijPublishToken)
}
22 changes: 11 additions & 11 deletions src/main/java/com/poratu/idea/plugins/tomcat/utils/PluginUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,17 @@
*/
public abstract class PluginUtils {

public static String getJavaHome() {
Sdk sdk = getProjectJDK();
String javahome;
if (sdk == null) {
JdkBundle jdkBundle = JdkBundle.createBoot();
javahome = jdkBundle.getLocation().getAbsolutePath();
} else {
javahome = sdk.getHomePath();
}
return javahome;
}
// public static String getJavaHome() {
// Sdk sdk = getProjectJDK();
// String javahome;
// if (sdk == null) {
// JdkBundle jdkBundle = JdkBundle.createBoot();
// javahome = jdkBundle.getLocation().getAbsolutePath();
// } else {
// javahome = sdk.getHomePath();
// }
// return javahome;
// }

private static Sdk getProjectJDK() {
Sdk[] allJdks = ProjectJdkTable.getInstance().getAllJdks();
Expand Down

0 comments on commit 3dba727

Please sign in to comment.