Skip to content

Commit 986bf39

Browse files
committed
Update dependencies
1 parent 2bcd9cf commit 986bf39

File tree

9 files changed

+18
-17
lines changed

9 files changed

+18
-17
lines changed

build.gradle.kts

+6-6
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ plugins {
1313
id("com.github.ben-manes.versions") version "0.28.0"
1414

1515
// Plugin which can update Gradle dependencies, use help/useLatestVersions
16-
id("se.patrikerdes.use-latest-versions") version "0.2.13"
16+
id("se.patrikerdes.use-latest-versions") version "0.2.14"
1717

1818
// Test coverage
1919
jacoco
@@ -35,9 +35,9 @@ dependencies {
3535
implementation(kotlin("test-junit"))
3636

3737
// JUnit 5
38-
testImplementation("org.junit.jupiter:junit-jupiter-api:5.6.2")
39-
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.6.2")
40-
testRuntimeOnly("org.junit.platform:junit-platform-console:1.6.2")
38+
testImplementation("org.junit.jupiter:junit-jupiter-api:5.7.0-M1")
39+
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.7.0-M1")
40+
testRuntimeOnly("org.junit.platform:junit-platform-console:1.7.0-M1")
4141

4242
// Kotlintest
4343
testImplementation("io.kotlintest:kotlintest-core:3.4.2")
@@ -51,8 +51,8 @@ dependencies {
5151
// testImplementation("org.testfx:openjfx-monocle:8u76-b04") // jdk-9+181 for Java 9
5252

5353
// Spek
54-
testImplementation("org.spekframework.spek2:spek-dsl-jvm:2.0.10")
55-
testImplementation("org.spekframework.spek2:spek-runner-junit5:2.0.10")
54+
testImplementation("org.spekframework.spek2:spek-dsl-jvm:2.0.11")
55+
testImplementation("org.spekframework.spek2:spek-runner-junit5:2.0.11")
5656
}
5757

5858
repositories {

gradle/wrapper/gradle-wrapper.jar

215 Bytes
Binary file not shown.
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.4-rc-1-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

gradlew

+2
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ esac
8282

8383
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
8484

85+
8586
# Determine the Java command to use to start the JVM.
8687
if [ -n "$JAVA_HOME" ] ; then
8788
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -129,6 +130,7 @@ fi
129130
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
130131
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
131132
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
133+
132134
JAVACMD=`cygpath --unix "$JAVACMD"`
133135

134136
# We build the pattern for arguments to be converted via cygpath

gradlew.bat

+4
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
2929
set APP_BASE_NAME=%~n0
3030
set APP_HOME=%DIRNAME%
3131

32+
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
33+
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
34+
3235
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
3336
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
3437

@@ -81,6 +84,7 @@ set CMD_LINE_ARGS=%*
8184

8285
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
8386

87+
8488
@rem Execute Gradle
8589
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
8690

src/main/kotlin/nl.deltadak.ktemplate/HelloJavaFX.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class HelloJavaFX : Application() {
2424
primaryStage.title = "Hello World!"
2525
val btn = Button()
2626
btn.text = "Say 1+1"
27-
btn.setOnAction { _ -> println(calculate()) }
27+
btn.setOnAction { println(calculate()) }
2828

2929
val spinner = Spinner<Int>()
3030

@@ -59,7 +59,7 @@ class HelloJavaFX : Application() {
5959
* Start application.
6060
*/
6161
fun main(args: Array<String>) {
62-
Application.launch(*args)
62+
launch(*args)
6363
}
6464

6565
}

src/test/kotlin/nl/deltadak/ktemplate/KotlinJUnitSpekTest.kt

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
package nl.deltadak.ktemplate
22

3-
import org.spekframework.spek2.style.gherkin.Feature
4-
import org.spekframework.spek2.Spek
53
import org.junit.jupiter.api.Assertions.assertEquals
6-
import org.junit.jupiter.api.Assertions.fail
4+
import org.spekframework.spek2.Spek
5+
import org.spekframework.spek2.style.gherkin.Feature
76

87
object KotlinJUnitSpekTest: Spek({
98
Feature("Empty feature") {

src/test/kotlin/nl/deltadak/ktemplate/KotlinJUnitSpekTestFXTest.kt

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package nl.deltadak.ktemplate
22

33
import javafx.scene.control.ProgressIndicator
4-
import junit.framework.TestCase.fail
54
import org.junit.jupiter.api.Assertions
65
import org.spekframework.spek2.Spek
76
import org.spekframework.spek2.style.gherkin.Feature

src/test/kotlin/nl/deltadak/ktemplate/KotlinJUnitTestFXTest.kt

+1-4
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,12 @@ package nl.deltadak.ktemplate
22

33

44
import javafx.scene.control.ProgressIndicator
5-
import org.junit.jupiter.api.Assertions.assertFalse
5+
import org.junit.jupiter.api.Assertions.assertTrue
66
import org.junit.jupiter.api.Test
77
import org.testfx.api.FxRobot
88
import org.testfx.api.FxToolkit
9-
109
import java.util.concurrent.TimeoutException
1110

12-
import org.junit.jupiter.api.Assertions.assertTrue
13-
1411
/**
1512
* Test general JavaFX components.
1613
*/

0 commit comments

Comments
 (0)