Skip to content
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.

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

Merge main into dev-3.x #2813

Merged
merged 88 commits into from
Dec 23, 2020
Merged

Merge main into dev-3.x #2813

merged 88 commits into from
Dec 23, 2020

Conversation

martinbonnin
Copy link
Contributor

No description provided.

enyciaa and others added 30 commits November 3, 2020 20:55
#2723)

* Adds documentation whem using apollo with the -native-mt branch of coroutines

* Remove dependency ordering comment
Co-authored-by: Christophe DONGIEUX <[email protected]>
…#2690)

* added a 'timeoutMillis' parameter to ApolloHttpNetworkTransport

* fix doc

* use setTimeoutInterval()

* fix tests

* use timeoutIntervalForRequest

* fix tests
…tionUnits (#2730)

* add tests

* Make the compilation unit resolution lazy so that --endpoint --schema
always have precedence

* fix tests
… skipField more robust (#2741)

* adding tests for include directives and default parameters

* make SimpleResponseReader more robust

* revert #2704

* fix tests

* [Codegen] disable parsing of default variables for now (#2743)

* disable parsing of default variables for now

* merge all variable default values tests
* for Java users, put Groovy first for Gradle configuration

* aded a note that redirects to the tutorial endpoint if needed
* add uploadApolloSchema

* add ./gradlew uploadApolloSchema

* upload -> push

* exemple -> example
…2758)

* be more strict about what we download from jcenter

only download org.jetbrains.trove4j:trove4j:20160824

* looks like we don't need jcenter in the main repositories

* Revert "looks like we don't need jcenter in the main repositories"

We need it for apollo-android-support
This reverts commit f3b10f8.

* revert to AGP 3.6.2

* fix java sample
* honor package name for schema types as well

* fix typo

* fix tests
* Fix error.NonExistentClass in Metalava Signature Files

* Exclude internal packages

* Remove SNAPSHOT version

* Fix bad imports

* Revert unnecessary changes

* Fix matchingFallbacks API call

* Bump Version 0.1.1

* Revert AGP and bump Gradle Plugin to 0.1.2

* Revert more unnecessary changes

* Plugin 0.1.3

* Add signature file updates from macOS build

* Metalava Gradle 0.1.4
* mark the convertApolloSchema task as never up-to-date as it's intented
to be used from the command line

* Annotate parameters as Input
vkondrav and others added 20 commits December 21, 2020 14:46
…sses json representation (#2776)

* Make generated classes for enum types implement a common interface

Objects representing enums in sealed classes don't have stable toString() implementation: instead, they'll return the class name along with memory address for that object. This breaks SQLite-based caching for queries that accept enum parameters, as toString() is used to generate the query key, so it would change between app restarts. This commit fixes this behavior by adding an EnumValue interface to types representing enums, and using its `rawValue` property to build proper cache key.

Fixes #2775

* added a test for sealed classes cache keys

Co-authored-by: Martin Bonnin <[email protected]>
* another attempt at publishing from CI

This time, it will only upload the artifact and the final releasing step
still needs to be done on bintray.com/oss.sontatype.org

Except for the plugin portal which doesn't separate these steps so it is
run last so that it's only released if all uploads went well

* fix name of the snoatype task
Using the `-P` parameters have been deprecated
toDeferred has been deprecated and should be replaces by just await.
Changes Wikipedia's link from `fr` to `en. (Since this is an English tutorial)
* fix ApolloQueryWatcher.clone() and move test to Kotlin

* added a test case

* add another test case

* remove unused import
…2809)

* Rename .java to .kt

* Convert WebSocketSubscriptionTransport to Kotlin

* Rename .java to .kt

* Rewrite OperationClientMessage to a sealed class

* Implement support for AWS AppSync in WebSocketSubscriptionTransport

* Rename .java to .kt

* Fix the broken test

* Fix the binary compatibility

* Use Utils.writeToJson

* Use Utils.writeToJson

* Rename .java to .kt

* Convert OperationServerMessage to a sealed class

* Rewrite the writing and reading to use a serializer

* Replace the data classes with regular classes

* Replace delegation with method calls

* Update the deprecation message

* Rename buildAppSyncWebSocketUrl to buildWebSocketUrl

* Rename .java to .kt

* Add tests and documentation
Copy link
Contributor

@sav007 sav007 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well :)

@martinbonnin martinbonnin merged commit d59f2a1 into dev-3.x Dec 23, 2020
@martinbonnin martinbonnin deleted the merge-main branch December 23, 2020 08:52
@martinbonnin
Copy link
Contributor Author

Looks like It didn't clash with #2816 🙌

Also, I forgot to use the "create a merge commit" option and not the default "squash" when merging so I added a manual merge commit there to keep track of the merges: 83ec9f8

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.