dgraph-io
diff --git a/‎build.gradle‎
Lines changed: 7 additions & 17 deletions b/‎build.gradle‎
Lines changed: 7 additions & 17 deletions
diff --git a/‎gradle/wrapper/gradle-wrapper.jar‎
-15.3 KB b/‎gradle/wrapper/gradle-wrapper.jar‎
-15.3 KB
diff --git a/‎gradle/wrapper/gradle-wrapper.properties‎
Lines changed: 3 additions & 1 deletion b/‎gradle/wrapper/gradle-wrapper.properties‎
Lines changed: 3 additions & 1 deletion
diff --git a/‎gradlew‎
Lines changed: 27 additions & 13 deletions b/‎gradlew‎
Lines changed: 27 additions & 13 deletions
diff --git a/‎gradlew.bat‎
Lines changed: 21 additions & 16 deletions b/‎gradlew.bat‎
Lines changed: 21 additions & 16 deletions
diff --git a/‎samples/DgraphJavaSample/build.gradle‎
Lines changed: 1 addition & 1 deletion b/‎samples/DgraphJavaSample/build.gradle‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎samples/DgraphJavaSample/gradle/wrapper/gradle-wrapper.jar‎
-18.1 KB b/‎samples/DgraphJavaSample/gradle/wrapper/gradle-wrapper.jar‎
-18.1 KB
diff --git a/‎samples/DgraphJavaSample/gradle/wrapper/gradle-wrapper.properties‎
Lines changed: 2 additions & 1 deletion b/‎samples/DgraphJavaSample/gradle/wrapper/gradle-wrapper.properties‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎samples/DgraphJavaSample/gradlew‎
Lines changed: 15 additions & 10 deletions b/‎samples/DgraphJavaSample/gradlew‎
Lines changed: 15 additions & 10 deletions
@@ -8,7 +8,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 buildscript {
     repositories {
         maven {
-            url 'https://plugins.gradle.org/m2/'
+            url = uri('https://plugins.gradle.org/m2/')
         }
     }
     dependencies {
@@ -19,18 +19,14 @@ buildscript {
 plugins {
     id 'java-library'
     id 'jacoco'
-    id 'com.github.kt3k.coveralls' version '2.12.2'
-    id 'com.github.sherter.google-java-format' version '0.9'
     id 'base'
     id 'maven-publish'
     id 'com.gradleup.shadow' version '8.3.5'
 }
 
-// Apply the java plugin to add support for Java
 apply plugin: 'java'
 apply plugin: 'com.google.protobuf'
 apply plugin: 'idea'
-apply plugin: 'com.github.sherter.google-java-format'
 apply plugin: 'signing'
 
 group = 'io.dgraph'
@@ -125,7 +121,7 @@ dependencies {
     testRuntimeOnly "io.opencensus:opencensus-impl:${openCensusVersion}"
 
     // Used for unmarshalling a JSON GraphQL response
-    testImplementation 'com.google.code.gson:gson:2.12.0'
+    testImplementation 'com.google.code.gson:gson:2.12.1'
 
     // Declare the dependency for your favourite test framework you want to use in your tests.
     testImplementation 'org.testng:testng:7.10.2'
@@ -134,12 +130,6 @@ dependencies {
     implementation 'javax.annotation:javax.annotation-api:1.3.2'
 }
 
-googleJavaFormat {
-    toolVersion = '1.5'
-    exclude 'src/generated/**/*.java'
-}
-compileJava.dependsOn 'googleJavaFormat'
-
 idea {
     module {
         sourceDirs += file("${projectDir}/src/generated/main/java")
@@ -165,9 +155,9 @@ task fatJar(type: Jar) {
 }
 
 tasks.named('shadowJar', ShadowJar) {
-    enableRelocation true
-    relocationPrefix 'io.dgraph.dgraph4j.shaded'
-    relocate 'google', 'io.dgraph.dgraph4j.shaded.google'
+    enableRelocation = true
+    relocationPrefix = 'io.dgraph.dgraph4j.shaded'
+    relocate('google', 'io.dgraph.dgraph4j.shaded.google')
     archiveClassifier.set('shaded')
     mergeServiceFiles()
 }
@@ -186,11 +176,11 @@ task sourceJar(type: Jar) {
 
 task updateProto(type: Exec) {
     workingDir 'src/main/proto'
-    commandLine 'wget', '-O', 'api.proto', 'https://raw.githubusercontent.com/dgraph-io/dgo/master/protos/api.proto'
+    commandLine 'wget', '-O', 'api.proto', 'https://raw.githubusercontent.com/hypermodeinc/dgo/master/protos/api.proto'
 }
 
 task setupCluster(type: Exec) {
-    workingDir System.getenv('GOPATH') + '/src/github.com/hypermodeinc/dgraph/dgraph'
+    workingDir System.getenv('GOPATH') + '/src/github.com/hypermodeinc/hypermodeinc/dgraph'
 
     commandLine './run.sh'
 }
 
@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +82,11 @@ do
 	esac
 done
 
-APP_HOME=$(cd "${APP_HOME:-./}" && pwd -P) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+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
@@ -132,23 +132,29 @@ location of your Java installation."
 	fi
 else
 	JAVACMD=java
-	which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+	if ! command -v java >/dev/null 2>&1; then
+		die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+	fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "${cygwin}" && ! "${darwin}" && ! "${nonstop}"; then
 	case ${MAX_FD} in #(
 	max*)
+		# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+		# shellcheck disable=SC2039,SC3045
 		MAX_FD=$(ulimit -H -n) ||
 			warn "Could not query maximum file descriptor limit"
 		;;
 	esac
 	case ${MAX_FD} in #(
 	'' | soft) : ;;   #(
 	*)
+		# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+		# shellcheck disable=SC2039,SC3045
 		ulimit -n "${MAX_FD}" ||
 			warn "Could not set maximum file descriptor limit to ${MAX_FD}"
 		;;
@@ -196,18 +202,26 @@ if "${cygwin}" || "${msys}"; then
 	done
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
 	"-Dorg.gradle.appname=${APP_BASE_NAME}" \
 	-classpath "${CLASSPATH}" \
 	org.gradle.wrapper.GradleWrapperMain \
 	"$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1; then
+	die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.
 
@@ -13,8 +13,10 @@
 @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
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +27,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,13 +43,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -56,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -75,13 +78,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
 
@@ -23,7 +23,7 @@ dependencies {
     testImplementation 'junit:junit:4.13.2'
 
     // https://mvnrepository.com/artifact/com.google.code.gson/gson
-    implementation 'com.google.code.gson:gson:2.12.0'
+    implementation 'com.google.code.gson:gson:2.12.1'
 }
 
 // Define the main class for the application
 
@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -83,7 +85,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$(cd "${APP_HOME:-./}" && pwd -P) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+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
@@ -129,18 +132,20 @@ location of your Java installation."
 	fi
 else
 	JAVACMD=java
-	which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+	if ! command -v java >/dev/null 2>&1; then
+		die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+	fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "${cygwin}" && ! "${darwin}" && ! "${nonstop}"; then
 	case ${MAX_FD} in #(
 	max*)
 		# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-		# shellcheck disable=SC3045
+		# shellcheck disable=SC2039,SC3045
 		MAX_FD=$(ulimit -H -n) ||
 			warn "Could not query maximum file descriptor limit"
 		;;
@@ -149,7 +154,7 @@ if ! "${cygwin}" && ! "${darwin}" && ! "${nonstop}"; then
 	'' | soft) : ;;   #(
 	*)
 		# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-		# shellcheck disable=SC3045
+		# shellcheck disable=SC2039,SC3045
 		ulimit -n "${MAX_FD}" ||
 			warn "Could not set maximum file descriptor limit to ${MAX_FD}"
 		;;
@@ -200,11 +205,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
 	"-Dorg.gradle.appname=${APP_BASE_NAME}" \
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ dependencies {`
`23`	`23`	`testImplementation 'junit:junit:4.13.2'`
`24`	`24`
`25`	`25`	`// https://mvnrepository.com/artifact/com.google.code.gson/gson`
`26`		`- implementation 'com.google.code.gson:gson:2.12.0'`
	`26`	`+ implementation 'com.google.code.gson:gson:2.12.1'`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`// Define the main class for the application`