Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/jvm-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ jobs:
strategy:
fail-fast: false
matrix:
jre: [11]
jre: [17]
os: [ubuntu-latest, windows-latest]
include:
- jre: 17
- jre: 21
os: ubuntu-latest
runs-on: ${{ matrix.os }}
steps:
Expand Down
3 changes: 3 additions & 0 deletions jvm/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased]
### Fixed
- Unsupported test sources (such as `FieldSource`) no longer cause the JUnit5 runner to crash. ([#550](https://github.com/diffplug/selfie/pull/550) fixes [#549](https://github.com/diffplug/selfie/issues/549))
### Changed
- Bump minimum required Kotest from `5.4.0` to `5.6.0` ([#535](https://github.com/diffplug/selfie/pull/535))
- required to fix `java.lang.NoSuchMethodError: 'long kotlin.time.Duration$Companion.milliseconds-UwyO8pc(long)'`

## [2.5.3] - 2025-05-21
### Fixed
Expand Down
2 changes: 1 addition & 1 deletion jvm/example-junit5/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ dependencies {
testImplementation 'io.jooby:jooby-test:3.2.3'
testImplementation "org.junit.jupiter:junit-jupiter:$ver_JUNIT_USE"
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
testImplementation 'io.rest-assured:rest-assured:5.4.0'
testImplementation 'io.rest-assured:rest-assured:5.5.0'
testImplementation 'org.assertj:assertj-core:3.27.3'
testImplementation project(':selfie-runner-junit5')
testImplementation 'org.jsoup:jsoup:1.17.2'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ public class LoginFlowTest {
public void loginFlow(Jooby app) {
expectSelfie(get("/")).toMatchDisk("1. not logged in").facet("md").toBe("Please login");
expectSelfie(given().param("email", "user@domain.com").post("/login")).toMatchDisk("2. post login form")
.facet("md").toBe("""
.facet("md").toBe(
"""
Email sent!

Check your email for your login link.""");
Expand All @@ -27,15 +28,17 @@ public void loginFlow(Jooby app) {
.facet("md").toBe("Click [here](https://www.example.com/login-confirm/erjchFY=) to login.");

expectSelfie(get("/login-confirm/erjchFY=")).toMatchDisk("4. open login email link")
.facets("", "cookies").toBe("""
.facets("", "cookies").toBe(
"""
REDIRECT 302 Found to /
╔═ [cookies] ═╗
login=user@domain.com|JclThw==;Path=/""");
expectSelfie(given().cookie("login", "user@domain.com|JclThw==").get("/")).toMatchDisk("5. should be logged in")
.facet("md").toBe("Welcome back user@domain.com");

expectSelfie(given().cookie("login", "user@domain.com|badsignature").get("/")).toMatchDisk("6. bad signature should fail")
.facets("md").toBe("""
.facets("md").toBe(
"""
Unauthorized

status code: 401""");
Expand Down
12 changes: 6 additions & 6 deletions jvm/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ maven_group=com.diffplug.selfie
javadoc_links=
org.gradle.configuration-cache=true

ver_JUNIT_USE=5.10.3
ver_JUNIT_PIONEER=2.2.0
ver_OKIO=3.9.0
ver_JUNIT_USE=5.13.4
ver_JUNIT_PIONEER=2.3.0
ver_OKIO=3.16.0
ver_KOTLIN_TEST=2.0.0
ver_KOTLIN_SERIALIZATION=1.7.3
# Kotest 5.4.0 is the oldest that we support
ver_KOTEST=5.4.0
ver_KOTLIN_SERIALIZATION=1.9.0
# Kotest 5.6.0 is the oldest that we support
ver_KOTEST=5.6.0

ver_JVM_TARGET=11
2 changes: 1 addition & 1 deletion jvm/gradle/spotless.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ spotless {
groovyGradle {
target '*.gradle', 'buildSrc/*.gradle'
greclipse()
indentWithSpaces(2)
leadingTabsToSpaces(2)
}
if (plugins.hasPlugin('org.jetbrains.kotlin.jvm') || plugins.hasPlugin('org.jetbrains.kotlin.multiplatform')) {
kotlin {
Expand Down
Binary file modified jvm/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion jvm/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
5 changes: 2 additions & 3 deletions jvm/gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,7 @@ done
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
' "$PWD" ) || exit
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down Expand Up @@ -206,7 +205,7 @@ fi
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

# Collect all arguments for the java command:
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
# and any embedded shellness will be escaped.
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
# treated as '${Hostname}' itself on the command line.
Expand Down
Loading
Loading