Skip to content

Commit 3e29da4

Browse files
andimarekandimarek
committed
Merge branch 'master' into profiler-2
2 parents f7e31e6 + 76f32f6 commit 3e29da4

File tree

41 files changed

+7203
-288
lines changed

Some content is hidden

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

41 files changed

+7203
-288
lines changed

‎bin/jmh.sh‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/usr/bin/env bash
2+
3+
BRANCH=$(git rev-parse --abbrev-ref HEAD)
4+
JAR="build/libs/graphql-java-0.0.0-$BRANCH-SNAPSHOT-jmh.jar"
5+
echo "build and then running jmh for $JAR"
6+
7+
./gradlew clean jmhJar
8+
9+
java -jar "$JAR" "$@"

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ dependencies {
152152
jmh 'org.openjdk.jmh:jmh-generator-annprocess:1.37'
153153

154154
errorprone 'com.uber.nullaway:nullaway:0.12.7'
155-
errorprone 'com.google.errorprone:error_prone_core:2.39.0'
155+
errorprone 'com.google.errorprone:error_prone_core:2.40.0'
156156

157157
// just tests - no Kotlin otherwise
158158
testCompileOnly 'org.jetbrains.kotlin:kotlin-stdlib-jdk8'

0 commit comments

Comments
 (0)