Skip to content

Update dependencies, and update Gradle wrapper to 7.3.3 #2713

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andimarek merged 2 commits into from
Feb 3, 2022
+174 −127
Merged

Update dependencies, and update Gradle wrapper to 7.3.3 #2713

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf94007
Update dependencies, and update Gradle wrapper to 7.3.3
jord1e Feb 1, 2022
b6827cc
Trigger buildAndTest again
jord1e Feb 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 20 additions & 22 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ plugins {
id 'maven-publish'
id 'antlr'
id 'signing'
id "com.github.johnrengelman.shadow" version "6.1.0"
id "biz.aQute.bnd.builder" version "5.1.2"
id "io.github.gradle-nexus.publish-plugin" version "1.0.0"
id "com.github.johnrengelman.shadow" version "7.1.2"
id "biz.aQute.bnd.builder" version "6.1.0"
id "io.github.gradle-nexus.publish-plugin" version "1.1.0"
id "groovy"
}


def getDevelopmentVersion() {
def gitCheckOutput = new StringBuilder()
def gitCheckError = new StringBuilder()
Expand Down Expand Up @@ -47,10 +47,10 @@ if (JavaVersion.current() != JavaVersion.VERSION_1_8) {

sourceCompatibility = 1.8
targetCompatibility = 1.8
def reactiveStreamsVersion = '1.0.2'
def slf4jVersion = '1.7.30'
def reactiveStreamsVersion = '1.0.3'
def slf4jVersion = '1.7.35'
def releaseVersion = System.env.RELEASE_VERSION
def antlrVersion = '4.9.2'
def antlrVersion = '4.9.3' // https://mvnrepository.com/artifact/org.antlr/antlr4-runtime
version = releaseVersion ? releaseVersion : getDevelopmentVersion()
group = 'com.graphql-java'

Expand All @@ -72,8 +72,6 @@ repositories {
mavenLocal()
}

apply plugin: 'groovy'

jar {
from "LICENSE.md"
from "src/main/antlr/Graphql.g4"
Expand All @@ -86,32 +84,32 @@ jar {
}

dependencies {
compileOnly 'org.jetbrains:annotations:20.1.0'
compileOnly 'org.jetbrains:annotations:23.0.0'
implementation 'org.antlr:antlr4-runtime:' + antlrVersion
implementation 'org.slf4j:slf4j-api:' + slf4jVersion
api 'com.graphql-java:java-dataloader:3.1.0'
api 'org.reactivestreams:reactive-streams:' + reactiveStreamsVersion
antlr 'org.antlr:antlr4:' + antlrVersion
implementation 'com.google.guava:guava:30.0-jre'
testImplementation group: 'junit', name: 'junit', version: '4.12'
implementation 'com.google.guava:guava:31.0.1-jre'
testImplementation group: 'junit', name: 'junit', version: '4.13.2'
testImplementation 'org.spockframework:spock-core:2.0-groovy-3.0'
testImplementation 'org.codehaus.groovy:groovy:3.0.8'
testImplementation 'org.codehaus.groovy:groovy:3.0.9'
testImplementation 'cglib:cglib-nodep:3.3.0'
testImplementation 'org.objenesis:objenesis:2.1'
testImplementation 'com.google.code.gson:gson:2.8.0'
testImplementation 'org.objenesis:objenesis:3.2'
testImplementation 'com.google.code.gson:gson:2.8.9'
testImplementation 'org.eclipse.jetty:jetty-server:9.4.26.v20200117'
testImplementation 'com.fasterxml.jackson.core:jackson-databind:2.11.2'
testImplementation 'com.fasterxml.jackson.core:jackson-databind:2.13.1'
testImplementation 'org.slf4j:slf4j-simple:' + slf4jVersion
testImplementation 'org.awaitility:awaitility-groovy:3.0.0'
testImplementation 'org.awaitility:awaitility-groovy:3.1.6'
testImplementation 'com.github.javafaker:javafaker:0.13'

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

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

testImplementation 'org.openjdk.jmh:jmh-core:1.25'
testAnnotationProcessor 'org.openjdk.jmh:jmh-generator-annprocess:1.25'
testImplementation 'org.openjdk.jmh:jmh-core:1.34'
testAnnotationProcessor 'org.openjdk.jmh:jmh-generator-annprocess:1.34'
}

shadowJar {
Expand All @@ -125,7 +123,7 @@ shadowJar {
include 'com.google.common.primitives.*'
}
dependencies {
include(dependency('com.google.guava:guava:30.0-jre'))
include(dependency('com.google.guava:guava:31.0.1-jre'))
}
from "LICENSE.md"
from "src/main/antlr/Graphql.g4"
Expand Down Expand Up @@ -180,7 +178,7 @@ check.dependsOn testng

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

generateGrammarSource {
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading