diff --git a/build.gradle b/build.gradle index 3ce127ef8..2b26a2602 100644 --- a/build.gradle +++ b/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' diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 28ff446a2..0f80bbf51 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/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 diff --git a/minestom_checks.xml b/minestom_checks.xml index eb513ae72..082918382 100644 --- a/minestom_checks.xml +++ b/minestom_checks.xml @@ -277,7 +277,7 @@ value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/> - +