Skip to content

Migrate from is(Not)SameAs to is(Not)SameInstanceAs. #505

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

Merged
merged 1 commit into from
Jun 11, 2019

Conversation

cpovirk
Copy link
Contributor

@cpovirk cpovirk commented Jun 7, 2019

They behave identically, and the old names are being removed.

This requires updating to Truth 0.44 or higher, so I've gone straight to 0.45.

@googlebot googlebot added the cla: yes Override cla label Jun 7, 2019
@google-oss-bot
Copy link
Contributor

Hi @cpovirk. Thanks for your PR.

I'm waiting for a firebase member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@wilhuff
Copy link
Contributor

wilhuff commented Jun 7, 2019

/ok-to-test

@wilhuff
Copy link
Contributor

wilhuff commented Jun 7, 2019

This failed because there were references to isSame in Kotlin?

e.g.

e: /home/prow/go/src/github.com/firebase/firebase-android-sdk/firebase-firestore/ktx/src/test/kotlin/com/google/firebase/firestore/ktx/FirestoreTests.kt: (78, 40): Unresolved reference: isSameAs
e: /home/prow/go/src/github.com/firebase/firebase-android-sdk/firebase-firestore/ktx/src/test/kotlin/com/google/firebase/firestore/ktx/FirestoreTests.kt: (84, 45): Unresolved reference: isSameAs

@cpovirk
Copy link
Contributor Author

cpovirk commented Jun 7, 2019

@cpovirk
Copy link
Contributor Author

cpovirk commented Jun 7, 2019

Oh, I found the "Raw build-log.txt" link. And yes, if you were in any doubt, you're correct :)

@cpovirk
Copy link
Contributor Author

cpovirk commented Jun 7, 2019

...and I didn't search for all Kotlin references, so I missed some... in fact, the exact ones you pointed out. Fixed now, I hope.

@cpovirk
Copy link
Contributor Author

cpovirk commented Jun 7, 2019

/test check-changed

@cpovirk
Copy link
Contributor Author

cpovirk commented Jun 7, 2019

Phew, passed this time :)

They behave identically, and the old names are being removed.

This requires updating to Truth 0.44 or higher, so I've gone straight to 0.45.
@cpovirk
Copy link
Contributor Author

cpovirk commented Jun 11, 2019

Resolved merge conflict. (d9ed980 had also updated Truth, though only to 0.44. I can use 0.44 in my PR if you prefer.)

@vkryachko
Copy link
Member

/test all

Copy link
Member

@vkryachko vkryachko left a comment

Choose a reason for hiding this comment

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

I've re-scheduled presubmits once again as our repo has just migrated to androidx so I just want to make sure your PR still builds fine. Please wait for them to succeed before merging.

@cpovirk
Copy link
Contributor Author

cpovirk commented Jun 11, 2019

Thanks. Looks like all is well. I don't have write access, so I can't do any damage, but someone else can merge when desired :)

@vkryachko vkryachko merged commit 63232fc into firebase:master Jun 11, 2019
@cpovirk cpovirk deleted the sameas branch June 12, 2019 15:37
@firebase firebase locked and limited conversation to collaborators Oct 10, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants