Merge branch 'main' into gk/gradle9.0

* main:
  Fixed project creation for Gradle 6.0 in verify build workflow
  Fixes for older Gradle versions for the 'Verify build' workflow
  Changed wrapper bot gh token from readonly to GH_BOT_GITHUB_TOKEN
  Added testing with different Gradle version in the `Verify build` workflow
  Bump actions/checkout from 4 to 5
  Bump com.gradleup.shadow from 8.3.8 to 9.0.1
  Bump actions/download-artifact from 4 to 5

Author: ribafish

.github/workflows/build-verification.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
@@ -32,24 +32,81 @@ jobs:
     name: Test with Locally Published Plugin
     runs-on: ubuntu-latest
     needs: verification
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - gradle-version: '5.0'
+            java-version: '8'
+          - gradle-version: '6.0'
+            java-version: '8'
+          - gradle-version: '6.5'
+            java-version: '8'
+          - gradle-version: '7.0'
+            java-version: '8'
+          - gradle-version: '8.0'
+            java-version: '8'
+          - gradle-version: '9.0.0'
+            java-version: '21'
+          - gradle-version: 'current'
+            java-version: '21'
+          - gradle-version: 'release-candidate'
+            java-version: '21'
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
-          java-version: '21'
+          java-version: '${{ matrix.java-version }}'
           distribution: 'temurin'
       - name: Set up Gradle
         uses: gradle/actions/setup-gradle@v4
         with:
           develocity-access-key: ${{ secrets.DV_SOLUTIONS_ACCESS_KEY }}
+          gradle-version: '${{ matrix.gradle-version }}'
       - name: Download plugin to maven local
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           name: common-custom-user-data-gradle-plugin
           path: ~/.m2/repository/com/gradle
-      - name: Create a test project
+      - name: Create the test project for Gradle 5.0, 6.0 and 6.5
+        if: matrix.gradle-version == '5.0' || matrix.gradle-version == '6.0' || matrix.gradle-version == '6.5'
+        run: |
+          { [ "${{ matrix.gradle-version }}" == "5.0" ] && output_file="build.gradle" || output_file="settings.gradle"; }; echo """
+            buildscript {
+                repositories {
+                mavenLocal()
+                maven { url 'https://plugins.gradle.org/m2/' }
+              }
+                dependencies {
+                classpath 'com.gradle.develocity:com.gradle.develocity.gradle.plugin:4+'
+                classpath 'com.gradle.common-custom-user-data-gradle-plugin:com.gradle.common-custom-user-data-gradle-plugin.gradle.plugin:2+'
+              }
+            }
+            
+            apply plugin: 'com.gradle.develocity'
+            apply plugin: 'com.gradle.common-custom-user-data-gradle-plugin'
+              
+            develocity {
+              server = 'https://ge.solutions-team.gradle.com'
+            }
+          """ > ${{ runner.temp }}/"$output_file"
+          
+          echo """
+            rootProject.name = \"ccud-gradle-integration-test\"
+          """ >> ${{ runner.temp }}/settings.gradle
+          
+          echo """
+            org.gradle.vfs.watch=true
+            org.gradle.daemon=true
+            org.gradle.parallel=true
+            org.gradle.caching=true
+            org.gradle.jvmargs=-Duser.language=en -Duser.country=US -Dfile.encoding=UTF-8
+          """ > ${{ runner.temp }}/gradle.properties
+
+      - name: Create the test project for Gradle 7.0 and above
+        if: matrix.gradle-version != '5.0' && matrix.gradle-version != '6.0' && matrix.gradle-version != '6.5'
         run: |
           echo """
             pluginManagement {
@@ -66,18 +123,28 @@ jobs:
                 }
               }
             }
-              
+          
             plugins {
               id(\"com.gradle.develocity\") version \"4+\"
               id(\"com.gradle.common-custom-user-data-gradle-plugin\") version \"2+\"
             }
-              
+          
             develocity {
               server = \"https://ge.solutions-team.gradle.com\"
             }
           
             rootProject.name = \"ccud-gradle-integration-test\"
-          """ > ${{ runner.temp }}/settings.gradle.kts
+          """ > ${{ runner.temp }}/settings.gradle
+          
+          echo """
+            org.gradle.vfs.watch=true
+            org.gradle.daemon=true
+            org.gradle.parallel=true
+            org.gradle.caching=true
+            org.gradle.configuration-cache=true
+            org.gradle.unsafe.configuration-cache=true
+            org.gradle.jvmargs=-Duser.language=en -Duser.country=US -Dfile.encoding=UTF-8
+          """ > ${{ runner.temp }}/gradle.properties
 
       - name: Run a build with the locally published plugin
         id: build-with-local-plugin

.github/workflows/submit-github-dependency-graph.yml

@@ -11,7 +11,7 @@ jobs:
   generate-and-submit:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - uses: actions/setup-java@v4
       with:
         distribution: temurin

.github/workflows/wrapper-upgrade-execution.yml

@@ -23,7 +23,7 @@ jobs:
           git_commit_gpgsign: true
           git_config_global: true
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
@@ -36,4 +36,4 @@ jobs:
       - name: Upgrade Wrappers
         run: ./gradlew clean upgradeGradleWrapperAll --continue -Porg.gradle.java.installations.auto-download=false
         env:
-          WRAPPER_UPGRADE_GIT_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          WRAPPER_UPGRADE_GIT_TOKEN: ${{ secrets.GH_BOT_GITHUB_TOKEN }}

build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
     id("com.gradle.plugin-publish") version "1.3.1"
     id("com.github.breadmoirai.github-release") version "2.5.2"
     id("org.gradle.wrapper-upgrade") version "0.12"
-    id("com.gradleup.shadow") version "8.3.8"
+    id("com.gradleup.shadow") version "9.0.1"
 }
 
 val releaseVersion = releaseVersion()