Merge pull request #1 from navikt/gradle-updates

Gradle update, and set version properly even locally

build.gradle.kts

@@ -7,7 +7,7 @@ plugins {
 }
 
 group = "com.github.navikt"
-version = properties["version"] ?: "local-build"
+version = (if (properties["version"] != null && properties["version"] != "unspecified") properties["version"] else "local-build")!!
 
 java {
     sourceCompatibility = JavaVersion.VERSION_1_8
@@ -34,17 +34,18 @@ val test by tasks.getting(Test::class) {
     // Use junit platform for unit tests
     useJUnitPlatform()
     testLogging {
-      events("passed", "skipped", "failed")
-      showExceptions = true
-      showStackTraces = true
-      showCauses = true
-      exceptionFormat = TestExceptionFormat.FULL
-      showStandardStreams = true
+        events("passed", "skipped", "failed")
+        showExceptions = true
+        showStackTraces = true
+        showCauses = true
+        exceptionFormat = TestExceptionFormat.FULL
+        showStandardStreams = true
     }
 }
 
 tasks.withType<Wrapper> {
-  gradleVersion = "6.4.1"
+    gradleVersion = "6.4.1"
+    distributionType = Wrapper.DistributionType.ALL
 }
 
 val sourcesJar by tasks.registering(Jar::class) {

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -82,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -129,6 +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

@@ -84,6 +84,7 @@ set CMD_LINE_ARGS=%*
 
 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%