From ec796ec8b2c177f95c5f0f540916a211351fd759 Mon Sep 17 00:00:00 2001
From: samo_lego <34912839+samolego@users.noreply.github.com>
Date: Mon, 8 Feb 2021 15:25:43 +0100
Subject: [PATCH] Fixes #50

---
 common/build.gradle |  9 ---------
 forge/build.gradle  | 23 +++++++----------------
 2 files changed, 7 insertions(+), 25 deletions(-)

diff --git a/common/build.gradle b/common/build.gradle
index 2a1e071..100124e 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -20,27 +20,18 @@ dependencies {
     // Password hashing
     // Argon2
     implementation "de.mkammerer:argon2-jvm:${argon2_version}"
-    include "de.mkammerer:argon2-jvm:${argon2_version}"
 
     // BCrypt
     implementation "at.favre.lib:bcrypt:${bcrypt_version}"
     implementation "at.favre.lib:bytes:${bytes_version}"
-    include "at.favre.lib:bcrypt:${bcrypt_version}"
-    include "at.favre.lib:bytes:${bytes_version}"
 
     // Storage
     // LevelDB database
     implementation 'org.iq80.leveldb:leveldb:0.12'
     implementation 'org.iq80.leveldb:leveldb-api:0.12'
-    include 'org.iq80.leveldb:leveldb:0.12'
-    include 'org.iq80.leveldb:leveldb-api:0.12'
 
     // MongoDB driver
     implementation 'org.mongodb:mongodb-driver-sync:4.1.0'
-    include 'org.mongodb:mongodb-driver-sync:4.1.0'
-
-    // JNA lib
-    include 'net.java.dev.jna:jna:5.5.0'
 }
 
 architectury {
diff --git a/forge/build.gradle b/forge/build.gradle
index a1aff29..980c08d 100644
--- a/forge/build.gradle
+++ b/forge/build.gradle
@@ -33,28 +33,19 @@ dependencies {
 
     // Password hashing
     // Argon2
-    implementation "de.mkammerer:argon2-jvm:${argon2_version}"
-    include "de.mkammerer:argon2-jvm:${argon2_version}"
+    shadow "de.mkammerer:argon2-jvm:${argon2_version}"
 
     // BCrypt
-    implementation "at.favre.lib:bcrypt:${bcrypt_version}"
-    implementation "at.favre.lib:bytes:${bytes_version}"
-    include "at.favre.lib:bcrypt:${bcrypt_version}"
-    include "at.favre.lib:bytes:${bytes_version}"
+    shadow "at.favre.lib:bcrypt:${bcrypt_version}"
+    shadow "at.favre.lib:bytes:${bytes_version}"
 
     // Storage
-    // LevelDB database
-    implementation 'org.iq80.leveldb:leveldb:0.12'
-    implementation 'org.iq80.leveldb:leveldb-api:0.12'
-    include 'org.iq80.leveldb:leveldb:0.12'
-    include 'org.iq80.leveldb:leveldb-api:0.12'
-
-    // MongoDB driver
-    implementation 'org.mongodb:mongodb-driver-sync:4.1.0'
-    include 'org.mongodb:mongodb-driver-sync:4.1.0'
+    // leveldb
+    shadow group: 'org.iq80.leveldb', name: 'leveldb', version: '0.12'
+    shadow group: 'org.iq80.leveldb', name: 'leveldb-api', version: '0.12'
 
     // JNA lib
-    include 'net.java.dev.jna:jna:5.5.0'
+    shadow 'net.java.dev.jna:jna:5.5.0'
 }
 
 shadowJar {