diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 81c75a8..3d5343e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -46,14 +46,14 @@ jobs: # Validate wrapper - name: Gradle Wrapper Validation - uses: gradle/actions/wrapper-validation@v3 + uses: gradle/actions/wrapper-validation@v5 # Set up Java environment for the next steps - name: Setup Java uses: actions/setup-java@v5 with: distribution: zulu - java-version: 21 + java-version: 25 # Setup Gradle - name: Setup Gradle @@ -86,7 +86,7 @@ jobs: # Store already-built plugin as an artifact for downloading - name: Upload artifact - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v6 with: name: ${{ steps.artifact.outputs.filename }} path: ./build/distributions/content/*/* @@ -113,7 +113,7 @@ jobs: uses: actions/setup-java@v5 with: distribution: zulu - java-version: 21 + java-version: 25 # Setup Gradle - name: Setup Gradle @@ -123,12 +123,12 @@ jobs: # Run tests - name: Run Tests - run: ./gradlew check + run: ./gradlew check --stacktrace # Collect Tests Result of failed tests - name: Collect Tests Result if: ${{ failure() }} - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v6 with: name: tests-result path: ${{ github.workspace }}/build/reports/tests @@ -155,7 +155,7 @@ jobs: uses: actions/setup-java@v5 with: distribution: zulu - java-version: 21 + java-version: 25 # Setup Gradle - name: Setup Gradle @@ -165,7 +165,7 @@ jobs: # Cache Plugin Verifier IDEs - name: Setup Plugin Verifier IDEs Cache - uses: actions/cache@v4 + uses: actions/cache@v5 with: path: ${{ needs.build.outputs.pluginVerifierHomeDir }}/ides key: plugin-verifier diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b07a69c..fb4a8ad 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -33,7 +33,7 @@ jobs: uses: actions/setup-java@v5 with: distribution: zulu - java-version: 21 + java-version: 25 cache: gradle # Setup Gradle diff --git a/.java-version b/.java-version new file mode 100644 index 0000000..7273c0f --- /dev/null +++ b/.java-version @@ -0,0 +1 @@ +25 diff --git a/build.gradle.kts b/build.gradle.kts index e5bb39a..e52f3aa 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,22 +1,34 @@ plugins { id("java") - id("org.jetbrains.kotlin.jvm") version "2.1.20" - id("org.jetbrains.intellij.platform") version "2.13.1" + id("org.jetbrains.intellij.platform") version "2.17.0" } group = "com.github.junkfactory" version = providers.gradleProperty("pluginVersion").get() +java { + toolchain { + languageVersion.set(JavaLanguageVersion.of(25)) + } +} + +tasks.withType { + options.release.set(25) +} + repositories { mavenCentral() + maven("https://oss.sonatype.org/content/repositories/snapshots/") intellijPlatform { - defaultRepositories(); + defaultRepositories() } } dependencies { intellijPlatform { - create("IU", "2026.1") + create("IU", "LATEST-EAP-SNAPSHOT") { + useInstaller = false + } testFramework(org.jetbrains.intellij.platform.gradle.TestFrameworkType.Platform) // Add necessary plugin dependencies for compilation here, example: @@ -28,7 +40,7 @@ intellijPlatform { pluginConfiguration { ideaVersion { sinceBuild = "242" - untilBuild = "261.*" + untilBuild = "262.*" } } @@ -42,17 +54,6 @@ intellijPlatform { // Configure Gradle IntelliJ Plugin // Read more: https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html tasks { - // Set the JVM compatibility versions - withType { - sourceCompatibility = "21" - targetCompatibility = "21" - } - withType { - compilerOptions { - jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_21) - } - } - signPlugin { certificateChain.set(System.getenv("CERTIFICATE_CHAIN")) privateKey.set(System.getenv("PRIVATE_KEY"))