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

Update to wire3.0.0-rc03 #1217

Merged
merged 1 commit into from Oct 7, 2019

Conversation

@oldergod
Copy link
Collaborator

commented Oct 4, 2019

  • Use Wire3.0.0-rc03 which doesn't depend on okio 2.5.0-SNAPSHOT.
@oldergod oldergod requested a review from swankjesse Oct 4, 2019
}

This comment has been minimized.

Copy link
@oldergod

oldergod Oct 4, 2019

Author Collaborator

All copied from Wire

"wireRuntime": "com.squareup.wire:wire-runtime:3.0.0-rc01",
"wireGrpcClient": "com.squareup.wire:wire-grpc-client:3.0.0-rc01",
"wirePlugin": "com.squareup.wire:wire-gradle-plugin:3.0.0-rc01",
"wireRuntime": "com.squareup.wire:wire-runtime-multiplatform:3.0.0-rc02",

This comment has been minimized.

Copy link
@swankjesse

swankjesse Oct 4, 2019

Collaborator

why does this change? I don’t like this because it means we could have both!

This comment has been minimized.

Copy link
@oldergod

oldergod Oct 4, 2019

Author Collaborator

I was just playing around, I think I'll revert this whole file (except for the wire's version upgrade) and will keep everything the same otherwise

@@ -47,7 +49,7 @@ sourceSets {
main.java.srcDirs += 'build/generated/source/proto/main/java'

// TODO(jwilson): we do this to make IntelliJ happy but the Wire Gradle plugin should do that.
main.java.srcDirs += 'build/generated/src/main/java'
main.java.srcDirs += 'build/generated/source/wire'

This comment has been minimized.

Copy link
@swankjesse

swankjesse Oct 4, 2019

Collaborator

nice

@@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
syntax = "proto3";
syntax = "proto2";

This comment has been minimized.

Copy link
@swankjesse

swankjesse Oct 4, 2019

Collaborator

nice

This comment has been minimized.

Copy link
@oldergod

oldergod Oct 6, 2019

Author Collaborator

Well, Wire didn't leave me much choice...

* @param grpcEncoding the content coding for the stream body.
*/
internal class GrpcMessageSink<T : Any> constructor(
private val sink: BufferedSink,
private val messageAdapter: ProtoAdapter<T>,
private val grpcEncoding: String = "identity"
) : MessageSink<T>, Closeable by sink {
private val callForCancel: Call?,

This comment has been minimized.

Copy link
@swankjesse

swankjesse Oct 4, 2019

Collaborator

For follow-up, I think we’re going to want to cancel the Jetty request.

@oldergod oldergod force-pushed the bquenaudon.2019-10-04.wire3 branch from 1cfab9d to e403828 Oct 6, 2019
Copy link
Collaborator Author

left a comment

Update to rc03 so no more SNAPSHOT shit

@@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
syntax = "proto3";
syntax = "proto2";

This comment has been minimized.

Copy link
@oldergod

oldergod Oct 6, 2019

Author Collaborator

Well, Wire didn't leave me much choice...

@oldergod oldergod force-pushed the bquenaudon.2019-10-04.wire3 branch from e403828 to b40a80e Oct 6, 2019
@oldergod oldergod changed the title WIP: update to wire3.0.0-rc02 Update to wire3.0.0-rc03 Oct 6, 2019
@oldergod oldergod force-pushed the bquenaudon.2019-10-04.wire3 branch from b40a80e to 846894c Oct 7, 2019
@oldergod oldergod force-pushed the bquenaudon.2019-10-04.wire3 branch from 846894c to 17cfaf9 Oct 7, 2019
@oldergod oldergod merged commit 08b531b into master Oct 7, 2019
3 checks passed
3 checks passed
ci/circleci: docs Your tests passed on CircleCI!
Details
ci/circleci: java Your tests passed on CircleCI!
Details
ci/circleci: node Your tests passed on CircleCI!
Details
@oldergod oldergod deleted the bquenaudon.2019-10-04.wire3 branch Oct 7, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.