Skip to content

Commit 55fb330

Browse files
committed
Merge branch 'master-up' into fix-connection
# Conflicts: # src/main/java/graphql/annotations/Connection.java # src/main/java/graphql/annotations/GraphQLAnnotations.java # src/main/java/graphql/annotations/GraphQLConnection.java # src/main/java/graphql/annotations/ListConnection.java # src/main/java/graphql/annotations/annotationTypes/GraphQLConnection.java # src/main/java/graphql/annotations/connection/ConnectionFetcher.java # src/main/java/graphql/annotations/connection/GraphQLConnection.java # src/main/java/graphql/annotations/connection/GraphQLConnectionException.java # src/main/java/graphql/annotations/dataFetchers/MethodDataFetcher.java # src/main/java/graphql/annotations/dataFetchers/connection/Connection.java # src/main/java/graphql/annotations/dataFetchers/connection/DispatchingConnection.java # src/main/java/graphql/annotations/dataFetchers/connection/ListConnection.java # src/main/java/graphql/annotations/dataFetchers/connection/StreamConnection.java # src/main/java/graphql/annotations/processor/util/ReflectionKit.java # src/test/java/graphql/annotations/connection/GraphQLConnectionTest.java
2 parents d06304c + 4663688 commit 55fb330

File tree

337 files changed

+4175
-1813
lines changed

Some content is hidden

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

337 files changed

+4175
-1813
lines changed

build.gradle

+1-2
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ publishing {
8484
publications {
8585
maven(MavenPublication) {
8686
from components.java
87-
groupId 'com.graphql-java'
87+
groupId 'io.github.graphql-java'
8888
artifactId project.name
8989
version project.version
9090

@@ -144,7 +144,6 @@ bintray {
144144
publications = ['maven']
145145
publish = true
146146
pkg {
147-
userOrg = 'graphql-java'
148147
desc = 'This library offers an annotations-based syntax for GraphQL schema definition.'
149148
repo = 'graphql-java-annotations'
150149
name = 'graphql-java-annotations'
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

src/main/java/graphql/annotations/DefaultTypeFunction.java

-345
This file was deleted.

0 commit comments

Comments
 (0)