Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update plugins, deps, actions, and docs #761

Merged
merged 7 commits into from
Sep 13, 2023
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 10 additions & 10 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
name: Gradle wrapper validation
steps:
- name: Check out repo
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Validate Gradle wrapper
uses: gradle/wrapper-validation-action@v1

Expand All @@ -58,7 +58,7 @@ jobs:
name: with Java 11 on ${{ matrix.os }}
steps:
- name: Check out repo
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
# Sonar needs the whole Git history for issue assignment
fetch-depth: 0
Expand All @@ -70,7 +70,7 @@ jobs:
cache: 'gradle'
- name: Cache SonarCloud results
if: ${{ matrix.os == 'ubuntu' }}
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/.sonar/cache/
key: ubuntu-sonar
Expand All @@ -93,7 +93,7 @@ jobs:
name: Code format check
steps:
- name: Check out repo
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Set up Java
uses: actions/setup-java@v3
with:
Expand All @@ -117,12 +117,12 @@ jobs:
strategy:
matrix:
java: [ 11, 17, 20 ]
junit-version: [ '5.9.2' ]
junit-version: [ '5.9.2', '5.10.0' ]
os: [ubuntu, macos, windows]
name: with Java ${{ matrix.java }}, JUnit ${{ matrix.junit-version }} on ${{ matrix.os }}
steps:
- name: Check out repo
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Set up Java
uses: actions/setup-java@v3
with:
Expand All @@ -145,14 +145,14 @@ jobs:
timeout-minutes: 15
strategy:
matrix:
junit-version: [ '5.9.2' ]
junit-version: [ '5.9.2', '5.10.0' ]
os: [ubuntu, macos, windows]
name: Experimental build with newest JDK early-access build and Gradle release candidate
# Gradle doesn't work with JDK EA builds, so we launch it with a supported Java version,
# but set the Gradle toolchain to use the experimental version.
steps:
- name: Check out repo
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Set up experimental Java
uses: oracle-actions/setup-java@v1
with:
Expand Down Expand Up @@ -188,7 +188,7 @@ jobs:
name: Release Pioneer into the wild
steps:
- name: Check out repo
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
# Shipkit needs the whole Git history for changelog generation
fetch-depth: 0
Expand Down Expand Up @@ -225,7 +225,7 @@ jobs:
name: Update website
steps:
- name: Trigger website build
uses: peter-evans/repository-dispatch@v1
uses: peter-evans/repository-dispatch@v2
with:
token: ${{ secrets.GH_WRITE_TOKEN }}
repository: junit-pioneer/junit-pioneer.github.io
Expand Down
10 changes: 7 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,12 @@ Classes usually belong into one of these packages:

* `org.junitpioneer.internal` - code intended to be shared across various extensions
* `org.junitpioneer.jupiter` - extensions to JUnit Jupiter
* `....issue` - implementation details of issue extension
* `....params` - extensions for Jupiter's `@ParameterizedTest`
* `...cartesian` - implementation details of Cartesian product extension
* `...converter` - argument converters for Jupiter's `ArgumentConverter`
* `...issue` - implementation details of issue extension
* `...json` - JSON argument sources for Jupiter's `@ParameterizedTest`
* `...params` - extensions for Jupiter's `@ParameterizedTest`
* `...resource` - extensions for injecting resources
* `org.junitpioneer.vintage` - extensions to older JUnit versions

If none of them is a good fit, we'll find one together.
Expand Down Expand Up @@ -535,7 +539,7 @@ Of course, we want to avoid our own dependency hell, so each dependency should s

#### Updates

To keep dependencies up to date, run `gradle dependencyUpdates`, which lists all dependencies for which a newer version exists.
To keep dependencies up to date, run `./gradlew dependencyUpdates`, which lists all dependencies for which a newer version exists.
Updates then need to be done manually.
To keep the commit history clean, these should be done in bulk every few weeks.

Expand Down
18 changes: 9 additions & 9 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ plugins {
checkstyle
`maven-publish`
signing
id("com.diffplug.spotless") version "6.18.0"
id("com.diffplug.spotless") version "6.21.0"
id("at.zierler.yamlvalidator") version "1.5.0"
id("org.sonarqube") version "4.0.0.2929"
id("org.sonarqube") version "4.3.1.3277"
id("org.shipkit.shipkit-changelog") version "1.2.0"
id("org.shipkit.shipkit-github-release") version "1.2.0"
id("com.github.ben-manes.versions") version "0.46.0"
id("com.github.ben-manes.versions") version "0.48.0"
id("io.github.gradle-nexus.publish-plugin") version "1.3.0"
id("org.gradlex.extra-java-module-info") version "1.3"
id("org.gradlex.extra-java-module-info") version "1.4.2"
}

plugins.withType<JavaPlugin>().configureEach {
Expand Down Expand Up @@ -52,7 +52,7 @@ val junitVersion : String by project
val jacksonVersion: String = "2.14.2"
val assertjVersion: String = "3.24.2"
val log4jVersion: String = "2.20.0"
val jimfsVersion: String = "1.2"
val jimfsVersion: String = "1.3.0"

dependencies {
implementation(platform("org.junit:junit-bom:$junitVersion"))
Expand All @@ -66,9 +66,9 @@ dependencies {
testImplementation(group = "org.junit.platform", name = "junit-platform-testkit")

testImplementation(group = "org.assertj", name = "assertj-core", version = assertjVersion)
testImplementation(group = "org.mockito", name = "mockito-core", version = "4.11.0")
testImplementation(group = "org.mockito", name = "mockito-core", version = "5.5.0")
testImplementation(group = "com.google.jimfs", name = "jimfs", version = jimfsVersion)
testImplementation(group = "nl.jqno.equalsverifier", name = "equalsverifier", version = "3.14.1")
testImplementation(group = "nl.jqno.equalsverifier", name = "equalsverifier", version = "3.15.1")

testRuntimeOnly(group = "org.apache.logging.log4j", name = "log4j-core", version = log4jVersion)
testRuntimeOnly(group = "org.apache.logging.log4j", name = "log4j-jul", version = log4jVersion)
Expand Down Expand Up @@ -216,7 +216,7 @@ tasks {

if (project.version != "unspecified") {
// Add version to Java modules
options.javaModuleVersion.set(project.version.toString());
options.javaModuleVersion.set(project.version.toString())
}
}

Expand Down Expand Up @@ -341,7 +341,7 @@ tasks {
enabled = !experimentalBuild
reports {
xml.required.set(true)
xml.outputLocation.set(file("${buildDir}/reports/jacoco/report.xml"))
xml.outputLocation.set(file("${layout.buildDirectory}/reports/jacoco/report.xml"))
}
}

Expand Down
2 changes: 1 addition & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ rootProject.name = "junit-pioneer"
include("demo")

plugins {
id("com.gradle.enterprise") version "3.2"
id("com.gradle.enterprise") version "3.14.1"
}

gradleEnterprise {
Expand Down
2 changes: 2 additions & 0 deletions src/test/java/module-info.java
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@
// via org.assertj.core
requires java.instrument;
requires jdk.unsupported;
// via org.mockito
requires jdk.attach;
// via nl.jqno.equalsverifier
requires java.sql;

Expand Down