Skip to content

Commit 2385ec3

Browse files
authored
Merge branch 'master' into fix/defer-dataloader-dispatch-field-count
2 parents 54bb6c2 + 9116159 commit 2385ec3

101 files changed

Lines changed: 4065 additions & 4220 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/commit_performance_result.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
commitPerformanceResults:
1818
runs-on: ubuntu-latest
1919
steps:
20-
- uses: aws-actions/configure-aws-credentials@v5
20+
- uses: aws-actions/configure-aws-credentials@v6
2121
with:
2222
role-to-assume: arn:aws:iam::637423498965:role/GitHubActionGrahQLJava
2323
aws-region: "ap-southeast-2"

.github/workflows/publish_commit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
if: github.event.pull_request.merged == true
1616
runs-on: ubuntu-latest
1717
steps:
18-
- uses: aws-actions/configure-aws-credentials@v5
18+
- uses: aws-actions/configure-aws-credentials@v6
1919
with:
2020
role-to-assume: arn:aws:iam::637423498965:role/GitHubActionGrahQLJava
2121
aws-region: "ap-southeast-2"

build.gradle

Lines changed: 37 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ plugins {
1616
id "io.github.gradle-nexus.publish-plugin" version "2.0.0"
1717
id "groovy"
1818
id "me.champeau.jmh" version "0.7.3"
19-
id "net.ltgt.errorprone" version '4.3.0'
19+
id "net.ltgt.errorprone" version '5.0.0'
2020
//
2121
// Kotlin just for tests - not production code
2222
id 'org.jetbrains.kotlin.jvm' version '2.3.0'
@@ -130,21 +130,21 @@ dependencies {
130130
testImplementation 'org.junit.jupiter:junit-jupiter:5.14.1'
131131

132132
testImplementation 'org.spockframework:spock-core:2.4-groovy-5.0'
133-
testImplementation 'net.bytebuddy:byte-buddy:1.18.1'
133+
testImplementation 'net.bytebuddy:byte-buddy:1.18.5'
134134
testImplementation 'org.objenesis:objenesis:3.5'
135135
testImplementation 'org.apache.groovy:groovy:5.0.4'
136136
testImplementation 'org.apache.groovy:groovy-json:5.0.4'
137137
testImplementation 'com.google.code.gson:gson:2.13.2'
138138
testImplementation 'org.eclipse.jetty:jetty-server:11.0.26'
139-
testImplementation 'com.fasterxml.jackson.core:jackson-databind:2.20.1'
139+
testImplementation 'com.fasterxml.jackson.core:jackson-databind:2.21.1'
140140
testImplementation 'org.awaitility:awaitility-groovy:4.3.0'
141141
testImplementation 'com.github.javafaker:javafaker:1.0.2'
142142

143143
testImplementation 'org.reactivestreams:reactive-streams-tck:' + reactiveStreamsVersion
144144
testImplementation "io.reactivex.rxjava2:rxjava:2.2.21"
145145
testImplementation "io.projectreactor:reactor-core:3.8.0"
146146

147-
testImplementation 'org.testng:testng:7.11.0' // use for reactive streams test inheritance
147+
testImplementation 'org.testng:testng:7.12.0' // use for reactive streams test inheritance
148148
testImplementation "com.tngtech.archunit:archunit-junit5:1.4.1"
149149
testImplementation 'org.openjdk.jmh:jmh-core:1.37' // required for ArchUnit to check JMH tests
150150

@@ -156,6 +156,7 @@ dependencies {
156156
// this is needed for the idea jmh plugin to work correctly
157157
jmh 'org.openjdk.jmh:jmh-core:1.37'
158158
jmh 'org.openjdk.jmh:jmh-generator-annprocess:1.37'
159+
jmh 'me.bechberger:ap-loader-all:4.3-12'
159160

160161
// comment this in if you want to run JMH benchmarks from idea
161162
// jmhAnnotationProcessor 'org.openjdk.jmh:jmh-generator-annprocess:1.37'
@@ -228,7 +229,38 @@ jmh {
228229
includes = [project.property('jmhInclude')]
229230
}
230231
if (project.hasProperty('jmhProfilers')) {
231-
profilers = [project.property('jmhProfilers')]
232+
def profStr = project.property('jmhProfilers') as String
233+
if (profStr.startsWith('async')) {
234+
// Resolve native lib from ap-loader JAR on the jmh classpath
235+
def apJar = configurations.jmh.files.find { it.name.contains('ap-loader') }
236+
if (apJar) {
237+
def proc = ['java', '-jar', apJar.absolutePath, 'agentpath'].execute()
238+
proc.waitFor(10, java.util.concurrent.TimeUnit.SECONDS)
239+
def libPath = proc.text.trim()
240+
if (libPath && new File(libPath).exists()) {
241+
if (profStr == 'async') {
242+
profilers = ["async:libPath=${libPath}"]
243+
} else {
244+
profilers = [profStr.replaceFirst('async:', "async:libPath=${libPath};")]
245+
}
246+
} else {
247+
profilers = [profStr]
248+
}
249+
} else {
250+
profilers = [profStr]
251+
}
252+
} else {
253+
profilers = [profStr]
254+
}
255+
}
256+
if (project.hasProperty('jmhFork')) {
257+
fork = project.property('jmhFork') as int
258+
}
259+
if (project.hasProperty('jmhIterations')) {
260+
iterations = project.property('jmhIterations') as int
261+
}
262+
if (project.hasProperty('jmhWarmupIterations')) {
263+
warmupIterations = project.property('jmhWarmupIterations') as int
232264
}
233265
}
234266

0 commit comments

Comments
 (0)