diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 68ee096..83293eb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -40,16 +40,12 @@ jobs: - name: Fetch Sources uses: actions/checkout@v4 - # Validate wrapper - - name: Gradle Wrapper Validation - uses: gradle/actions/wrapper-validation@v3 - # Set up Java environment for the next steps - name: Setup Java uses: actions/setup-java@v4 with: distribution: zulu - java-version: 17 + java-version: 21 # Setup Gradle - name: Setup Gradle @@ -109,7 +105,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: zulu - java-version: 17 + java-version: 21 # Setup Gradle - name: Setup Gradle @@ -129,7 +125,7 @@ jobs: # Upload the Kover report to CodeCov - name: Upload Code Coverage Report - uses: codecov/codecov-action@v4 + uses: codecov/codecov-action@v5 with: files: ${{ github.workspace }}/build/reports/kover/report.xml @@ -163,7 +159,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: zulu - java-version: 17 + java-version: 21 # Run Qodana inspections - name: Qodana - Code Inspection @@ -194,7 +190,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: zulu - java-version: 17 + java-version: 21 # Setup Gradle - name: Setup Gradle diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6991d2a..b52ca10 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -18,14 +18,6 @@ jobs: pull-requests: write steps: - # Free GitHub Actions Environment Disk Space - - name: Maximize Build Space - # jlumbroso/free-disk-space@v1.3.1: - uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be - with: - tool-cache: false - large-packages: false - # Check out the current repository - name: Fetch Sources uses: actions/checkout@v4 @@ -37,7 +29,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: zulu - java-version: 17 + java-version: 21 # Setup Gradle - name: Setup Gradle diff --git a/.github/workflows/run-ui-tests.yml b/.github/workflows/run-ui-tests.yml index c15022d..0dd979a 100644 --- a/.github/workflows/run-ui-tests.yml +++ b/.github/workflows/run-ui-tests.yml @@ -40,7 +40,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: zulu - java-version: 17 + java-version: 21 # Setup Gradle - name: Setup Gradle diff --git a/build.gradle.kts b/build.gradle.kts index 96d79fc..08e931d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -16,7 +16,7 @@ version = providers.gradleProperty("pluginVersion").get() // Set the JVM language level used to build the project. kotlin { - jvmToolchain(17) + jvmToolchain(21) } // Configure project's dependencies @@ -31,11 +31,11 @@ repositories { // Dependencies are managed with Gradle version catalog - read more: https://docs.gradle.org/current/userguide/platforms.html#sub:version-catalog dependencies { -// implementation(libs.annotations) implementation(libs.json5.java) implementation(libs.commons.lang3) implementation(libs.commons.text) testImplementation(libs.junit) + testImplementation(libs.opentest4j) // IntelliJ Platform Gradle Plugin Dependencies Extension - read more: https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-dependencies-extension.html intellijPlatform { @@ -47,9 +47,6 @@ dependencies { // Plugin Dependencies. Uses `platformPlugins` property from the gradle.properties file for plugin from JetBrains Marketplace. plugins(providers.gradleProperty("platformPlugins").map { it.split(',') }) - instrumentationTools() - pluginVerifier() - zipSigner() testFramework(TestFrameworkType.Platform) } } @@ -57,6 +54,7 @@ dependencies { // Configure IntelliJ Platform Gradle Plugin - read more: https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-extension.html intellijPlatform { pluginConfiguration { + name = providers.gradleProperty("pluginName") version = providers.gradleProperty("pluginVersion") // Extract the section from README.md and provide for the plugin's manifest diff --git a/gradle.properties b/gradle.properties index 332fbf4..2bd5779 100644 --- a/gradle.properties +++ b/gradle.properties @@ -21,7 +21,7 @@ platformPlugins = com.jetbrains.php:233.15619.9 platformBundledPlugins = org.jetbrains.kotlin, JavaScript # Gradle Releases -> https://github.com/gradle/gradle/releases -gradleVersion = 8.10.2 +gradleVersion = 8.13 # 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 e41702c..c2275fe 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,24 +1,24 @@ [versions] # libraries -annotations = "24.1.0" json5-java = "2.0.0" commons-lang3 = "3.14.0" commons-text = "1.11.0" junit = "4.13.2" +opentest4j = "1.3.0" # plugins changelog = "2.2.1" -intelliJPlatform = "2.1.0" -kotlin = "1.9.25" -kover = "0.8.3" -qodana = "2024.2.3" +intelliJPlatform = "2.5.0" +kotlin = "2.1.20" +kover = "0.9.1" +qodana = "2024.3.4" [libraries] -annotations = { group = "org.jetbrains", name = "annotations", version.ref = "annotations" } json5-java = { group = "de.marhali", name = "json5-java", version.ref = "json5-java" } commons-lang3 = { group = "org.apache.commons", name = "commons-lang3", version.ref = "commons-lang3" } commons-text = { group = "org.apache.commons", name = "commons-text", version.ref = "commons-text" } junit = { group = "junit", name = "junit", version.ref = "junit" } +opentest4j = { group = "org.opentest4j", name = "opentest4j", version.ref = "opentest4j" } [plugins] changelog = { id = "org.jetbrains.changelog", version.ref = "changelog" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ccc1a9b..37f853b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists \ No newline at end of file +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index b26d411..f3b75f3 100755 --- a/gradlew +++ b/gradlew @@ -86,8 +86,7 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s -' "$PWD" ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -249,4 +248,4 @@ eval "set -- $( tr '\n' ' ' )" '"$@"' -exec "$JAVACMD" "$@" \ No newline at end of file +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index f46bb52..9d21a21 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -91,4 +91,4 @@ exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal -:omega \ No newline at end of file +:omega diff --git a/qodana.yml b/qodana.yml index b34a45e..6415c31 100644 --- a/qodana.yml +++ b/qodana.yml @@ -1,9 +1,9 @@ # Qodana configuration: # https://www.jetbrains.com/help/qodana/qodana-yaml.html -version: 1.0 -linter: jetbrains/qodana-jvm-community:2024.2 -projectJDK: "17" +version: "1.0" +linter: jetbrains/qodana-jvm-community:2024.3 +projectJDK: "21" profile: name: qodana.recommended exclude: