Skip to content

Commit 8e5460c

Browse files
John Burnswakingrufus
authored andcommitted
fix: useJUnitJupiter() should be public on JvmTestSuiteBuilder
add archrules action update to gradle 9.5.1
1 parent 9a90fb2 commit 8e5460c

5 files changed

Lines changed: 50 additions & 9 deletions

File tree

.github/workflows/archrules.yml

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
# action for evaluating archrules on a multi project repo
2+
name: Nebula ArchRules
3+
on:
4+
push:
5+
branches:
6+
- 'main'
7+
pull_request:
8+
9+
jobs:
10+
buildmultijdk:
11+
runs-on: ubuntu-latest
12+
name: ArchRules
13+
steps:
14+
- uses: actions/checkout@v6
15+
- name: Setup git user
16+
run: |
17+
git config --global user.name "Nebula Plugin Maintainers"
18+
git config --global user.email "nebula-plugins-oss@netflix.com"
19+
- name: Set up JDKs
20+
uses: actions/setup-java@v5
21+
with:
22+
distribution: 'zulu'
23+
java-version: |
24+
17
25+
21
26+
java-package: jdk
27+
- name: Setup Gradle
28+
uses: gradle/actions/setup-gradle@v5
29+
with:
30+
cache-overwrite-existing: true
31+
build-scan-publish: true
32+
build-scan-terms-of-use-url: 'https://gradle.com/terms-of-service'
33+
build-scan-terms-of-use-agree: 'yes'
34+
- name: Gradle run archrules
35+
run: ./gradlew --stacktrace archRulesConsoleReport archRulesMarkdownReport
36+
- name: Arch Rule Reports step summary
37+
run: cat build/reports/archrules/report.md > $GITHUB_STEP_SUMMARY
38+
- name: PR Comment
39+
if: github.event_name == 'pull_request'
40+
run: gh pr comment ${{ github.event.number }} --edit-last --create-if-none -b "[ArchRules report](${{ github.server.url }}/${{ github.repository }}/actions/runs/${{ github.run_id }})"
41+
env:
42+
GH_TOKEN: ${{ github.token }}

build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,6 @@ tasks.named("publishPlugins") { enabled = false }
9090

9191
tasks.wrapper {
9292
distributionType = Wrapper.DistributionType.BIN
93-
gradleVersion = "9.5.0"
94-
distributionSha256Sum = "553c78f50dafcd54d65b9a444649057857469edf836431389695608536d6b746"
93+
gradleVersion = "9.5.1"
94+
distributionSha256Sum = "bafc141b619ad6350fd975fc903156dd5c151998cc8b058e8c1044ab5f7b031f"
9595
}

gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionSha256Sum=553c78f50dafcd54d65b9a444649057857469edf836431389695608536d6b746
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip
3+
distributionSha256Sum=bafc141b619ad6350fd975fc903156dd5c151998cc8b058e8c1044ab5f7b031f
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip
55
networkTimeout=10000
66
retries=0
77
retryBackOffMs=500

src/main/java/nebula/test/dsl/JvmTestSuiteBuilder.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,10 @@ public class JvmTestSuiteBuilder {
1111
@Nullable
1212
private String framework = null;
1313

14-
void useJUnitJupiter() {
14+
/**
15+
* Enables Jupiter on the test suite (w/ dependencies)
16+
*/
17+
public void useJUnitJupiter() {
1518
framework = "useJUnitJupiter()";
1619
}
1720

src/main/kotlin/nebula/test/dsl/KotlinDsl.kt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ infix fun Plugin.version(version: String) {
6060
version(version)
6161
}
6262

63-
@NebulaTestKitDsl
6463
fun ProjectBuilder.src(config: SourcesBuilder.() -> Unit) {
6564
src().apply(config)
6665
}
@@ -70,17 +69,14 @@ fun ProjectBuilder.src(config: SourcesBuilder.() -> Unit) {
7069
* @param name name of the source set
7170
* @param config closure for configuration of the source set
7271
*/
73-
@NebulaTestKitDsl
7472
fun SourcesBuilder.sourceSet(name: String, config: SourceSetBuilder.() -> Unit) {
7573
sourceSet(name).apply(config)
7674
}
7775

78-
@NebulaTestKitDsl
7976
fun SourcesBuilder.main(config: SourceSetBuilder.() -> Unit) {
8077
main().apply(config)
8178
}
8279

83-
@NebulaTestKitDsl
8480
fun SourcesBuilder.test(config: SourceSetBuilder.() -> Unit) {
8581
test().apply(config)
8682
}

0 commit comments

Comments
 (0)