diff --git a/CHANGELOG.md b/CHANGELOG.md index a4e789a..d3f7794 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,9 @@ ## [Unreleased] +- Update minimum IDE version +- Remove deprecated code usage + ## [0.10.1] - 2024-03-27 - Removed queryBuilder from code completion diff --git a/gradle.properties b/gradle.properties index 8ff4afe..36b51da 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,22 +4,22 @@ pluginGroup = com.github.bobi.aemgroovyconsoleplugin pluginName = aem-groovyconsole-plugin pluginRepositoryUrl = https://github.com/bobi/aem-groovyconsole-plugin # SemVer format -> https://semver.org -pluginVersion = 0.10.1 +pluginVersion = 0.10.2 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html -pluginSinceBuild = 232 -pluginUntilBuild = 241.* +pluginSinceBuild = 241 +pluginUntilBuild = 251.* # IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension platformType = IC -platformVersion = 2023.3 +platformVersion = 2024.1 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html # Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22 platformPlugins = com.intellij.java, org.intellij.groovy # Gradle Releases -> https://github.com/gradle/gradle/releases -gradleVersion = 8.6 +gradleVersion = 8.7 # Opt-out flag for bundling Kotlin standard library -> https://jb.gg/intellij-platform-kotlin-stdlib kotlin.stdlib.default.dependency = false diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d8a6278..9193a7a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -11,7 +11,7 @@ fastcsv = "3.1.0" kotlin = "1.9.23" changelog = "2.2.0" gradleIntelliJPlugin = "1.17.3" -qodana = "2024.1.2" +qodana = "2024.1.3" kover = "0.7.6" [libraries] diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7f93135..d64cd49 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a80b22c..b82aa23 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index 0adc8e1..1aa94a4 100755 --- a/gradlew +++ b/gradlew @@ -145,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac @@ -153,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then '' | soft) :;; #( *) # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -202,11 +202,11 @@ fi # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ diff --git a/gradlew.bat b/gradlew.bat index 93e3f59..25da30d 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -43,11 +43,11 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail diff --git a/src/main/kotlin/com/github/bobi/aemgroovyconsoleplugin/config/ui/AemServersConfigurable.kt b/src/main/kotlin/com/github/bobi/aemgroovyconsoleplugin/config/ui/AemServersConfigurable.kt index 46c44b9..fc875b0 100644 --- a/src/main/kotlin/com/github/bobi/aemgroovyconsoleplugin/config/ui/AemServersConfigurable.kt +++ b/src/main/kotlin/com/github/bobi/aemgroovyconsoleplugin/config/ui/AemServersConfigurable.kt @@ -9,6 +9,7 @@ import com.intellij.openapi.actionSystem.AnAction import com.intellij.openapi.actionSystem.AnActionEvent import com.intellij.openapi.actionSystem.CommonShortcuts import com.intellij.openapi.options.Configurable +import com.intellij.openapi.project.DumbAwareAction import com.intellij.openapi.project.Project import com.intellij.ui.ToolbarDecorator import com.intellij.ui.dsl.builder.Align @@ -71,7 +72,7 @@ class AemServersConfigurable(private val project: Project) : Configurable { } toolbar.addExtraAction( - object : ToolbarDecorator.ElementActionButton("Duplicate", "Duplicate", PlatformIcons.COPY_ICON) { + object : DumbAwareAction("Duplicate", "Duplicate", PlatformIcons.COPY_ICON) { override fun actionPerformed(e: AnActionEvent) { val selectedRow = table.selectedRow if (selectedRow >= 0) { @@ -85,7 +86,7 @@ class AemServersConfigurable(private val project: Project) : Configurable { return ActionUpdateThread.EDT } }.also { action -> - action.setShortcut(CommonShortcuts.getDuplicate()) + action.registerCustomShortcutSet(CommonShortcuts.getDuplicate(), table.component) } as AnAction ) } diff --git a/src/main/kotlin/com/github/bobi/aemgroovyconsoleplugin/execution/ConsoleToolbarActions.kt b/src/main/kotlin/com/github/bobi/aemgroovyconsoleplugin/execution/ConsoleToolbarActions.kt index 75cf21b..eb81a72 100644 --- a/src/main/kotlin/com/github/bobi/aemgroovyconsoleplugin/execution/ConsoleToolbarActions.kt +++ b/src/main/kotlin/com/github/bobi/aemgroovyconsoleplugin/execution/ConsoleToolbarActions.kt @@ -74,7 +74,7 @@ internal class SaveOutputAction : AnAction({ "Save output" }, Presentation.NULL_ val aemConsoleRunContentDescriptor = AemGroovyConsoleScriptExecutor.findDescriptor(project, component) if (aemConsoleRunContentDescriptor != null && aemConsoleRunContentDescriptor.processHandler != null && aemConsoleRunContentDescriptor.processHandler!!.isProcessTerminated && aemConsoleRunContentDescriptor.tmpFile.exists()) { - val fileWrapper = openSaveFileDialog(project, "txt", "Export Table to CSV") + val fileWrapper = openSaveFileDialog(project, "txt", "Save AEM Groovy Console output") fileWrapper?.let { try {