diff --git a/CHANGELOG.md b/CHANGELOG.md index c19927f..0541fb1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,9 +4,12 @@ ## [Unreleased] +## [0.0.5] + ### Fixed - Fixed plugin logo color - It was different in the web and in Java renderings +- Fix Windows related issue #7 ## [0.0.4] diff --git a/build.gradle.kts b/build.gradle.kts index 2ec1cd0..fc8fbbf 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -115,7 +115,7 @@ dependencies { implementation("me.bechberger:jfrtofp:0.0.2-SNAPSHOT") { isChanging = true } - implementation("me.bechberger:ap-loader-all:2.9-3") + implementation("me.bechberger:ap-loader-all:2.9-4") } tasks.test { diff --git a/gradle.properties b/gradle.properties index 135033b..0d5d6f6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ pluginGroup = me.bechberger pluginName = intellij-profiler-plugin # SemVer format -> https://semver.org -pluginVersion = 0.0.4 +pluginVersion = 0.0.5 # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html # for insight into build numbers and IntelliJ Platform versions. diff --git a/src/main/kotlin/me/bechberger/jfrplugin/runner/ap/APExecutor.kt b/src/main/kotlin/me/bechberger/jfrplugin/runner/ap/APExecutor.kt index c14c2a4..85e1cf2 100644 --- a/src/main/kotlin/me/bechberger/jfrplugin/runner/ap/APExecutor.kt +++ b/src/main/kotlin/me/bechberger/jfrplugin/runner/ap/APExecutor.kt @@ -4,7 +4,7 @@ import com.intellij.execution.Executor import com.intellij.icons.AllIcons import com.intellij.openapi.project.Project import com.intellij.openapi.util.IconLoader -import one.profiler.AsyncProfilerLoader +import me.bechberger.jfrplugin.util.isAsyncProfilerSupported import javax.swing.Icon class APExecutor : Executor() { @@ -50,7 +50,7 @@ class APExecutor : Executor() { } override fun isApplicable(project: Project): Boolean { - return AsyncProfilerLoader.isSupported() + return isAsyncProfilerSupported() } companion object { diff --git a/src/main/kotlin/me/bechberger/jfrplugin/runner/ap/APPluginRunConfigurationExtension.kt b/src/main/kotlin/me/bechberger/jfrplugin/runner/ap/APPluginRunConfigurationExtension.kt index 03eb735..fbae6af 100644 --- a/src/main/kotlin/me/bechberger/jfrplugin/runner/ap/APPluginRunConfigurationExtension.kt +++ b/src/main/kotlin/me/bechberger/jfrplugin/runner/ap/APPluginRunConfigurationExtension.kt @@ -4,7 +4,7 @@ import com.intellij.execution.RunConfigurationExtension import com.intellij.execution.configurations.JavaParameters import com.intellij.execution.configurations.RunConfigurationBase import com.intellij.execution.configurations.RunnerSettings -import one.profiler.AsyncProfilerLoader +import me.bechberger.jfrplugin.util.isAsyncProfilerSupported import org.jdom.Element /** @@ -21,7 +21,7 @@ class APPluginRunConfigurationExtension : RunConfigurationExtension() { } override fun isEnabledFor(configuration: RunConfigurationBase<*>, runnerSettings: RunnerSettings?): Boolean { - return AsyncProfilerLoader.isSupported() + return isAsyncProfilerSupported() } override fun > updateJavaParameters( diff --git a/src/main/kotlin/me/bechberger/jfrplugin/runner/ap/APProgramRunner.kt b/src/main/kotlin/me/bechberger/jfrplugin/runner/ap/APProgramRunner.kt index 94432cc..f7f961b 100644 --- a/src/main/kotlin/me/bechberger/jfrplugin/runner/ap/APProgramRunner.kt +++ b/src/main/kotlin/me/bechberger/jfrplugin/runner/ap/APProgramRunner.kt @@ -20,13 +20,14 @@ import me.bechberger.jfrplugin.config.deleteJFRFile import me.bechberger.jfrplugin.config.jfrFile import me.bechberger.jfrplugin.config.jfrVirtualFile import me.bechberger.jfrplugin.config.profilerConfig +import me.bechberger.jfrplugin.util.isAsyncProfilerSupported import one.profiler.AsyncProfilerLoader import org.jetbrains.concurrency.Promise class APProgramRunner : DefaultJavaProgramRunner() { override fun canRun(executorId: String, profile: RunProfile): Boolean { - return AsyncProfilerLoader.isSupported() && try { + return isAsyncProfilerSupported() && try { ( executorId == APExecutor.EXECUTOR_ID && profile !is RunConfigurationWithSuppressedDefaultRunAction && diff --git a/src/main/kotlin/me/bechberger/jfrplugin/util/APUtils.kt b/src/main/kotlin/me/bechberger/jfrplugin/util/APUtils.kt new file mode 100644 index 0000000..69bd2dc --- /dev/null +++ b/src/main/kotlin/me/bechberger/jfrplugin/util/APUtils.kt @@ -0,0 +1,9 @@ +package me.bechberger.jfrplugin.util + +import one.profiler.AsyncProfilerLoader + +fun isAsyncProfilerSupported() = try { + AsyncProfilerLoader.isSupported() +} catch (_: Throwable) { + false +} diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml index 6e9bed7..6631c7c 100644 --- a/src/main/resources/META-INF/plugin.xml +++ b/src/main/resources/META-INF/plugin.xml @@ -1,7 +1,7 @@ me.bechberger.jfrplugin Java JFR Profiler - 0.0.4 + 0.0.5 Johannes Bechberger