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.

Sign up for GitHub

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

Jump to bottom

android: final stabilization of AndroidChannelBuilder #6097

Merged
merged 2 commits into from Aug 28, 2019
Merged

android: final stabilization of AndroidChannelBuilder #6097

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
199443d
Removed ExperimentalApi annotation for AndroidChannelBuilder
voidzcy Aug 27, 2019
4129de5
Put ExperimentalApi annotation back to deprecated method.
voidzcy Aug 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion android/src/main/java/io/grpc/android/AndroidChannelBuilder.java
View file
Open in desktop
Expand Up @@ -51,7 +51,6 @@
*
* @since 1.12.0
*/
@ExperimentalApi("https://github.com/grpc/grpc-java/issues/6043")
Copy link
Member

Choose a reason for hiding this comment

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

Go ahead and copy this to the @Deprecated method. In general, we can't remove deprecated methods. We can only remove this one because it was never stabilized.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

public final class AndroidChannelBuilder extends ForwardingChannelBuilder<AndroidChannelBuilder> {

private static final String LOG_TAG = "AndroidChannelBuilder";
Expand Down Expand Up @@ -90,6 +89,7 @@ public static AndroidChannelBuilder forAddress(String name, int port) {
*
* @deprecated Use {@link #usingBuilder(ManagedChannelBuilder)} instead.
*/
@ExperimentalApi("https://github.com/grpc/grpc-java/issues/6043")
@Deprecated
public static AndroidChannelBuilder fromBuilder(ManagedChannelBuilder<?> builder) {
return usingBuilder(builder);
Expand Down