Merge pull request #2785 from BentoBoxWorld/develop

Version 3.11.0

Author: tastybento

.github/workflows/build.yml

@@ -1,14 +1,13 @@
-name: Build
+name: SonarQube
 on:
   push:
     branches:
       - develop
-      - master
   pull_request:
     types: [opened, synchronize, reopened]
 jobs:
   build:
-    name: Build
+    name: Build and analyze
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -17,31 +16,25 @@ jobs:
       - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
-          distribution: 'adopt'
-          java-version: '21'
-      - name: Cache SonarCloud packages
+          java-version: 21
+          distribution: 'zulu' # Alternative distribution options are available
+      - name: Cache SonarQube packages
         uses: actions/cache@v4
         with:
           path: ~/.sonar/cache
           key: ${{ runner.os }}-sonar
           restore-keys: ${{ runner.os }}-sonar
-      - name: Cache Maven packages
+      - name: Cache Gradle packages
         uses: actions/cache@v4
         with:
-          path: ~/.m2
-          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-          restore-keys: ${{ runner.os }}-m2
+          path: ~/.gradle/caches
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
+          restore-keys: ${{ runner.os }}-gradle
+          
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+        
       - name: Build and analyze
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        run: mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=BentoBoxWorld_BentoBox
-      - name: Debug - List target directory
-        run: ls -la /home/runner/work/BentoBox/BentoBox/target
-      - run: mvn --batch-mode clean org.jacoco:jacoco-maven-plugin:prepare-agent install
-      - run: mkdir staging && cp target/*.jar staging
-      - name: Save artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: Package
-          path: staging
+        run: ./gradlew build sonar --info

.github/workflows/modrinth-publish.yml

@@ -30,7 +30,6 @@ $RECYCLE.BIN/
 *.log
 *.ctxt
 .mtj.tmp/
-*.jar
 *.war
 *.nar
 *.ear

.gitignore

@@ -1,7 +1,7 @@
 # BentoBox
 
 [![Discord](https://img.shields.io/discord/272499714048524288.svg?logo=discord)](https://discord.bentobox.world)
-[![Build Status](https://ci.codemc.org/buildStatus/icon?job=BentoBoxWorld/BentoBox)](https://ci.codemc.org/job/BentoBoxWorld/job/BentoBox/)
+[![Build Status](https://ci.codemc.io/job/BentoBoxWorld/job/BentoBox-Gradle/badge/icon)](https://ci.codemc.io/job/BentoBoxWorld/job/BentoBox-Gradle/)
 [![Maintainability Rating](https://sonarcloud.io/api/project_badges/measure?project=BentoBoxWorld_BentoBox&metric=sqale_rating)](https://sonarcloud.io/dashboard?id=BentoBoxWorld_BentoBox)
 [![Reliability Rating](https://sonarcloud.io/api/project_badges/measure?project=BentoBoxWorld_BentoBox&metric=reliability_rating)](https://sonarcloud.io/dashboard?id=BentoBoxWorld_BentoBox)
 [![Security Rating](https://sonarcloud.io/api/project_badges/measure?project=BentoBoxWorld_BentoBox&metric=security_rating)](https://sonarcloud.io/dashboard?id=BentoBoxWorld_BentoBox)