Exclude useless jna natives, relocate not relocated dependencies, update dependencies, update gradle, fix checkstyle, fix gitignore.

6 files changed, 37 insertions, 39 deletions

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 53f8a45..df809fc 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -11,14 +11,14 @@ jobs:
       fail-fast: true
     steps:
       - name: Checkout
-        uses: actions/checkout@v2.4.0
+        uses: actions/checkout@v3.0.0
       - name: Set up JDK ${{ matrix.java }}
-        uses: actions/setup-java@v2.5.0
+        uses: actions/setup-java@v3.0.0
         with:
           distribution: adopt
           java-version: ${{ matrix.java }}
       - name: Cache Gradle
-        uses: actions/cache@v2.1.7
+        uses: actions/cache@v3.0.1
         with:
           path: ~/.gradle
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
@@ -26,7 +26,7 @@ jobs:
       - name: Build LimboAuth
         run: ./gradlew build
       - name: Upload LimboAuth
-        uses: actions/upload-artifact@v2.3.1
+        uses: actions/upload-artifact@v3.0.0
         with:
           name: LimboAuth Built On ${{ matrix.java }} JDK
           path: "build/libs/limboauth*.jar"
diff --git a/.gitignore b/.gitignore
index 442df48..a8e27a8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,17 +1,6 @@
-# User-specific stuff
+# IntelliJ user-specific stuff
 .idea/
-
 *.iml
-*.ipr
-*.iws
-
-# IntelliJ
-out/
-# mpeltonen/sbt-idea plugin
-.idea_modules/
-
-# JIRA plugin
-atlassian-ide-plugin.xml
 
 # Compiled class file
 *.class
@@ -19,14 +8,8 @@ atlassian-ide-plugin.xml
 # Log file
 *.log
 
-# BlueJ files
-*.ctxt
-
 # Package Files
 *.jar
-*.war
-*.nar
-*.ear
 *.zip
 *.tar.gz
 *.rar
@@ -104,12 +87,6 @@ $RECYCLE.BIN/
 .gradle
 build/
 
-# Ignore Gradle GUI config
-gradle-app.setting
-
-# Cache of project
-.gradletasknamecache
-
 # Gradle Patch
 **/build/
 
diff --git a/build.gradle b/build.gradle
index f737c49..30dedde 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,7 @@
 plugins {
     id("java")
     id("checkstyle")
-    id("com.github.spotbugs").version("5.0.5")
+    id("com.github.spotbugs").version("5.0.6")
     id("org.cadixdev.licenser").version("0.6.1")
     id("com.github.johnrengelman.shadow").version("7.1.2")
     id("maven-publish")
@@ -86,39 +86,61 @@ dependencies {
 
     implementation("com.h2database:h2:1.4.200")
     implementation("mysql:mysql-connector-java:8.0.28")
-    implementation("org.postgresql:postgresql:42.3.1")
+    implementation("org.postgresql:postgresql:42.3.3")
 
-    implementation("org.bstats:bstats-velocity:2.2.1")
+    implementation("org.bstats:bstats-velocity:3.0.0")
     implementation("de.mkammerer:argon2-jvm-nolibs:2.11")
 
-    compileOnly("com.github.spotbugs:spotbugs-annotations:4.5.3")
+    compileOnly("com.github.spotbugs:spotbugs-annotations:4.6.0")
 }
 
 shadowJar {
     getArchiveClassifier().set("")
 
+    exclude("META-INF/licenses/**")
     exclude("META-INF/maven/**")
+    exclude("META-INF/versions/**")
+    exclude("META-INF/AL2.0")
     exclude("META-INF/INFO_BIN")
     exclude("META-INF/INFO_SRC")
+    exclude("META-INF/LGPL2.1")
+    exclude("META-INF/LICENSE")
+    exclude("META-INF/NOTICE")
+    exclude("META-INF/README")
+    exclude("META-INF/*.txt")
     exclude("google/protobuf/**")
     exclude("com/google/protobuf/**")
+    exclude("com/j256/ormlite/**/*.txt")
     exclude("com/mysql/cj/x/**")
     exclude("com/mysql/cj/xdevapi/**")
+    exclude("com/sun/jna/aix-ppc*/**")
+    exclude("com/sun/jna/darwin-aarch64/**")
+    exclude("com/sun/jna/freebsd-*/**")
+    exclude("com/sun/jna/linux-arm*/**")
+    exclude("com/sun/jna/linux-mips64el/**")
+    exclude("com/sun/jna/linux-ppc*/**")
+    exclude("com/sun/jna/linux-riscv64/**")
+    exclude("com/sun/jna/linux-s390x/**")
+    exclude("com/sun/jna/linux-x86/**")
+    exclude("com/sun/jna/openbsd-*/**")
+    exclude("com/sun/jna/sunos-*/**")
+    exclude("com/sun/jna/win32-x86/**")
     exclude("org/apache/commons/codec/language/**")
     exclude("org/checkerframework/**")
     exclude("**/package-info.class")
 
     minimize()
 
-    // Why are we increasing the size of the plugin if we can do that? :thinking:
-    relocate("org.bstats", "net.elytrium.limboapi.thirdparty.org.bstats")
-    exclude("org/bstats/**")
-
     relocate("at.favre.lib", "net.elytrium.limboauth.thirdparty.at.favre.lib")
     relocate("com.j256.ormlite", "net.elytrium.limboauth.thirdparty.com.j256.ormlite")
     relocate("com.mysql", "net.elytrium.limboauth.thirdparty.com.mysql")
+    relocate("com.sun.jna", "net.elytrium.limboauth.thirdparty.com.sun.jna") {
+        exclude("com.sun.jna.Native") // For compatibility with native methods.
+    }
+    relocate("de.mkammerer.argon2", "net.elytrium.limboauth.thirdparty.de.mkammerer.argon2")
     relocate("dev.samstevens.totp", "net.elytrium.limboauth.thirdparty.dev.samstevens.totp")
     relocate("org.apache.commons.codec", "net.elytrium.limboauth.thirdparty.org.apache.commons.codec")
+    relocate("org.bstats", "net.elytrium.limboauth.thirdparty.org.bstats")
     relocate("org.h2", "net.elytrium.limboauth.thirdparty.org.h2")
     relocate("org.postgresql", "net.elytrium.limboauth.thirdparty.org.postgresql")
 }
@@ -128,7 +150,7 @@ license {
 }
 
 checkstyle {
-    setToolVersion("9.2.1")
+    setToolVersion("10.1")
     setConfigFile(file("${this.getRootDir()}/config/checkstyle/checkstyle.xml"))
     setConfigProperties("configDirectory": "${this.getRootDir()}/config/checkstyle")
 
diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
index f6a501f..a78b371 100644
--- a/config/checkstyle/checkstyle.xml
+++ b/config/checkstyle/checkstyle.xml
@@ -45,7 +45,6 @@
 
     <module name="TreeWalker">
         <module name="MissingOverride"/>
-        <module name="FinalClass"/>
         <module name="RedundantImport"/>
         <module name="UnusedImports"/>
         <module name="RequireThis">
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 7454180..41d9927 100644
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 2e6e589..00e33ed 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-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists