added ProjectVersion class and travis.yaml

.classpath

@@ -25,6 +25,8 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="src" path="buildScriptTest/src/test/kotlin"/>
+	<classpathentry kind="src" path="buildSrc/src/test/kotlin"/>
+	<classpathentry kind="src" path="buildSrc/src/main/kotlin"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-12/"/>
 	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
 	<classpathentry kind="output" path="bin/default"/>

.travis.yml

@@ -0,0 +1,8 @@
+language: java
+script:
+  - ./buildSrc/gradlew assemble
+  - ./buildSrc/gradlew check
+  - ./buildSrc/gradlew lintKotlin
+  - ./buildScriptTest/gradlew assemble
+  - ./buildScriptTest/gradlew check
+  - ./buildScriptTest/gradlew lintKotlin

build.gradle.kts

@@ -1,5 +1,8 @@
+import org.steinko.projectversion.ProjectVersion
 
 val myProp: String by extra
 extra["myProp"] = "myValue"
 
 val someOtherProp by extra(123) 
+
+version = ProjectVersion(0,1)

buildScriptTest/build.gradle.kts

@@ -1,24 +1,12 @@
-/*
- * This file was generated by the Gradle 'init' task.
- *
- * This generated file contains a sample Kotlin application project to get you started.
- */
-
 plugins {
-    // Apply the Kotlin JVM plugin to add support for Kotlin.
-    id("org.jetbrains.kotlin.jvm") version "1.3.41"
-
-    // Apply the application plugin to add support for building a CLI application.
-    application
 
+    id("org.jetbrains.kotlin.jvm") version "1.3.41"
     id("org.jmailen.kotlinter") version "2.1.1"
 }
 
 repositories {
      mavenCentral()
      jcenter()
-
-    // add Spek 2 development repository
 }
 
 val kotlinVersion = "1.3.50"
@@ -44,11 +32,8 @@ dependencies {
 
     testImplementation  (gradleApi())
     testImplementation (gradleTestKit())
-}
-
-application {
-    // Define the main class for the application
-    mainClassName = "org.steinko.projectversion.AppKt"
+
+    testImplementation ("com.willowtreeapps.assertk:assertk-jvm:0.19")
 }
 
 tasks {

buildScriptTest/src/test/kotlin/org/steinko/projectversion/BuildScriptSystemTest.kt

@@ -1,39 +1,37 @@
 package org.steinko.projectversion
 
-import org.junit.jupiter.api.Assertions.assertEquals
-
+import assertk.assertThat
+import assertk.assertions.contains
+import java.io.File
+import org.gradle.testkit.runner.BuildResult
+import org.gradle.testkit.runner.GradleRunner
 import org.spekframework.spek2.Spek
 import org.spekframework.spek2.style.gherkin.Feature
 
-import org.gradle.testkit.runner.GradleRunner
-import org.gradle.testkit.runner.BuildResult
+object BuildScriptSystemTest : Spek({
+    Feature("Build Script System Test") {
+        Scenario("Test Properties") {
 
-import org.junit.jupiter.api.Assertions.assertTrue
+            var result: BuildResult = GradleRunner.create()
+                .withProjectDir(File(ProjectDir.path()))
+                .withArguments("properties")
+                .build()
 
-import java.io.File
+                Then("should test build script") {
+                    assertThat(result.getOutput()).contains("BUILD SUCCESSFUL")
+                }
+
+                Then("should contain a property myProp with value myValue ") {
+                    assertThat(result.getOutput()).contains("myProp: myValue")
+                }
 
+                Then("should contain a property someOtherPrpo with value 123") {
+                    assertThat(result.getOutput()).contains("someOtherProp: 123")
+                }
 
-object BuildScriptSystemTest : Spek({ 
-    Feature("Build Script System Test")  { 
-       Scenario("Test Properties") {
-
-         var result: BuildResult = GradleRunner.create()
-		    .withProjectDir(File(ProjectDir.path()))
-		    .withArguments("properties")
-		    .build()	
-
-	      Then( "should test build script") {
-		   assertTrue(result.output.contains("BUILD SUCCESSFUL"))
-	      }
-
-	      Then( "should contain a property myProp with value myValue ") {
-		   assertTrue(result.output.contains("myProp: myValue"))
-	       }
-
-    	  Then( "should contain a property someOtherPrpo with value 123"){
-		    assertTrue(result.output.contains("someOtherProp: 123"))	
-	       }
-
-	    }
-	 }
-})
+                Then("should contain Version: 0.1-SNAPSHOT") {
+                    assertThat(result.getOutput()).contains("version: 0.1-SNAPSHOT")
+                }
+        }
+        }
+})

buildScriptTest/src/test/kotlin/org/steinko/projectversion/ProjectDir.kt

@@ -1,7 +1,9 @@
 package org.steinko.projectversion
 
-class ProjectDir { 
-   companion object {
-	   fun path(): String { return "/Users/steinkorsveien/Development/TestWorkSpace/ProjectVersionKt"  }
-	}
-}
+class ProjectDir {
+    companion object {
+        fun path(): String {
+            return "/Users/steinkorsveien/Development/TestWorkSpace/ProjectVersionKt"
+        }
+    }
+}

buildSrc/build.gradle.kts

@@ -0,0 +1,41 @@
+plugins {
+
+    id("org.jetbrains.kotlin.jvm") version "1.3.41"
+    id("org.jmailen.kotlinter") version "2.1.1"
+}
+
+repositories {
+    jcenter()
+}
+
+val spek2Version = "2.0.7"
+
+dependencies {
+    // Align versions of all Kotlin components
+    implementation(platform("org.jetbrains.kotlin:kotlin-bom"))
+
+    // Use the Kotlin JDK 8 standard library.
+    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
+
+    // Use the Kotlin test library.
+    testImplementation("org.jetbrains.kotlin:kotlin-test")
+
+    // Use the Kotlin JUnit integration.
+    testImplementation("org.jetbrains.kotlin:kotlin-test-junit")
+
+     // include JUnit 5 assertions
+    testImplementation ("org.junit.jupiter:junit-jupiter-api:5.2.0")
+    testImplementation ("org.spekframework.spek2:spek-dsl-jvm:$spek2Version")
+    testRuntimeOnly ("org.spekframework.spek2:spek-runner-junit5:$spek2Version")
+
+    // include JUnit 5 test engine
+    testRuntimeOnly ("org.junit.jupiter:junit-jupiter-engine:5.2.0") 
+
+}
+
+tasks {
+    // Use the built-in JUnit support of Gradle.
+    "test"(Test::class) {
+        useJUnitPlatform()
+    }
+}

buildSrc/gradle/wrapper/gradle-wrapper.properties

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

buildSrc/gradlew

@@ -0,0 +1,188 @@
+#!/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
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+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" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+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
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+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.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# 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"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+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
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"