Skip to content

Commit 9c77ddd

Browse files
andimarekandimarek
authored
Merge pull request graphql-java#2713 from jord1e/update-wrapper-dependencies
Update dependencies, and update Gradle wrapper to 7.3.3
2 parents 3f951e4 + b6827cc commit 9c77ddd

4 files changed

Lines changed: 174 additions & 127 deletions

File tree

‎build.gradle‎

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ plugins {
66
id 'maven-publish'
77
id 'antlr'
88
id 'signing'
9-
id "com.github.johnrengelman.shadow" version "6.1.0"
10-
id "biz.aQute.bnd.builder" version "5.1.2"
11-
id "io.github.gradle-nexus.publish-plugin" version "1.0.0"
9+
id "com.github.johnrengelman.shadow" version "7.1.2"
10+
id "biz.aQute.bnd.builder" version "6.1.0"
11+
id "io.github.gradle-nexus.publish-plugin" version "1.1.0"
12+
id "groovy"
1213
}
1314

14-
1515
def getDevelopmentVersion() {
1616
def gitCheckOutput = new StringBuilder()
1717
def gitCheckError = new StringBuilder()
@@ -47,10 +47,10 @@ if (JavaVersion.current() != JavaVersion.VERSION_1_8) {
4747

4848
sourceCompatibility = 1.8
4949
targetCompatibility = 1.8
50-
def reactiveStreamsVersion = '1.0.2'
51-
def slf4jVersion = '1.7.30'
50+
def reactiveStreamsVersion = '1.0.3'
51+
def slf4jVersion = '1.7.35'
5252
def releaseVersion = System.env.RELEASE_VERSION
53-
def antlrVersion = '4.9.2'
53+
def antlrVersion = '4.9.3' // https://mvnrepository.com/artifact/org.antlr/antlr4-runtime
5454
version = releaseVersion ? releaseVersion : getDevelopmentVersion()
5555
group = 'com.graphql-java'
5656

@@ -72,8 +72,6 @@ repositories {
7272
mavenLocal()
7373
}
7474

75-
apply plugin: 'groovy'
76-
7775
jar {
7876
from "LICENSE.md"
7977
from "src/main/antlr/Graphql.g4"
@@ -86,32 +84,32 @@ jar {
8684
}
8785

8886
dependencies {
89-
compileOnly 'org.jetbrains:annotations:20.1.0'
87+
compileOnly 'org.jetbrains:annotations:23.0.0'
9088
implementation 'org.antlr:antlr4-runtime:' + antlrVersion
9189
implementation 'org.slf4j:slf4j-api:' + slf4jVersion
9290
api 'com.graphql-java:java-dataloader:3.1.0'
9391
api 'org.reactivestreams:reactive-streams:' + reactiveStreamsVersion
9492
antlr 'org.antlr:antlr4:' + antlrVersion
95-
implementation 'com.google.guava:guava:30.0-jre'
96-
testImplementation group: 'junit', name: 'junit', version: '4.12'
93+
implementation 'com.google.guava:guava:31.0.1-jre'
94+
testImplementation group: 'junit', name: 'junit', version: '4.13.2'
9795
testImplementation 'org.spockframework:spock-core:2.0-groovy-3.0'
98-
testImplementation 'org.codehaus.groovy:groovy:3.0.8'
96+
testImplementation 'org.codehaus.groovy:groovy:3.0.9'
9997
testImplementation 'cglib:cglib-nodep:3.3.0'
100-
testImplementation 'org.objenesis:objenesis:2.1'
101-
testImplementation 'com.google.code.gson:gson:2.8.0'
98+
testImplementation 'org.objenesis:objenesis:3.2'
99+
testImplementation 'com.google.code.gson:gson:2.8.9'
102100
testImplementation 'org.eclipse.jetty:jetty-server:9.4.26.v20200117'
103-
testImplementation 'com.fasterxml.jackson.core:jackson-databind:2.11.2'
101+
testImplementation 'com.fasterxml.jackson.core:jackson-databind:2.13.1'
104102
testImplementation 'org.slf4j:slf4j-simple:' + slf4jVersion
105-
testImplementation 'org.awaitility:awaitility-groovy:3.0.0'
103+
testImplementation 'org.awaitility:awaitility-groovy:3.1.6'
106104
testImplementation 'com.github.javafaker:javafaker:0.13'
107105

108106
testImplementation 'org.reactivestreams:reactive-streams-tck:' + reactiveStreamsVersion
109-
testImplementation "io.reactivex.rxjava2:rxjava:2.1.5"
107+
testImplementation "io.reactivex.rxjava2:rxjava:2.2.21"
110108

111109
testImplementation 'org.testng:testng:6.1.1' // use for reactive streams test inheritance
112110

113-
testImplementation 'org.openjdk.jmh:jmh-core:1.25'
114-
testAnnotationProcessor 'org.openjdk.jmh:jmh-generator-annprocess:1.25'
111+
testImplementation 'org.openjdk.jmh:jmh-core:1.34'
112+
testAnnotationProcessor 'org.openjdk.jmh:jmh-generator-annprocess:1.34'
115113
}
116114

117115
shadowJar {
@@ -125,7 +123,7 @@ shadowJar {
125123
include 'com.google.common.primitives.*'
126124
}
127125
dependencies {
128-
include(dependency('com.google.guava:guava:30.0-jre'))
126+
include(dependency('com.google.guava:guava:31.0.1-jre'))
129127
}
130128
from "LICENSE.md"
131129
from "src/main/antlr/Graphql.g4"
@@ -180,7 +178,7 @@ check.dependsOn testng
180178

181179
compileJava {
182180
options.compilerArgs += ["-parameters"]
183-
source file("build/generated-src"), sourceSets.main.java
181+
source file("build/generated-src"), sourceSets.main.java
184182
}
185183

186184
generateGrammarSource {

‎gradle/wrapper/gradle-wrapper.jar‎

333 Bytes
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)