Tweaked the build

Author: jamesbassett

.travis.yml

@@ -1,6 +1,6 @@
 language: java
 sudo: true
-jdk: oraclejdk8
+jdk: openjdk8
 script: "./gradle/travisBuild.sh"
 before_cache:
   - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock

build.gradle

@@ -1,11 +1,10 @@
 
 plugins {
-    id 'nebula.maven-publish' version '7.0.1'
-    id 'nebula.nebula-bintray' version '3.5.2'
-    id 'nebula.project' version '3.4.0'
-    id 'nebula.release' version '6.3.0'
-    id 'org.jetbrains.kotlin.jvm' version '1.3.61'
-    id 'org.jetbrains.kotlin.kapt' version '1.3.61'
+    id 'nebula.project' version '7.0.5'
+    id 'nebula.release' version '14.0.2'
+    id 'nebula.kotlin' version '1.3.61'
+    id 'nebula.maven-publish' version '14.1.1'
+    id 'com.jfrog.bintray' version '1.8.4'
 }
 
 group 'au.com.console'
@@ -18,26 +17,26 @@ sourceCompatibility = JavaVersion.VERSION_1_8
 targetCompatibility = JavaVersion.VERSION_1_8
 
 dependencies {
-    compile 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.61'
-    compile 'org.jetbrains.kotlin:kotlin-reflect:1.3.61'
-    compile 'org.springframework.data:spring-data-jpa:2.2.2.RELEASE'
+    api 'org.jetbrains.kotlin:kotlin-reflect'
+    api 'org.springframework.data:spring-data-jpa:2.2.4.RELEASE'
     compileOnly 'org.hibernate.javax.persistence:hibernate-jpa-2.1-api:1.0.2.Final'
-    testCompile 'org.springframework.boot:spring-boot-starter-data-jpa:2.2.2.RELEASE'
-    testCompile 'com.h2database:h2:1.4.191'
-    testCompile 'org.springframework.boot:spring-boot-starter-test:2.2.2.RELEASE'
-    testCompile 'org.junit.jupiter:junit-jupiter-api:5.5.2'
+    testApi 'org.springframework.boot:spring-boot-starter-data-jpa:2.2.2.RELEASE'
+    testApi 'com.h2database:h2:1.4.191'
+    testApi 'org.springframework.boot:spring-boot-starter-test:2.2.4.RELEASE'
+    testApi 'org.junit.jupiter:junit-jupiter-api:5.5.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.5.2'
+}
+
+test {
+    useJUnitPlatform()
 }
 
 tasks.bintrayUpload.dependsOn tasks.check
-tasks.artifactoryPublish.dependsOn tasks.check
 
 gradle.taskGraph.whenReady { graph ->
     tasks.bintrayUpload.onlyIf {
         graph.hasTask(':final') || graph.hasTask(':candidate')
     }
-    tasks.artifactoryPublish.onlyIf {
-        graph.hasTask(':snapshot') || graph.hasTask(':devSnapshot')
-    }
 }
 
 bintray {
@@ -56,16 +55,4 @@ bintray {
         issueTrackerUrl = "https://github.com/consoleau/${project.name}/issues"
         vcsUrl = "https://github.com/consoleau/${project.name}.git"
     }
-}
-
-test {
-    useJUnitPlatform()
-}
-
-compileKotlin {
-    jvmTarget = JavaVersion.VERSION_1_8
-}
-
-compileTestKotlin {
-    jvmTarget = JavaVersion.VERSION_1_8
 }

gradle/travisBuild.sh

@@ -2,7 +2,7 @@
 # This script will build the project.
 # Based on https://github.com/nebula-plugins/nebula-kotlin-plugin/blob/master/gradle/buildViaTravis.sh
 
-SWITCHES="-x artifactoryPublish --info --stacktrace"
+SWITCHES="--info --stacktrace"
 
 GRADLE_VERSION=$(./gradlew -version | grep Gradle | cut -d ' ' -f 2)
 

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,5 @@
-#Sat Jan 18 05:43:16 KST 2020
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -1,4 +1,20 @@
-#!/usr/bin/env bash
+#!/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.
+#
 
 ##############################################################################
 ##
@@ -28,16 +44,16 @@ 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=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -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
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
     JAVACMD=`cygpath --unix "$JAVACMD"`
@@ -154,16 +170,19 @@ if $cygwin ; then
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
 # by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [[ "$(uname)" == "Darwin" ]] && [[ "$HOME" == "$PWD" ]]; then
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
   cd "$(dirname "$0")"
 fi
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+exec "$JAVACMD" "$@"

gradlew

@@ -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=
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome