From 4e99aaa5253c5049961e669db08af41ed9ab8049 Mon Sep 17 00:00:00 2001
From: tastybento <tastybento@wasteofplastic.com>
Date: Sat, 6 Mar 2021 12:47:54 -0800
Subject: [PATCH] Github workflows Sonar Cloud

---
 .github/workflows/build.yml  | 37 ++++++++++++++++++++++++++++++++++++
 .travis.yml                  | 21 --------------------
 pom.xml                      |  8 ++++++--
 src/main/resources/addon.yml |  2 +-
 4 files changed, 44 insertions(+), 24 deletions(-)
 create mode 100644 .github/workflows/build.yml
 delete mode 100644 .travis.yml

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 0000000..9e16544
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,37 @@
+name: Build
+on:
+  push:
+    branches:
+      - develop
+      - master
+  pull_request:
+    types: [opened, synchronize, reopened]
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
+      - name: Set up JDK 11
+        uses: actions/setup-java@v1
+        with:
+          java-version: 11
+      - name: Cache SonarCloud packages
+        uses: actions/cache@v1
+        with:
+          path: ~/.sonar/cache
+          key: ${{ runner.os }}-sonar
+          restore-keys: ${{ runner.os }}-sonar
+      - name: Cache Maven packages
+        uses: actions/cache@v1
+        with:
+          path: ~/.m2
+          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+          restore-keys: ${{ runner.os }}-m2
+      - 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
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 194f21d..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-language: java
-sudo: false
-addons:
-    sonarcloud:
-        organization: "bentobox-world"
-
-jdk:
-    - openjdk8
-    - openjdk11
-    
-matrix:
-  allow_failures:
-    - jdk: openjdk11
-    
-    
-script:
-    - mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent install sonar:sonar -Dsonar.projectKey=BentoBoxWorld_BSkyBlock
-cache:
-    directories:
-        - '$HOME/.m2/repository'
-        - '$HOME/.sonar/cache'
diff --git a/pom.xml b/pom.xml
index 9887a09..4155db8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,6 +66,10 @@
         <build.number>-LOCAL</build.number>
         <!-- This allows to change between versions. -->
         <build.version>1.14.1</build.version>
+        <!-- Sonar Cloud -->
+        <sonar.projectKey>BentoBoxWorld_BSkyBlock</sonar.projectKey>
+        <sonar.organization>bentobox-world</sonar.organization>
+        <sonar.host.url>https://sonarcloud.io</sonar.host.url>
     </properties>
 
     <!-- Profiles will allow to automatically change build version. -->
@@ -303,8 +307,8 @@
                 <configuration>
                     <append>true</append>
                     <excludes>
-                        <!-- This is required to prevent Jacoco from adding synthetic fields
-                            to a JavaBean class (causes errors in testing) -->
+                        <!-- This is required to prevent Jacoco from adding 
+                            synthetic fields to a JavaBean class (causes errors in testing) -->
                         <exclude>**/*Names*</exclude>
                     </excludes>
                 </configuration>
diff --git a/src/main/resources/addon.yml b/src/main/resources/addon.yml
index b19dd61..14c6456 100755
--- a/src/main/resources/addon.yml
+++ b/src/main/resources/addon.yml
@@ -22,7 +22,7 @@ permissions:
     description: Let the player use the sethome command
     default: true
   bskyblock.island.info:
-    description: Let the player check other players info
+    description: Let the player use the island info command
     default: true
   bskyblock.island.lock:
     description: Allows island locking