Update gradle wrapper

Add gradle properties

Signed-off-by: Chris Cromer <chris@cromer.cl>

.idea/copyright/profiles_settings.xml

@@ -2,6 +2,7 @@
   <settings default="BSD3">
     <module2copyright>
       <element module="All" copyright="BSD3" />
+      <element module="Project Files" copyright="BSD3" />
     </module2copyright>
   </settings>
 </component>

build.gradle

@@ -16,18 +16,17 @@
 plugins {
     id 'java'
     id 'application'
+    id 'distribution'
 }
 
 group 'cl.cromer.azaraka'
 version '1.0.0'
 
-// These are used, so ignore the inspections
-//noinspection GroovyUnusedAssignment
 sourceCompatibility = 1.8
-//noinspection GroovyUnusedAssignment
 targetCompatibility = 1.8
 
-mainClassName = "cl.cromer.azaraka.Azaraka"
+applicationName = 'Azaraka'
+mainClassName = 'cl.cromer.azaraka.Azaraka'
 
 repositories {
     mavenCentral()
@@ -38,18 +37,29 @@ dependencies {
     //testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.+'
 }
 
-jar {
+ext.sharedManifest = manifest {
-    manifest {
+    attributes 'Main-Class': "$mainClassName",
-        attributes "Main-Class": "$mainClassName",
             'Class-Path': configurations.default.files.collect { "$it.name" }.join(' '),
-                "Implementation-Title": "Gradle",
+            'Implementation-Title': 'Gradle',
-                "Implementation-Version": "$gradle.gradleVersion"
+            'Implementation-Version': "$gradle.gradleVersion"
 }
 
-    // This adds the libs into the jar
+jar {
-    /*from {
+    manifest = project.manifest {
-        configurations.default.collect { it.isDirectory() ? it : zipTree(it) }
+        from sharedManifest
-    }*/
+    }
+
+    if (project.uberJar == "true") {
+        from sourceSets.main.output
+
+        dependsOn configurations.runtimeClasspath
+        from {
+            configurations.runtimeClasspath.findAll { it.name.endsWith('jar') }.collect { zipTree(it) }
+        }
+    }
+    else {
+        dependsOn tasks.withType(Copy)
+    }
 }
 
 task copyDependencies(type: Copy) {
@@ -57,15 +67,10 @@ task copyDependencies(type: Copy) {
     into "$buildDir/libs"
 }
 
-build {
-    dependsOn copyDependencies
-}
-
 plugins.withType(DistributionPlugin) {
     distTar {
-        // This is a correct assignment and works as intended
+        //noinspection GroovyAssignabilityCheck, GroovyAccessibility
-        //noinspection GroovyAssignabilityCheck
+        archiveExtension = 'tar.gz'
-        archiveExtension = "tar.gz"
         compression = Compression.GZIP
     }
 }
@@ -76,22 +81,15 @@ task createDocs {
 }
 
 distributions {
-    //noinspection GroovyAssignabilityCheck
     main {
-        //noinspection GrUnresolvedAccess
         contents {
-            //noinspection GrUnresolvedAccess
             from(createDocs) {
-                //noinspection GrUnresolvedAccess
                 into 'docs'
             }
         }
     }
 }
 
-jar.dependsOn(copyDependencies)
+wrapper{
-
+    gradleVersion = '5.6.2'
-tasks.withType(JavaCompile) {
-    options.fork = true
-    options.incremental = true
 }

gradle.properties

@@ -0,0 +1,18 @@
+#
+# Copyright 2019 Chris Cromer
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+#
+# 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+#
+
+org.gradle.caching=true
+org.gradle.parallel=true
+uberJar=false

gradle/wrapper/gradle-wrapper.properties

@@ -12,8 +12,9 @@
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 #
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip
+
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

gradlew

@@ -1,5 +1,21 @@
 #!/usr/bin/env sh
 
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$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"'
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
@@ -109,8 +125,8 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
+# For Cygwin or MSYS, switch paths to Windows format before running java
-if $cygwin ; then
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
     JAVACMD=`cygpath --unix "$JAVACMD"`

gradlew.bat

@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -14,7 +30,7 @@ set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m"
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome

settings.gradle

@@ -14,4 +14,3 @@
  */
 
 rootProject.name = 'Azaraka'
-