diff --git a/.github/workflows/beta-release.yml b/.github/workflows/beta-release.yml index f886d61..04657ae 100644 --- a/.github/workflows/beta-release.yml +++ b/.github/workflows/beta-release.yml @@ -19,6 +19,19 @@ jobs: # Source branch ref: ${{ github.head_ref }} + # Setup Java 21 environment for the next steps + - name: Setup Java + uses: actions/setup-java@v6 + with: + distribution: zulu + java-version: 21 + + # Setup Gradle + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v6 + with: + gradle-home-cache-cleanup: true + # Manipulate gradle.properties pluginVersion property, appends '-buildNumber-beta' - name: Patch Gradle Properties shell: bash @@ -39,19 +52,6 @@ jobs: sed -i "/pluginVersion = / s/ = .*/ = $VERSION_WITH_BUILDNUMBER/" gradle.properties echo "Version: $VERSION_WITH_BUILDNUMBER" - # Setup Java 21 environment for the next steps - - name: Setup Java - uses: actions/setup-java@v6 - with: - distribution: zulu - java-version: 21 - - # Setup Gradle - - name: Setup Gradle - uses: gradle/actions/setup-gradle@v6 - with: - gradle-home-cache-cleanup: true - # Publish the plugin to the Marketplace, this should automatically use the 'beta' channel because we changed the # version in gradle.properties to version-beta - name: Publish Plugin Beta diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2883734..f91800d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -150,9 +150,9 @@ jobs: # Free GitHub Actions Environment Disk Space - name: Maximize Build Space - uses: jlumbroso/free-disk-space@main + uses: jlumbroso/free-disk-space@v2.0.0 with: - tool-cache: false + preinstalled-runtimes: false large-packages: false # Check out current repository @@ -188,9 +188,9 @@ jobs: # Free GitHub Actions Environment Disk Space - name: Maximize Build Space - uses: jlumbroso/free-disk-space@main + uses: jlumbroso/free-disk-space@v2.0.0 with: - tool-cache: false + preinstalled-runtimes: false large-packages: false # Check out current repository diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 97b905e..8803f66 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,7 +15,6 @@ jobs: runs-on: ubuntu-latest permissions: contents: write - pull-requests: write steps: # Check out current repository diff --git a/.github/workflows/run-ui-tests.yml b/.github/workflows/run-ui-tests.yml index c4e9691..0291ffa 100644 --- a/.github/workflows/run-ui-tests.yml +++ b/.github/workflows/run-ui-tests.yml @@ -39,9 +39,9 @@ jobs: # Free GitHub Actions Environment Disk Space, an IDE download needs several GB - name: Maximize Build Space if: ${{ matrix.os == 'ubuntu-latest' }} - uses: jlumbroso/free-disk-space@main + uses: jlumbroso/free-disk-space@v2.0.0 with: - tool-cache: false + preinstalled-runtimes: false large-packages: false # Check out current repository diff --git a/build.gradle.kts b/build.gradle.kts index d10962e..56d7c3d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -160,10 +160,6 @@ intellijPlatformTesting.testIdeUi.register("testIdeUi") { } tasks { - wrapper { - gradleVersion = properties("gradleVersion").get() - } - test { useJUnitPlatform() } diff --git a/gradle.properties b/gradle.properties index dc101a8..869dfd5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -34,8 +34,8 @@ platformPlugins = # currently available builds, newest first. A comma separated list is supported. pluginVerifierIdeVersions = IU-2025.3 -# Gradle Releases -> https://github.com/gradle/gradle/releases -gradleVersion = 9.7.1 +# The Gradle version is only set in gradle/wrapper/gradle-wrapper.properties, which Dependabot keeps up to date. +# To change it by hand: ./gradlew wrapper --gradle-version # Opt-out flag for bundling Kotlin standard library -> https://plugins.jetbrains.com/docs/intellij/kotlin.html#kotlin-standard-library # suppress inspection "UnusedProperty"