Skip to content

Commit 7b2abb7

Browse files
jbellengerjbellenger
authored
Merge branch 'graphql-java:master' into master
2 parents 8f7a80c + 420218d commit 7b2abb7

228 files changed

Lines changed: 241808 additions & 5110 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/master.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: Master Build and Publish
2-
# For master push: Builds and publishes the development version to bintray/maven
2+
# For master push: Builds and publishes the development version to maven
33
on:
44
push:
55
branches:

‎CONTRIBUTING.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,17 @@ In order to achieve that we have a strong focus on maintainability and high test
1111

1212
- We expect new or modified unit test for every change (written in [Spock](http://spockframework.org/)).
1313

14-
- Your code should be formatted with our IntelliJ [graphql-java-code-style](graphql-java-code-style.xml).
14+
- Your code should be formatted with our IntelliJ [graphql-java-code-style](graphql-java-code-style.xml).
1515

16-
- We don't add a new dependency to graphql-java: dependency conflicts will make adaption of graphql-java harder for users,
16+
- We don't add a new dependency to graphql-java: dependency conflicts will make adaption of graphql-java harder for users,
1717
therefore we avoid adding any new dependency.
1818

1919
- graphql-java has a strict focus on executing a GraphQL request, this means JSON parsing, http communication, databases
2020
access etc is out of scope.
2121

2222

23-
If you have any question please consider asking in our spectrum chat https://spectrum.chat/graphql-java. For bug reports or specific code related topics create a new issue.
23+
If you have any question please consider asking in our [Discussions](https://github.com/graphql-java/graphql-java/discussions). For bug reports or specific code related topics create a new issue.
24+
25+
Thanks!
2426

25-
Thanks!
26-
2727

‎README.zh_cn.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ This is a [GraphQL](https://github.com/facebook/graphql) Java implementation.
88

99
[![Build Status](https://travis-ci.org/graphql-java/graphql-java.svg?branch=master)](https://travis-ci.org/graphql-java/graphql-java)
1010
[![Latest Release](https://maven-badges.herokuapp.com/maven-central/com.graphql-java/graphql-java/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.graphql-java/graphql-java/)
11-
[![Latest Dev Build](https://api.bintray.com/packages/andimarek/graphql-java/graphql-java/images/download.svg)](https://bintray.com/andimarek/graphql-java/graphql-java/_latestVersion)
1211

1312

1413
## 文档

‎build.gradle‎

Lines changed: 26 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import java.text.SimpleDateFormat
33
plugins {
44
id 'java'
55
id 'java-library'
6-
id 'maven'
76
id 'maven-publish'
87
id 'antlr'
98
id 'signing'
@@ -14,11 +13,22 @@ plugins {
1413

1514

1615
def getDevelopmentVersion() {
17-
def output = new StringBuilder()
18-
def error = new StringBuilder()
16+
def gitCheckOutput = new StringBuilder()
17+
def gitCheckError = new StringBuilder()
18+
def gitCheck = ["git", "rev-parse", "--is-inside-work-tree"].execute()
19+
gitCheck.waitForProcessOutput(gitCheckOutput, gitCheckError)
20+
def isGit = gitCheckOutput.toString().trim()
21+
if (isGit != "true") {
22+
def version = "0.0.0-" + new SimpleDateFormat('yyyy-MM-dd\'T\'HH-mm-ss').format(new Date()) + "-no-git"
23+
println "created development version: $version"
24+
return version
25+
}
26+
27+
def gitHashOutput = new StringBuilder()
28+
def gitHashError = new StringBuilder()
1929
def gitShortHash = ["git", "-C", projectDir.toString(), "rev-parse", "--short", "HEAD"].execute()
20-
gitShortHash.waitForProcessOutput(output, error)
21-
def gitHash = output.toString().trim()
30+
gitShortHash.waitForProcessOutput(gitHashOutput, gitHashError)
31+
def gitHash = gitHashOutput.toString().trim()
2232
if (gitHash.isEmpty()) {
2333
println "git hash is empty: error: ${error.toString()}"
2434
throw new IllegalStateException("git hash could not be determined")
@@ -40,6 +50,7 @@ targetCompatibility = 1.8
4050
def reactiveStreamsVersion = '1.0.2'
4151
def slf4jVersion = '1.7.30'
4252
def releaseVersion = System.env.RELEASE_VERSION
53+
def antlrVersion = '4.9.2'
4354
version = releaseVersion ? releaseVersion : getDevelopmentVersion()
4455
group = 'com.graphql-java'
4556

@@ -70,21 +81,21 @@ jar {
7081
from "src/main/antlr/GraphqlSDL.g4"
7182
from "src/main/antlr/GraphqlCommon.g4"
7283
manifest {
73-
attributes('Automatic-Module-Name': 'com.graphql-java')
84+
attributes('Automatic-Module-Name': 'com.graphqljava')
7485
}
7586
}
7687

7788
dependencies {
7889
compileOnly 'org.jetbrains:annotations:20.1.0'
79-
implementation 'org.antlr:antlr4-runtime:4.8'
90+
implementation 'org.antlr:antlr4-runtime:' + antlrVersion
8091
implementation 'org.slf4j:slf4j-api:' + slf4jVersion
81-
api 'com.graphql-java:java-dataloader:2.2.3'
92+
api 'com.graphql-java:java-dataloader:3.1.0'
8293
api 'org.reactivestreams:reactive-streams:' + reactiveStreamsVersion
83-
antlr "org.antlr:antlr4:4.8"
94+
antlr 'org.antlr:antlr4:' + antlrVersion
8495
implementation 'com.google.guava:guava:30.0-jre'
8596
testImplementation group: 'junit', name: 'junit', version: '4.12'
86-
testImplementation 'org.spockframework:spock-core:1.3-groovy-2.5'
87-
testImplementation('org.codehaus.groovy:groovy:2.5.13')
97+
testImplementation 'org.spockframework:spock-core:2.0-groovy-3.0'
98+
testImplementation 'org.codehaus.groovy:groovy:3.0.8'
8899
testImplementation 'cglib:cglib-nodep:3.3.0'
89100
testImplementation 'org.objenesis:objenesis:2.1'
90101
testImplementation 'com.google.code.gson:gson:2.8.0'
@@ -231,7 +242,7 @@ publishing {
231242
//
232243
// We are removing here guava because the classes we want to use is "shaded" into the jar itself
233244
// via the shadowJar task
234-
Node pomNode = asNode()
245+
def pomNode = asNode()
235246
pomNode.dependencies.'*'.findAll() {
236247
it.artifactId.text() == 'antlr4' || it.artifactId.text() == 'guava'
237248
}.each() {
@@ -288,9 +299,6 @@ tasks.withType(PublishToMavenRepository) {
288299
dependsOn build
289300
}
290301

291-
292-
task myWrapper(type: Wrapper) {
293-
gradleVersion = '6.6.1'
294-
distributionUrl = "https://services.gradle.org/distributions/gradle-${gradleVersion}-all.zip"
295-
}
296-
302+
test {
303+
useJUnitPlatform()
304+
}

‎docs/Makefile‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎docs/conf.py‎

Lines changed: 0 additions & 172 deletions
This file was deleted.

‎docs/index.rst‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎docs/readme.md‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎gradle.properties‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,3 @@ org.gradle.caching=true
22
org.gradle.daemon=true
33
org.gradle.parallel=true
44
org.gradle.jvmargs=-Dfile.encoding=UTF-8
5-
6-
bintray.user=DUMMY_USER
7-
bintray.key=DUMMY_KEY

‎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-6.6.1-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)