From c9c9916a78cdf583847a60cf4c0f6566e247bf02 Mon Sep 17 00:00:00 2001 From: junkfactory <2998269+junkfactory@users.noreply.github.com> Date: Fri, 27 Mar 2026 19:22:49 -0700 Subject: [PATCH] chore(): Upgrade github actions --- .github/workflows/build.yml | 26 ++++++++++++------------ .github/workflows/release.yml | 7 +++---- build.gradle.kts | 10 +++++---- gradle/wrapper/gradle-wrapper.properties | 2 +- 4 files changed, 23 insertions(+), 22 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d722fc7..81c75a8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,7 +16,7 @@ name: Build on: # Trigger the workflow on pushes to only the 'main' branch (this avoids duplicate checks being run e.g., for dependabot pull requests) push: - branches: [ main ] + branches: [main] # Trigger the workflow on any pull request pull_request: @@ -42,7 +42,7 @@ jobs: # Check out the current repository - name: Fetch Sources - uses: actions/checkout@v4 + uses: actions/checkout@v6 # Validate wrapper - name: Gradle Wrapper Validation @@ -50,14 +50,14 @@ jobs: # Set up Java environment for the next steps - name: Setup Java - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: zulu java-version: 21 # Setup Gradle - name: Setup Gradle - uses: gradle/actions/setup-gradle@v4 + uses: gradle/actions/setup-gradle@v5 with: gradle-home-cache-cleanup: true @@ -94,7 +94,7 @@ jobs: # Run tests and upload a code coverage report test: name: Test - needs: [ build ] + needs: [build] runs-on: ubuntu-latest steps: # Free GitHub Actions Environment Disk Space @@ -106,18 +106,18 @@ jobs: # Check out the current repository - name: Fetch Sources - uses: actions/checkout@v4 + uses: actions/checkout@v6 # Set up Java environment for the next steps - name: Setup Java - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: zulu java-version: 21 # Setup Gradle - name: Setup Gradle - uses: gradle/actions/setup-gradle@v4 + uses: gradle/actions/setup-gradle@v5 with: gradle-home-cache-cleanup: true @@ -136,7 +136,7 @@ jobs: # Run plugin structure verification along with IntelliJ Plugin Verifier verify: name: Verify plugin - needs: [ build ] + needs: [build] runs-on: ubuntu-latest steps: # Free GitHub Actions Environment Disk Space @@ -148,18 +148,18 @@ jobs: # Check out the current repository - name: Fetch Sources - uses: actions/checkout@v4 + uses: actions/checkout@v6 # Set up Java environment for the next steps - name: Setup Java - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: zulu java-version: 21 # Setup Gradle - name: Setup Gradle - uses: gradle/actions/setup-gradle@v4 + uses: gradle/actions/setup-gradle@v5 with: gradle-home-cache-cleanup: true @@ -177,7 +177,7 @@ jobs: # Collect Plugin Verifier Result - name: Collect Plugin Verifier Result if: ${{ always() }} - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v6 with: name: pluginVerifier-result path: ${{ github.workspace }}/build/reports/pluginVerifier diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1d4444b..b07a69c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -24,13 +24,13 @@ jobs: # Check out current repository - name: Fetch Sources - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: ref: ${{ github.event.release.tag_name }} # Setup Java 11 environment for the next steps - name: Setup Java - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: zulu java-version: 21 @@ -38,7 +38,7 @@ jobs: # Setup Gradle - name: Setup Gradle - uses: gradle/actions/setup-gradle@v4 + uses: gradle/actions/setup-gradle@v5 with: gradle-home-cache-cleanup: true @@ -56,4 +56,3 @@ jobs: PKG="$PROJECT_NAME-${VERSION:1}.zip" ls -l "$DIST_DIR" gh release create ${{ github.ref_name }} "$DIST_DIR/$PKG" --generate-notes - diff --git a/build.gradle.kts b/build.gradle.kts index de54539..e5bb39a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,7 +1,7 @@ plugins { id("java") - id("org.jetbrains.kotlin.jvm") version "1.9.25" - id("org.jetbrains.intellij.platform") version "2.10.5" + id("org.jetbrains.kotlin.jvm") version "2.1.20" + id("org.jetbrains.intellij.platform") version "2.13.1" } group = "com.github.junkfactory" @@ -16,7 +16,7 @@ repositories { dependencies { intellijPlatform { - create("IU", "LATEST-EAP-SNAPSHOT", useInstaller = false) + create("IU", "2026.1") testFramework(org.jetbrains.intellij.platform.gradle.TestFrameworkType.Platform) // Add necessary plugin dependencies for compilation here, example: @@ -48,7 +48,9 @@ tasks { targetCompatibility = "21" } withType { - kotlinOptions.jvmTarget = "21" + compilerOptions { + jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_21) + } } signPlugin { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 37f853b..c61a118 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.13-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME