Skip to content

Commit

Permalink
Update dependencies and fix compatibility
Browse files Browse the repository at this point in the history
  • Loading branch information
rubengees committed May 23, 2019
1 parent 095c215 commit 1576e58
Show file tree
Hide file tree
Showing 19 changed files with 68 additions and 29 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ buildscript {
}
dependencies {
classpath "de.smartsquare:squit:2.4.0"
classpath "de.smartsquare:squit:2.6.0"
}
}
```
Expand Down Expand Up @@ -247,7 +247,7 @@ repositories {
}
dependencies {
compile 'de.smartsquare:squit:2.4.0'
compile 'de.smartsquare:squit:2.6.0'
}
```

Expand Down
32 changes: 16 additions & 16 deletions gradle/versions.gradle
Original file line number Diff line number Diff line change
@@ -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'
}
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
18 changes: 17 additions & 1 deletion gradlew
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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"
Expand Down
18 changes: 17 additions & 1 deletion gradlew.bat
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
2 changes: 0 additions & 2 deletions settings.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
rootProject.name = "squit"

enableFeaturePreview('STABLE_PUBLISHING')
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -191,8 +191,7 @@ object SquitPreProcessTaskSpek : SubjectSpek<Path>({
}

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"
}
}
}
Expand Down
1 change: 1 addition & 0 deletions src/test/resources/invalid-test-project-2/settings.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
rootProject.name = "invalid-test-project-2"
1 change: 1 addition & 0 deletions src/test/resources/invalid-test-project-3/settings.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
rootProject.name = "invalid-test-project-3"
1 change: 1 addition & 0 deletions src/test/resources/invalid-test-project-4/settings.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
rootProject.name = "invalid-test-project-4"
1 change: 1 addition & 0 deletions src/test/resources/invalid-test-project/settings.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
rootProject.name = "invalid-test-project"
1 change: 1 addition & 0 deletions src/test/resources/test-project-get/settings.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
rootProject.name = "test-project-get"
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
rootProject.name = "test-project-ignore-failures"
1 change: 1 addition & 0 deletions src/test/resources/test-project-json/settings.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
rootProject.name = "test-project-json"
1 change: 1 addition & 0 deletions src/test/resources/test-project-options/settings.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
rootProject.name = "test-project-options"
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
rootProject.name = "test-project-xml-not-strict"
1 change: 1 addition & 0 deletions src/test/resources/test-project/settings.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
rootProject.name = "test-project"

0 comments on commit 1576e58

Please sign in to comment.