Various small adjustments

README.md

@@ -46,12 +46,12 @@ Projects are structured in arbitrarily deep folders. The plugin expects the root
 
 A single test is represented by one leaf folder. That folder **must** contain:
 
-- A `request.xml` file.
 - A `response.xml` file.
 
 Further it **can** contain:
 
 - A `test.conf` file.
+- A `request.xml` file.
 - `db_$name_pre.sql` files.
 - `db_$name_post.sql` files.
 

build.gradle

@@ -27,7 +27,6 @@ subprojects {
 
     repositories {
         jcenter()
-        mavenCentral()
     }
 
     tasks.matching { it.name.matches('compile.*Kotlin') }.all {
@@ -42,5 +41,5 @@ task clean(type: Delete) {
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = project.ext.gradleVersion
+    setGradleVersion(project.ext.gradleVersion)
 }

gradle/versions.gradle

@@ -1,5 +1,5 @@
 ext {
-    gradleVersion = '4.4'
+    gradleVersion = '4.4.1'
     squitVersion = '1.1.2-SNAPSHOT'
 
     gradlePublishVersion = '0.9.9'
@@ -30,6 +30,6 @@ ext {
 
     junitPlatformVersion = '1.0.2'
     spekVersion = '1.1.5'
-    kluentVersion = '1.32'
+    kluentVersion = '1.33'
     h2Version = '1.4.196'
 }

gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-bin.zip

squit-plugin/build.gradle

@@ -105,7 +105,7 @@ task javadocJar(type: Jar, dependsOn: dokka) {
 }
 
 jacoco {
-    toolVersion = jacocoVersion
+    setToolVersion(jacocoVersion)
     applyTo junitPlatformTest
 }
 

squit-plugin/src/main/kotlin/de/smartsquare/squit/io/FilesUtils.kt

@@ -21,17 +21,14 @@ object FilesUtils {
                 val firstNumber = first.fileName.toString().substringBefore("-").toIntOrNull()
                 val secondNumber = second.fileName.toString().substringBefore("-").toIntOrNull()
 
-                if (firstNumber != null) {
-                    if (secondNumber != null) {
-                        firstNumber.compareTo(secondNumber)
-                    } else {
-                        -1
+                when {
+                    firstNumber != null -> when {
+                        secondNumber != null -> firstNumber.compareTo(secondNumber)
+                        else -> -1
                     }
-                } else {
-                    if (secondNumber != null) {
-                        1
-                    } else {
-                        first.fileName.compareTo(second.fileName)
+                    else -> when {
+                        secondNumber != null -> 1
+                        else -> first.fileName.compareTo(second.fileName)
                     }
                 }
             })