Skip to content

Commit 601e74f

Browse files
yeikelyeikel
authored
Merge branch 'master' into java25
2 parents 865bf67 + 021fe1b commit 601e74f

18 files changed

+1553
-60
lines changed

‎.github/workflows/commit_performance_result.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
with:
2222
role-to-assume: arn:aws:iam::637423498965:role/GitHubActionGrahQLJava
2323
aws-region: "ap-southeast-2"
24-
- uses: actions/checkout@v5
24+
- uses: actions/checkout@v6
2525
with:
2626
ref: ${{ github.event.inputs.branch }}
2727
- run: |

‎.github/workflows/master.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
matrix:
1414
gradle-argument: [ 'assemble && ./gradlew check -x test','testWithJava11', 'testWithJava17','testWithJava21', 'test -x testWithJava11 -x testWithJava17 -x testWithJava21' ]
1515
steps:
16-
- uses: actions/checkout@v5
16+
- uses: actions/checkout@v6
1717
- uses: gradle/actions/wrapper-validation@v5
1818
- name: Set up JDK 25
1919
uses: actions/setup-java@v5
@@ -42,7 +42,7 @@ jobs:
4242
MAVEN_CENTRAL_PGP_KEY: ${{ secrets.MAVEN_CENTRAL_PGP_KEY }}
4343

4444
steps:
45-
- uses: actions/checkout@v5
45+
- uses: actions/checkout@v6
4646
- uses: gradle/actions/wrapper-validation@v5
4747
- name: Set up JDK 25
4848
uses: actions/setup-java@v5

‎.github/workflows/pull_request.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
matrix:
2323
gradle-argument: [ 'assemble && ./gradlew check -x test','testWithJava11', 'testWithJava17','testWithJava21', 'test -x testWithJava11 -x testWithJava17 -x testWithJava21' ]
2424
steps:
25-
- uses: actions/checkout@v5
25+
- uses: actions/checkout@v6
2626
- uses: gradle/actions/wrapper-validation@v5
2727
- name: Set up JDK 25
2828
uses: actions/setup-java@v5

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
RELEASE_VERSION: ${{ github.event.inputs.version }}
2020

2121
steps:
22-
- uses: actions/checkout@v5
22+
- uses: actions/checkout@v6
2323
- uses: gradle/actions/wrapper-validation@v5
2424
- name: Set up JDK 25
2525
uses: actions/setup-java@v5

‎build.gradle‎

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1+
import aQute.bnd.gradle.BundleTaskExtension
12
import net.ltgt.gradle.errorprone.CheckSeverity
2-
import org.gradle.api.file.DuplicatesStrategy
33
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
44
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
55

@@ -127,9 +127,10 @@ dependencies {
127127
implementation 'org.antlr:antlr4-runtime:' + antlrVersion
128128
implementation 'com.google.guava:guava:' + guavaVersion
129129

130-
testImplementation 'junit:junit:4.13.2'
130+
testImplementation 'org.junit.jupiter:junit-jupiter:5.14.1'
131+
131132
testImplementation 'org.spockframework:spock-core:2.3-groovy-4.0'
132-
testImplementation 'net.bytebuddy:byte-buddy:1.17.8'
133+
testImplementation 'net.bytebuddy:byte-buddy:1.18.1'
133134
testImplementation 'org.objenesis:objenesis:3.4'
134135
testImplementation 'org.apache.groovy:groovy:4.0.28"'
135136
testImplementation 'org.apache.groovy:groovy-json:4.0.28'
@@ -141,14 +142,14 @@ dependencies {
141142

142143
testImplementation 'org.reactivestreams:reactive-streams-tck:' + reactiveStreamsVersion
143144
testImplementation "io.reactivex.rxjava2:rxjava:2.2.21"
144-
testImplementation "io.projectreactor:reactor-core:3.7.12"
145+
testImplementation "io.projectreactor:reactor-core:3.8.0"
145146

146147
testImplementation 'org.testng:testng:7.11.0' // use for reactive streams test inheritance
147148
testImplementation "com.tngtech.archunit:archunit-junit5:1.4.1"
148149
testImplementation 'org.openjdk.jmh:jmh-core:1.37' // required for ArchUnit to check JMH tests
149150

150151
// JUnit Platform launcher required for Gradle 9
151-
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
152+
testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.14.1'
152153

153154
antlr 'org.antlr:antlr4:' + antlrVersion
154155

@@ -160,14 +161,12 @@ dependencies {
160161
// jmhAnnotationProcessor 'org.openjdk.jmh:jmh-generator-annprocess:1.37'
161162

162163
errorprone 'com.uber.nullaway:nullaway:0.12.10'
163-
errorprone 'com.google.errorprone:error_prone_core:2.43.0'
164+
errorprone 'com.google.errorprone:error_prone_core:2.44.0'
164165

165166
// just tests - no Kotlin otherwise
166167
testImplementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8'
167168
}
168169

169-
import aQute.bnd.gradle.BundleTaskExtension
170-
171170
shadowJar {
172171
minimize()
173172
archiveClassifier.set('')
@@ -368,11 +367,28 @@ tasks.register('testWithJava17', Test) {
368367
javaLauncher = javaToolchains.launcherFor {
369368
languageVersion = JavaLanguageVersion.of(17)
370369
}
370+
testClassesDirs = sourceSets.test.output.classesDirs
371+
classpath = sourceSets.test.runtimeClasspath
372+
classpath += sourceSets.jmh.output
373+
dependsOn "jmhClasses"
374+
375+
376+
dependsOn tasks.named('testClasses')
377+
371378
}
379+
372380
tasks.register('testWithJava11', Test) {
373381
javaLauncher = javaToolchains.launcherFor {
374382
languageVersion = JavaLanguageVersion.of(11)
375383
}
384+
testClassesDirs = sourceSets.test.output.classesDirs
385+
classpath = sourceSets.test.runtimeClasspath
386+
387+
dependsOn tasks.named('testClasses')
388+
389+
classpath += sourceSets.jmh.output
390+
dependsOn "jmhClasses"
391+
376392
}
377393
test.dependsOn testWithJava21
378394
test.dependsOn testWithJava17

0 commit comments

Comments
 (0)