- Use native gradle build to generate jar with dependencies, removed shadowJar plugin

- Upgrade gradle to 6.7.1

README.md

@@ -13,11 +13,11 @@ From the root of the project execute the below commands
 ```
 - To build jar
 ```shell script
-./gradlew shadowJar
+./gradlew build
 ```
 - All combined
 ```shell script
-./gradlew clean test shadowJar
+./gradlew clean test build
 ```
 
 ## Run

build.gradle

@@ -1,6 +1,5 @@
 plugins {
     id "scala"
-    id "com.github.johnrengelman.shadow" version "${shadowJarPluginVersion}"
 }
 
 group "${projectGroup}"
@@ -31,15 +30,16 @@ task scalaTest(dependsOn: ['testClasses'], type: JavaExec) {
 
 test.dependsOn scalaTest
 
-shadowJar {
+jar {
-    mergeServiceFiles()
-    zip64 true
     manifest {
         attributes "Main-Class": "${mainClass}"
     }
+    from {
+        configurations.compile.collect { it.isDirectory() ? it : zipTree(it) }
+    }
     archiveFileName.set("${getArchiveBaseName().get()}-${projectVersion}.${getArchiveExtension().get()}")
 }
 
 clean.doFirst {
     delete "logs/"
-}
+}

gradle.properties

@@ -1,11 +1,9 @@
 scalaMajorVersion=2.12
 scalaMinorVersion=10
 
-apacheSparkVersion=3.0.0
+apacheSparkVersion=3.0.1
 
-scalaTestVersion=3.1.2
+scalaTestVersion=3.2.3
-
-shadowJarPluginVersion=6.0.0
 
 mainClass=com.barrelsofdata.sparkexamples.Driver
 projectGroup=com.barrelsofdata.sparkexamples

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -130,7 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath

gradlew.bat

@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,21 +64,6 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
@@ -86,7 +71,7 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell