Skip to content

Commit 0d8ab56

Browse files
committed
Merge remote-tracking branch 'origin/master' into remove-optional-streams-style-code
# Conflicts: # src/main/java/graphql/util/FpKit.java
2 parents 35eb00e + 397c050 commit 0d8ab56

48 files changed

Lines changed: 13693 additions & 184 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.

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ tasks.withType(GroovyCompile) {
105105
}
106106
dependencies {
107107
implementation 'org.antlr:antlr4-runtime:' + antlrVersion
108-
api 'com.graphql-java:java-dataloader:4.0.0'
108+
api 'com.graphql-java:java-dataloader:5.0.0'
109109
api 'org.reactivestreams:reactive-streams:' + reactiveStreamsVersion
110110
api "org.jspecify:jspecify:1.0.0"
111111
antlr 'org.antlr:antlr4:' + antlrVersion
@@ -176,7 +176,7 @@ shadowJar {
176176
bnd('''
177177
-exportcontents: graphql.*
178178
-removeheaders: Private-Package
179-
Import-Package: !android.os.*,!com.google.*,!org.checkerframework.*,!javax.annotation.*,!graphql.com.google.*,!org.antlr.*,!graphql.org.antlr.*,!sun.misc.*,org.jspecify.*;resolution:=optional,*
179+
Import-Package: !android.os.*,!com.google.*,!org.checkerframework.*,!javax.annotation.*,!graphql.com.google.*,!org.antlr.*,!graphql.org.antlr.*,!sun.misc.*,org.jspecify.annotations;resolution:=optional,*
180180
''')
181181
}
182182

0 commit comments

Comments
 (0)