From 24baf6d5e5eb573db34db2819ec8fabab95a485c Mon Sep 17 00:00:00 2001
From: Enrico Minack <github@enrico.minack.dev>
Date: Thu, 30 Jun 2022 09:06:28 +0200
Subject: [PATCH 1/2] Provide shaded jar with dgraph4j's dependencies

---
 build.gradle | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/build.gradle b/build.gradle
index f28e7f1..75c2e9c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+
 buildscript {
     repositories {
         maven {
@@ -32,6 +34,7 @@ plugins {
     id 'com.github.sherter.google-java-format' version '0.9'
     id 'base'
     id 'maven-publish'
+    id 'com.gradleup.shadow' version '8.3.2'
 }
 // Apply the java plugin to add support for Java
 apply plugin: 'java'
@@ -171,6 +174,14 @@ task fatJar(type: Jar) {
     with jar
 }
 
+tasks.named('shadowJar', ShadowJar) {
+    enableRelocation true
+    relocationPrefix "io.dgraph.dgraph4j.shaded"
+    relocate 'google', 'io.dgraph.dgraph4j.shaded.google'
+    archiveClassifier.set("shaded")
+    mergeServiceFiles()
+}
+
 task buildJar(type: Jar)
 
 task javadocJar(type: Jar) {
@@ -201,6 +212,7 @@ task integrationTest(type: Test) {
 
 artifacts {
     archives jar
+    archives shadowJar
     archives sourceJar
     archives javadocJar
 }

From 3ee4b8829c8bf29a97591e24f55d57e22230aabb Mon Sep 17 00:00:00 2001
From: Enrico Minack <github@enrico.minack.dev>
Date: Wed, 23 Oct 2024 15:03:13 +0200
Subject: [PATCH 2/2] Upgrade gradle version provided by gradlew to 8.3

---
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 3994438..db9a6b8 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.6.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists