Merge main in dev-3.x #3580

martinbonnin · 2021-11-19T16:23:59Z

A few noteworthy items:

the implementation of safelistingHash now uses Apollo Android instead of GraphQL Java
Fix Float input fields Java codegen with default values in json schemas #3109 is not needed because the 3.x codegen does not "burn" the default values anymore and use the ones from the GraphQL document/schema instead.
Reactor is not in 3.x as it can use https://github.com/Kotlin/kotlinx.coroutines/tree/master/reactive/kotlinx-coroutines-reactor
Mutiny can similarly use https://smallrye.io/smallrye-mutiny/guides/kotlin

~~I don't know why this shows -29k lines at the moment, the diff is nowhere that huge 🤷~~ It's package-lock.json

⚠️ Do not squash this and create a merge commit instead so we know where main was merged.

To align with apollographql/apollo-client#8079.

Co-authored-by: Neal Sanche <neal@yourarq.com>

…as (#3109) * Fix Float input fields Java codegen with default values in json schemas see #3108 * add a test case for lists in defaultValues and handle it Co-authored-by: Martin Bonnin <martin@mbonnin.net>

* bump Kotlin and Coroutines to 1.5.0 * make the KotlinCompile task depend on antlr generation * update metalava-plugin * update metalava * update metalava using Jdk8. Not really sure why the signatures would differ based on the java version...

* Implement Query Batching for `apollo-runtime` * update metalava signatures * Trigger HTTP call on max batch size, added synchronization, throw when using GET method * Unit tests for BatchPoller * Fix checkstyle * Propagate parsing errors in callbacks, better syncrhonization, use LinkedList * Added some tests for batch response parsing * Added tests for request body + headers * Builder API to enable per query batching, dont rely on time for tests * update Metalava signatures Co-authored-by: Martin Bonnin <martin@mbonnin.net>

* feat: add Reactor support resolves #627 * remove .gitignore that is handled by the top level one * update metalava signatures Co-authored-by: Martin Bonnin <martin@mbonnin.net>

…Builder()` (#3146)

update dep version forcing as per gradle new api

…3153) Thanks!

inspired by commit 2e2f5d9

* Configure for updated docs theme * Upgrade docs theme * Bump docs theme version * Bump docs theme version * Update docs theme version * Move config from docs netlify.toml to root level netlify.toml * Upgrade docs theme * Upgrade docs theme * Upgrade docs theme * Upgrade docs theme * Bump docs theme to v5 Co-authored-by: Trevor Blades <tdblades@gmail.com>

BoD · 2021-11-19T17:27:39Z

apollo-gradle-plugin/build.gradle.kts

@@ -41,7 +41,7 @@ dependencies {
  testImplementation(groovy.util.Eval.x(project, "x.dep.okHttp.mockWebServer4"))
 }

-if (true) {


Pushed by mistake?

BoD

👏

martinbonnin · 2021-11-22T09:49:05Z

And... I forgot to change the button to "merge" and squashed everything instead 🤦 . I pushed a merge manually there so that we have a reference point: aa52f01b3494f765bac8216601c46d7e1
Sorry for that

daniman and others added 30 commits April 28, 2021 10:21

Add a "Who is Apollo" section to the main README (#3073)

121e5bf

Slight tweaks to the "Who is Apollo?" README section (#3079)

7ffd199

To align with apollographql/apollo-client#8079.

Update dependency gatsby-theme-apollo-docs to v4.7.3

840de56

Issue #3095: Expose channel capacity parameter. (#3096)

7445c7f

Co-authored-by: Neal Sanche <neal@yourarq.com>

Update dependency gatsby to v2.32.13

45d7127

Update dependency gatsby-theme-apollo-docs to v4.7.4

74641e3

Fix Float input fields Java codegen with default values in json schem…

44bf6c7

…as (#3109) * Fix Float input fields Java codegen with default values in json schemas see #3108 * add a test case for lists in defaultValues and handle it Co-authored-by: Martin Bonnin <martin@mbonnin.net>

release 2.5.7

a0d27c3

version is now 2.5.8-SNAPSHOT

0bfac77

Update README.md (#3120)

50f8ae1

Replace spectrum with discourse (#3123)

df1eed7

Discourse: pre-fill the category and tags

5d1a72c

Update multi-modules.mdx (#3125)

5001fde

pass 'operationName' in the introspection query (#3126)

cf8cc98

bump junit (#3131)

061641b

Update dependency gatsby-theme-apollo-docs to v4.7.6

0d56fca

feat: add Reactor support (#3138)

b038c1f

* feat: add Reactor support resolves #627 * remove .gitignore that is handled by the top level one * update metalava signatures Co-authored-by: Martin Bonnin <martin@mbonnin.net>

Update dependency gatsby-theme-apollo-docs to v4.7.9

ddef642

add reactor in the left column of the doc (#3141)

f982817

release 2.5.8

5d9f59b

version is now 2.5.9-SNAPSHOT

3c6d4de

Fix overriding canBeBatched value when cloning QueryCall with `to…

92aa7b5

…Builder()` (#3146)

Update get-started-multiplatform.mdx (#3150)

7520ed4

update dep version forcing as per gradle new api

Update badge from Bintray to MavenCentral for apollo-idling-resource (#…

4b50fac

…3153) Thanks!

Update 09-write-your-first-mutation.mdx (#3154)

14926b2

Update 01-configure-project.mdx

400a22c

Update 02-add-the-graphql-schema.mdx

6bf60b6

release 2.5.9

3457b40

hwillson and others added 21 commits November 12, 2021 16:25

Gateway clarification based on license change

88a726a

Update dependency gatsby-theme-apollo-docs to v5.3.8

8ccfc26

update docs dependencies

403a4b1

pass 'operationName' in the introspection query (#3126)

1c30bda

update ROADMAP

a35cc8b

add multiplatform in the multimodules doc

950c339

Remove root redirect and build deploy previews at / (#3309)

33461ba

Deploy the prod site at the root (#3312)

a2afa7b

Remove path prefixes for docs redirects (#3329)

beb230e

add a Kotlin Native Doc

7809937

inspired by commit 2e2f5d9

update algolia filters

1dcb11b

Adding Benoit (#3388)

104153a

replace data graph with 'graph'

357b267

Merge branch 'main' into merge-main

8f461cd

premliminary work for registerOperations

e39c09f

wip

4a1a7fa

wip

dd6e0d5

fix sorting

2c709e0

add Gradle tasks for registerOperations

949a119

add safelisting doc

094246b

martinbonnin requested review from sav007 and tasomaniac as code owners November 19, 2021 16:23

BoD reviewed Nov 19, 2021

View reviewed changes

BoD approved these changes Nov 19, 2021

View reviewed changes

martinbonnin added 2 commits November 19, 2021 18:47

update apiDump

5c43dab

revert debug and fix tests that require mpp-utils

296a8ee

martinbonnin merged commit dc31a9a into dev-3.x Nov 22, 2021

martinbonnin deleted the merge-main branch November 22, 2021 09:44

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge main in dev-3.x #3580

Merge main in dev-3.x #3580

martinbonnin commented Nov 19, 2021 •

edited

Loading

BoD Nov 19, 2021

BoD left a comment

martinbonnin commented Nov 22, 2021

Merge main in dev-3.x #3580

Merge main in dev-3.x #3580

Conversation

martinbonnin commented Nov 19, 2021 • edited Loading

⚠️ Do not squash this and create a merge commit instead so we know where main was merged.

BoD Nov 19, 2021

Choose a reason for hiding this comment

BoD left a comment

Choose a reason for hiding this comment

martinbonnin commented Nov 22, 2021

martinbonnin commented Nov 19, 2021 •

edited

Loading