Merge pull request #300 from JesFot/upgrade_gradle

Upgrade gradle version to 7.0.2

.github/workflows/check-pr-style.yml

@@ -14,9 +14,9 @@ jobs:
     - name: Set up JDK 11
       uses: actions/setup-java@v1
       with:
-        java-version: 1.11
+        java-version: 11
     - name: Run java checkstyle
-      uses: nikitasavinov/checkstyle-action@d87d526a914fc5cb0b003908e35038dbb2d6e1b7
+      uses: nikitasavinov/checkstyle-action@0.3.1
       with:
         # Report level for reviewdog [info,warning,error]
         level: info
@@ -28,4 +28,4 @@ jobs:
         fail_on_error: false
         # Checkstyle config file
         checkstyle_config: minestom_checks.xml
-        checkstyle_version: "8.37"
+        checkstyle_version: "8.42"

.github/workflows/javadoc.yml

@@ -14,7 +14,7 @@ jobs:
     - name: Set up JDK 11
       uses: actions/setup-java@v1
       with:
-        java-version: 1.11
+        java-version: 11
     - name: Build javadoc
       run: gradle javadoc
       

.github/workflows/tests.yml

@@ -16,7 +16,7 @@ jobs:
     - name: Set up JDK 11
       uses: actions/setup-java@v1
       with:
-        java-version: 1.11
+        java-version: 11
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
     - name: Setup gradle cache

build.gradle

@@ -2,9 +2,7 @@ import org.gradle.internal.os.OperatingSystem
 
 plugins {
     id 'java-library'
-    id 'java'
     id 'maven-publish'
-    id 'net.ltgt.apt' version '0.10'
     id 'org.jetbrains.kotlin.jvm' version '1.5.0'
     id 'checkstyle'
 }
@@ -12,7 +10,7 @@ plugins {
 group 'net.minestom.server'
 version '1.0'
 
-sourceCompatibility = 1.11
+sourceCompatibility = 11
 project.ext.lwjglVersion = "3.2.3"
 
 switch (OperatingSystem.current()) {
@@ -53,7 +51,7 @@ allprojects {
         // see https://stackoverflow.com/a/56641766
         doLast {
             // Append the fix to the file
-            def searchScript = new File(destinationDir.getAbsolutePath() + '/search.js')
+            def searchScript = new File(destinationDir, '/search.js')
             searchScript.append '\n\n' +
                     'getURLPrefix = function(ui) {\n' +
                     '    return \'\';\n' +
@@ -62,7 +60,7 @@ allprojects {
     }
 
     checkstyle {
-        toolVersion "8.37"
+        toolVersion "8.42"
         configFile file("${projectDir}/minestom_checks.xml")
     }
 }
@@ -114,6 +112,10 @@ test {
     useJUnitPlatform()
 }
 
+tasks.withType(Zip).configureEach {
+    duplicatesStrategy DuplicatesStrategy.EXCLUDE
+}
+
 dependencies {
     // Junit Testing Framework
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.6.2'

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

minestom_checks.xml

@@ -277,7 +277,7 @@
              value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
         </module>
         <module name="JavadocMethod">
-            <property name="scope" value="public"/>
+            <property name="accessModifiers" value="public"/>
             <property name="allowMissingParamTags" value="true"/>
             <property name="allowMissingReturnTag" value="true"/>
             <property name="allowedAnnotations" value="Override, Test"/>