diff --git a/README.md b/README.md index bed5c7b5..39f4f0e6 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ buildscript { } dependencies { - classpath "de.smartsquare:squit:2.4.0" + classpath "de.smartsquare:squit:2.6.0" } } ``` @@ -247,7 +247,7 @@ repositories { } dependencies { - compile 'de.smartsquare:squit:2.4.0' + compile 'de.smartsquare:squit:2.6.0' } ``` diff --git a/gradle/versions.gradle b/gradle/versions.gradle index 911e4180..f415322a 100644 --- a/gradle/versions.gradle +++ b/gradle/versions.gradle @@ -1,39 +1,39 @@ ext { - gradleVersion = '5.1.1' - squitVersion = '2.5.0' + gradleVersion = '5.4.1' + squitVersion = '2.6.0' gradlePublishVersion = '0.10.1' - kotlinVersion = '1.3.21' - dokkaVersion = '0.9.17' + kotlinVersion = '1.3.31' + dokkaVersion = '0.9.18' - jacocoVersion = '0.8.3' + jacocoVersion = '0.8.4' jacocoTestkitVersion = '1.0.3' gradleVersionsVersion = '0.21.0' gradleTestIdeaFixVersion = '0.1.0' - jaxenVersion = '1.1.6' + jaxenVersion = '1.2.0' dom4jVersion = '2.1.1' gsonVersion = '2.8.5' xmlUnitVersion = '2.6.2' - typesafeConfigVersion = '1.3.3' - okhttpVersion = '3.13.1' + typesafeConfigVersion = '1.3.4' + okhttpVersion = '3.14.2' kotlinHtmlVersion = '0.6.12' diffUtilsVersion = '3.0' alphanumericComparatorVersion = "1.4.1" bootstrapVersion = '4.3.1' - jqueryVersion = '3.3.1' - popperVersion = '1.14.7' - fontAwesomeVersion = '5.7.2' + jqueryVersion = '3.4.1' + popperVersion = '1.15.0' + fontAwesomeVersion = '5.8.2' diff2htmlVersion = '2.7.0' - markedVersion = '0.6.1' + markedVersion = '0.6.2' detektVersion = '1.0.0-RC14' - ktlintPluginVersion = '7.0.0' + ktlintPluginVersion = '8.0.0' - junitPlatformVersion = '1.4.0' + junitPlatformVersion = '1.4.2' spekVersion = '1.2.1' - kluentVersion = '1.48' - h2Version = '1.4.198' + kluentVersion = '1.49' + h2Version = '1.4.199' } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 28861d27..5c2d1cf0 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e0b3fb8d..f4d7b2bf 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index cccdd3d5..b0d6d0ab 100755 --- a/gradlew +++ b/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 +# +# http://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="" +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" diff --git a/gradlew.bat b/gradlew.bat index f9553162..9991c503 100644 --- a/gradlew.bat +++ b/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 http://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 diff --git a/settings.gradle b/settings.gradle index f553ab22..1b67e061 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1 @@ rootProject.name = "squit" - -enableFeaturePreview('STABLE_PUBLISHING') diff --git a/src/main/kotlin/de/smartsquare/squit/report/HtmlReportWriter.kt b/src/main/kotlin/de/smartsquare/squit/report/HtmlReportWriter.kt index fcbe8b4e..85434e55 100644 --- a/src/main/kotlin/de/smartsquare/squit/report/HtmlReportWriter.kt +++ b/src/main/kotlin/de/smartsquare/squit/report/HtmlReportWriter.kt @@ -21,10 +21,10 @@ object HtmlReportWriter { private const val DIFF_CONTEXT_SIZE = 1_000_000 private const val bootstrapPath = "META-INF/resources/webjars/bootstrap/4.3.1/dist" - private const val fontAwesomePath = "META-INF/resources/webjars/font-awesome/5.7.2" - private const val jqueryPath = "META-INF/resources/webjars/jquery/3.3.1/dist" - private const val popperJsPath = "META-INF/resources/webjars/popper.js/1.14.7/dist/umd" - private const val markedPath = "META-INF/resources/webjars/marked/0.6.1" + private const val fontAwesomePath = "META-INF/resources/webjars/font-awesome/5.8.2" + private const val jqueryPath = "META-INF/resources/webjars/jquery/3.4.1/dist" + private const val popperJsPath = "META-INF/resources/webjars/popper.js/1.15.0/dist/umd" + private const val markedPath = "META-INF/resources/webjars/marked/0.6.2" private const val diff2htmlPath = "META-INF/resources/webjars/diff2html/2.7.0" private val resources = arrayOf( diff --git a/src/test/kotlin/de/smartsquare/squit/task/SquitPreProcessTaskSpek.kt b/src/test/kotlin/de/smartsquare/squit/task/SquitPreProcessTaskSpek.kt index 344ec9a0..65818f84 100644 --- a/src/test/kotlin/de/smartsquare/squit/task/SquitPreProcessTaskSpek.kt +++ b/src/test/kotlin/de/smartsquare/squit/task/SquitPreProcessTaskSpek.kt @@ -191,8 +191,7 @@ object SquitPreProcessTaskSpek : SubjectSpek({ } it("should print an appropriate message") { - result.output shouldContain "Invalid test.conf file on path of test: project${File.separator}call1 " + - "(No configuration setting found for key 'endpoint')" + result.output shouldContain "Invalid test.conf file on path of test: project${File.separator}call1" } } } diff --git a/src/test/resources/invalid-test-project-2/settings.gradle b/src/test/resources/invalid-test-project-2/settings.gradle new file mode 100644 index 00000000..7d71319a --- /dev/null +++ b/src/test/resources/invalid-test-project-2/settings.gradle @@ -0,0 +1 @@ +rootProject.name = "invalid-test-project-2" diff --git a/src/test/resources/invalid-test-project-3/settings.gradle b/src/test/resources/invalid-test-project-3/settings.gradle new file mode 100644 index 00000000..4ce5a1e0 --- /dev/null +++ b/src/test/resources/invalid-test-project-3/settings.gradle @@ -0,0 +1 @@ +rootProject.name = "invalid-test-project-3" diff --git a/src/test/resources/invalid-test-project-4/settings.gradle b/src/test/resources/invalid-test-project-4/settings.gradle new file mode 100644 index 00000000..9f90ff43 --- /dev/null +++ b/src/test/resources/invalid-test-project-4/settings.gradle @@ -0,0 +1 @@ +rootProject.name = "invalid-test-project-4" diff --git a/src/test/resources/invalid-test-project/settings.gradle b/src/test/resources/invalid-test-project/settings.gradle new file mode 100644 index 00000000..e1bbfcf9 --- /dev/null +++ b/src/test/resources/invalid-test-project/settings.gradle @@ -0,0 +1 @@ +rootProject.name = "invalid-test-project" diff --git a/src/test/resources/test-project-get/settings.gradle b/src/test/resources/test-project-get/settings.gradle new file mode 100644 index 00000000..0290e300 --- /dev/null +++ b/src/test/resources/test-project-get/settings.gradle @@ -0,0 +1 @@ +rootProject.name = "test-project-get" diff --git a/src/test/resources/test-project-ignore-failures/settings.gradle b/src/test/resources/test-project-ignore-failures/settings.gradle new file mode 100644 index 00000000..2150a224 --- /dev/null +++ b/src/test/resources/test-project-ignore-failures/settings.gradle @@ -0,0 +1 @@ +rootProject.name = "test-project-ignore-failures" diff --git a/src/test/resources/test-project-json/settings.gradle b/src/test/resources/test-project-json/settings.gradle new file mode 100644 index 00000000..d83a497d --- /dev/null +++ b/src/test/resources/test-project-json/settings.gradle @@ -0,0 +1 @@ +rootProject.name = "test-project-json" diff --git a/src/test/resources/test-project-options/settings.gradle b/src/test/resources/test-project-options/settings.gradle new file mode 100644 index 00000000..f103b0de --- /dev/null +++ b/src/test/resources/test-project-options/settings.gradle @@ -0,0 +1 @@ +rootProject.name = "test-project-options" diff --git a/src/test/resources/test-project-xml-not-strict/settings.gradle b/src/test/resources/test-project-xml-not-strict/settings.gradle new file mode 100644 index 00000000..73b792ee --- /dev/null +++ b/src/test/resources/test-project-xml-not-strict/settings.gradle @@ -0,0 +1 @@ +rootProject.name = "test-project-xml-not-strict" diff --git a/src/test/resources/test-project/settings.gradle b/src/test/resources/test-project/settings.gradle new file mode 100644 index 00000000..89839270 --- /dev/null +++ b/src/test/resources/test-project/settings.gradle @@ -0,0 +1 @@ +rootProject.name = "test-project"