diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7faddb8..e2a2d6e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -35,18 +35,18 @@ jobs:
# Check out current repository
- name: Fetch Sources
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
# Validate wrapper
- name: Gradle Wrapper Validation
- uses: gradle/wrapper-validation-action@v1.0.4
+ uses: gradle/wrapper-validation-action@v2
- # Setup Java 11 environment for the next steps
+ # Setup Java 17 environment for the next steps
- name: Setup Java
- uses: actions/setup-java@v3
+ uses: actions/setup-java@v4
with:
distribution: zulu
- java-version: 11
+ java-version: 17
cache: gradle
# Set environment variables
@@ -83,7 +83,7 @@ jobs:
# Cache Plugin Verifier IDEs
- name: Setup Plugin Verifier IDEs Cache
- uses: actions/cache@v2.1.7
+ uses: actions/cache@v4
with:
path: ${{ steps.properties.outputs.pluginVerifierHomeDir }}/ides
key: plugin-verifier-${{ hashFiles('build/listProductsReleases.txt') }}
@@ -95,15 +95,11 @@ jobs:
# Collect Plugin Verifier Result
- name: Collect Plugin Verifier Result
if: ${{ always() }}
- uses: actions/upload-artifact@v3
+ uses: actions/upload-artifact@v4
with:
name: pluginVerifier-result
path: ${{ github.workspace }}/build/reports/pluginVerifier
- # Run Qodana inspections
- - name: Qodana - Code Inspection
- uses: JetBrains/qodana-action@v4.2.5
-
# Prepare plugin archive content for creating artifact
- name: Prepare Plugin Artifact
id: artifact
@@ -117,7 +113,7 @@ jobs:
# Store already-built plugin as an artifact for downloading
- name: Upload artifact
- uses: actions/upload-artifact@v3
+ uses: actions/upload-artifact@v4
with:
name: ${{ steps.artifact.outputs.filename }}
path: ./build/distributions/content/*/*
@@ -133,7 +129,7 @@ jobs:
# Check out current repository
- name: Fetch Sources
- uses: actions/checkout@v2.4.0
+ uses: actions/checkout@v4
# Remove old release drafts by using the curl request for the available releases with draft flag
- name: Remove Old Release Drafts
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index db322c6..fb0af5e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -25,7 +25,7 @@ jobs:
uses: actions/setup-java@v3
with:
distribution: zulu
- java-version: 11
+ java-version: 17
cache: gradle
# Set environment variables
diff --git a/.github/workflows/run-ui-tests.yml b/.github/workflows/run-ui-tests.yml
index bfe19d0..e807dc8 100644
--- a/.github/workflows/run-ui-tests.yml
+++ b/.github/workflows/run-ui-tests.yml
@@ -40,7 +40,7 @@ jobs:
uses: actions/setup-java@3
with:
distribution: zulu
- java-version: 11
+ java-version: 17
cache: gradle
# Run IDEA prepared for UI testing
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e7acf0c..5c1fa78 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,12 @@
## [Unreleased]
+## [0.24.5]
+
+### Added
+
+- Fixed: Compatible with IntelliJ IDEA 2024.1
+
## [0.24.4]
### Added
diff --git a/build.gradle.kts b/build.gradle.kts
index 6a86fc2..7cf80f9 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -8,13 +8,13 @@ plugins {
// Java support
id("java")
// Kotlin support
- id("org.jetbrains.kotlin.jvm") version "1.6.10"
+ id("org.jetbrains.kotlin.jvm") version "1.9.23"
// Gradle IntelliJ Plugin
- id("org.jetbrains.intellij") version "1.13.3"
+ id("org.jetbrains.intellij") version "1.17.2"
// Gradle Changelog Plugin
id("org.jetbrains.changelog") version "1.3.1"
// Gradle Qodana Plugin
- id("org.jetbrains.qodana") version "0.1.13"
+ //id("org.jetbrains.qodana") version "2023.3.1"
}
group = properties("pluginGroup")
@@ -49,14 +49,6 @@ changelog {
groups.set(emptyList())
}
-// Configure Gradle Qodana Plugin - read more: https://github.com/JetBrains/gradle-qodana-plugin
-qodana {
- cachePath.set(projectDir.resolve(".qodana").canonicalPath)
- reportPath.set(projectDir.resolve("build/reports/inspections").canonicalPath)
- saveReport.set(true)
- showReport.set(System.getenv("QODANA_SHOW_REPORT")?.toBoolean() ?: false)
-}
-
tasks {
// Set the JVM compatibility versions
properties("javaVersion").let {
diff --git a/gradle.properties b/gradle.properties
index 2bbf872..44a0bc4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,26 +4,26 @@
pluginGroup = dev.jbang.intellij.plugins
pluginName = jbang-idea-plugin
# SemVer format -> https://semver.org
-pluginVersion = 0.24.4
+pluginVersion = 0.24.5
# See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
# for insight into build numbers and IntelliJ Platform versions.
-pluginSinceBuild = 221
-pluginUntilBuild = 233.*
+pluginSinceBuild = 231
+pluginUntilBuild = 241.*
# IntelliJ Platform Properties -> https://github.com/JetBrains/gradle-intellij-plugin#intellij-platform-properties
platformType = IC
-platformVersion = 221.5080.210
+platformVersion = 2023.3.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.jetbrains.kotlin,org.intellij.groovy,com.intellij.gradle,org.jetbrains.idea.reposearch,com.intellij.externalSystem.dependencyUpdater
+platformPlugins = com.intellij.java,org.jetbrains.kotlin,org.intellij.groovy,com.intellij.gradle,org.jetbrains.idea.reposearch
# Java language level used to compile sources and to generate the files for - Java 11 is required since 2020.3
-javaVersion = 11
+javaVersion = 17
# Gradle Releases -> https://github.com/gradle/gradle/releases
-gradleVersion = 7.5.1
+gradleVersion = 8.6
# Opt-out flag for bundling Kotlin standard library.
# See https://plugins.jetbrains.com/docs/intellij/kotlin.html#kotlin-standard-library for details.
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 41d9927..249e583 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 ae04661..17655d0 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 1b6c787..a69d9cb 100755
--- a/gradlew
+++ b/gradlew
@@ -205,6 +205,12 @@ set -- \
org.gradle.wrapper.GradleWrapperMain \
"$@"
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+ die "xargs is not available"
+fi
+
# Use "xargs" to parse quoted args.
#
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
diff --git a/gradlew.bat b/gradlew.bat
index 107acd3..f127cfd 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -14,7 +14,7 @@
@rem limitations under the License.
@rem
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
@@ -25,7 +25,7 @@
if "%OS%"=="Windows_NT" setlocal
set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
:end
@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
-if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
:mainEnd
if "%OS%"=="Windows_NT" endlocal
diff --git a/qodana.yml b/qodana.yml
index dac95d3..0be9353 100644
--- a/qodana.yml
+++ b/qodana.yml
@@ -2,5 +2,11 @@
# https://www.jetbrains.com/help/qodana/qodana-yaml.html
version: 1.0
+linter: jetbrains/qodana-jvm-community:latest
+projectJDK: "17"
profile:
name: qodana.recommended
+exclude:
+ - name: All
+ paths:
+ - .qodana
\ No newline at end of file
diff --git a/src/main/kotlin/dev/jbang/idea/JBangJdkLoader.kt b/src/main/kotlin/dev/jbang/idea/JBangJdkLoader.kt
index 5522833..8c4adbc 100644
--- a/src/main/kotlin/dev/jbang/idea/JBangJdkLoader.kt
+++ b/src/main/kotlin/dev/jbang/idea/JBangJdkLoader.kt
@@ -5,7 +5,8 @@ import com.intellij.openapi.progress.ProgressIndicator
class JBangJdkLoader : PreloadingActivity() {
- override fun preload(indicator: ProgressIndicator) {
+
+ override suspend fun execute() {
JBangJdkService.syncJBangJdksWithIdea()
}
}
\ No newline at end of file
diff --git a/src/main/resources/META-INF/jbang-dependency-update-integration.xml b/src/main/resources/META-INF/jbang-dependency-update-integration.xml
deleted file mode 100644
index 89c26c7..0000000
--- a/src/main/resources/META-INF/jbang-dependency-update-integration.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
index ad1a8e7..ac28c5f 100644
--- a/src/main/resources/META-INF/plugin.xml
+++ b/src/main/resources/META-INF/plugin.xml
@@ -10,7 +10,6 @@
org.jetbrains.kotlin
org.intellij.groovy
com.intellij.gradle
- com.intellij.externalSystem.dependencyUpdater
@@ -38,6 +37,7 @@
+