diff options
| author |  ccalvarin <ccalvarin@google.com> | 2017-07-17 21:13:39 +0200 |
|---|---|---|
| committer |  Damien Martin-Guillerez <dmarting@google.com> | 2017-07-18 09:49:06 +0200 |
| commit | c82a19714dac1210654640ac1f5ca4d96df716a8 (patch) | |
| tree | 11d0f8cb2d0223ce6ccf4fd33de3ffc8fc8c9787 /src/objc_tools | |
| parent | 3beea11f340029e763880631c15cd84eee440d42 (diff) | |
Make the @Option annotation depend on the java version of the tagging enums.
The option filters proto dependency can be removed from the OptionsParser. This is in response to option parser users that want to avoid the bazel-internal proto file in their dependencies.
RELNOTES: None.
PiperOrigin-RevId: 162249778
Diffstat (limited to 'src/objc_tools')
| -rw-r--r-- | src/objc_tools/plmerge/BUILD | 2 | ||||
| -rw-r--r-- | src/objc_tools/plmerge/java/com/google/devtools/build/xcode/plmerge/PlMerge.java | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/objc_tools/plmerge/BUILD b/src/objc_tools/plmerge/BUILD index acaeb9abf8..49aafc28ca 100644 --- a/src/objc_tools/plmerge/BUILD +++ b/src/objc_tools/plmerge/BUILD @@ -8,7 +8,6 @@ java_binary( deps = [ ":plmerge_lib", "//src/main/java/com/google/devtools/common/options", - "//src/main/protobuf:option_filters_java_proto", "//src/main/protobuf:plmerge_java_proto", "//third_party:guava", "//third_party/java/dd_plist", @@ -22,7 +21,6 @@ java_library( ), deps = [ "//src/main/java/com/google/devtools/common/options", - "//src/main/protobuf:option_filters_java_proto", "//src/main/protobuf:plmerge_java_proto", "//src/tools/xcode-common/java/com/google/devtools/build/xcode/common", "//src/tools/xcode-common/java/com/google/devtools/build/xcode/util", diff --git a/src/objc_tools/plmerge/java/com/google/devtools/build/xcode/plmerge/PlMerge.java b/src/objc_tools/plmerge/java/com/google/devtools/build/xcode/plmerge/PlMerge.java index 8b24917e32..992b1fbfcc 100644 --- a/src/objc_tools/plmerge/java/com/google/devtools/build/xcode/plmerge/PlMerge.java +++ b/src/objc_tools/plmerge/java/com/google/devtools/build/xcode/plmerge/PlMerge.java @@ -18,11 +18,11 @@ import com.google.common.base.Strings; import com.google.devtools.build.xcode.plmerge.proto.PlMergeProtos.Control; import com.google.devtools.common.options.Option; import com.google.devtools.common.options.OptionDocumentationCategory; +import com.google.devtools.common.options.OptionEffectTag; import com.google.devtools.common.options.Options; import com.google.devtools.common.options.OptionsBase; import com.google.devtools.common.options.OptionsParser; import com.google.devtools.common.options.OptionsParsingException; -import com.google.devtools.common.options.proto.OptionFilters.OptionEffectTag; import java.io.IOException; import java.io.InputStream; import java.nio.file.FileSystem; |