diff --git a/.gitignore b/.gitignore index 97fe5d1a..350a5165 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,16 @@ -.gradle +# Mac filesystem dust +.DS_Store/ +.DS_Store + +# Linux temp files +*~ + +# IntelliJ +*.iml .idea + +# Gradle +!gradle/wrapper/gradle-wrapper.jar +.gradle build outs diff --git a/build.gradle.kts b/build.gradle.kts index 45bd598a..174a3b5e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -101,7 +101,9 @@ dependencies { // Multi World plugin, https://www.spigotmc.org/resources/multiverse-core.390/ compileOnly("com.onarandombox.multiversecore:multiverse-core:4.3.14") // EssentialsX plugin - compileOnly("net.essentialsx:EssentialsX:2.20.1") + compileOnly("net.essentialsx:EssentialsX:2.20.1") { + exclude("io.papermc", "paperlib") + } // BCrypt implementation implementation("at.favre.lib:bcrypt:0.10.2") // PlaceholderAPI @@ -113,11 +115,11 @@ dependencies { exclude("org.checkerframework", "checker-qual") } // Required to mock the LuckPerms API - testImplementation("org.checkerframework:checker-qual:3.40.0") + testImplementation("org.checkerframework:checker-qual:3.48.0") // Universal Scheduler implementation("com.github.Anon8281:UniversalScheduler:0.1.6") // JDBC drivers for datasource integration tests - testImplementation("org.xerial:sqlite-jdbc:3.46.0.0") + testImplementation("org.xerial:sqlite-jdbc:3.47.1.0") compileOnly("com.h2database:h2:2.2.224") } @@ -127,14 +129,15 @@ tasks { expand(project.properties) } } + build { dependsOn(shadowJar) } + // ShadowJar Config shadowJar { // Options - archiveAppendix.set("") - archiveClassifier.set("") - archiveBaseName.set("AuthMe") + archiveFileName = "AuthMe-${project.version}.${archiveExtension.get()}" destinationDirectory.set(file("$rootDir/outs")) + exclude("META-INF/**") // Libraries Relocate relocate("org.apache.http", "fr.xephi.authme.libs.org.apache.http") relocate("org.apache.commons", "fr.xephi.authme.libs.org.apache.commons") diff --git a/gradle.properties b/gradle.properties index 4bc8bdbc..71007ff5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ group=fr.xephi version=5.7.0-FORK-b53 mainClass = fr.xephi.authme.AuthMe -authors = [sgdc3, games647, Hex3l, krusic22] \ No newline at end of file +authors = [sgdc3, games647, Hex3l, krusic22] diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e6441136..a4b76b95 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e2847c82..e18bc253 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index b740cf13..f3b75f3b 100644 --- a/gradlew +++ b/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -84,7 +86,7 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/gradlew.bat b/gradlew.bat index 25da30db..9d21a218 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,6 +13,8 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem @if "%DEBUG%"=="" @echo off @rem ########################################################################## diff --git a/settings.gradle.kts b/settings.gradle.kts index bfc72a3c..36cb0244 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1 +1 @@ -rootProject.name = "authme" +rootProject.name = "AuthMeReReloaded" diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index a2818877..86cc32db 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -3,7 +3,7 @@ name: ${project.name} # noinspection YAMLSchemaValidation authors: ${project.authors} website: https://github.com/HaHaWTH/AuthMeReReloaded/ -description: A fork of AuthMeReloaded that contains bug fixes +description: ${project.description} # noinspection YAMLSchemaValidation main: ${project.mainClass} folia-supported: true