- getInputsList() {
- if (inputsBuilder_ == null) {
- return java.util.Collections.unmodifiableList(inputs_);
- } else {
- return inputsBuilder_.getMessageList();
- }
- }
- /**
- * repeated .blaze.worker.Input inputs = 2;
- *
- *
- * The inputs that the worker is allowed to read during execution of this
- * request.
- *
- */
- public int getInputsCount() {
- if (inputsBuilder_ == null) {
- return inputs_.size();
- } else {
- return inputsBuilder_.getCount();
- }
- }
- /**
- * repeated .blaze.worker.Input inputs = 2;
- *
- *
- * The inputs that the worker is allowed to read during execution of this
- * request.
- *
- */
- public com.google.devtools.build.lib.worker.WorkerProtocol.Input getInputs(int index) {
- if (inputsBuilder_ == null) {
- return inputs_.get(index);
- } else {
- return inputsBuilder_.getMessage(index);
- }
- }
- /**
- * repeated .blaze.worker.Input inputs = 2;
- *
- *
- * The inputs that the worker is allowed to read during execution of this
- * request.
- *
- */
- public Builder setInputs(
- int index, com.google.devtools.build.lib.worker.WorkerProtocol.Input value) {
- if (inputsBuilder_ == null) {
- if (value == null) {
- throw new NullPointerException();
- }
- ensureInputsIsMutable();
- inputs_.set(index, value);
- onChanged();
- } else {
- inputsBuilder_.setMessage(index, value);
- }
- return this;
- }
- /**
- * repeated .blaze.worker.Input inputs = 2;
- *
- *
- * The inputs that the worker is allowed to read during execution of this
- * request.
- *
- */
- public Builder setInputs(
- int index,
- com.google.devtools.build.lib.worker.WorkerProtocol.Input.Builder builderForValue) {
- if (inputsBuilder_ == null) {
- ensureInputsIsMutable();
- inputs_.set(index, builderForValue.build());
- onChanged();
- } else {
- inputsBuilder_.setMessage(index, builderForValue.build());
- }
- return this;
- }
- /**
- * repeated .blaze.worker.Input inputs = 2;
- *
- *
- * The inputs that the worker is allowed to read during execution of this
- * request.
- *
- */
- public Builder addInputs(com.google.devtools.build.lib.worker.WorkerProtocol.Input value) {
- if (inputsBuilder_ == null) {
- if (value == null) {
- throw new NullPointerException();
- }
- ensureInputsIsMutable();
- inputs_.add(value);
- onChanged();
- } else {
- inputsBuilder_.addMessage(value);
- }
- return this;
- }
- /**
- * repeated .blaze.worker.Input inputs = 2;
- *
- *
- * The inputs that the worker is allowed to read during execution of this
- * request.
- *
- */
- public Builder addInputs(
- int index, com.google.devtools.build.lib.worker.WorkerProtocol.Input value) {
- if (inputsBuilder_ == null) {
- if (value == null) {
- throw new NullPointerException();
- }
- ensureInputsIsMutable();
- inputs_.add(index, value);
- onChanged();
- } else {
- inputsBuilder_.addMessage(index, value);
- }
- return this;
- }
- /**
- * repeated .blaze.worker.Input inputs = 2;
- *
- *
- * The inputs that the worker is allowed to read during execution of this
- * request.
- *
- */
- public Builder addInputs(
- com.google.devtools.build.lib.worker.WorkerProtocol.Input.Builder builderForValue) {
- if (inputsBuilder_ == null) {
- ensureInputsIsMutable();
- inputs_.add(builderForValue.build());
- onChanged();
- } else {
- inputsBuilder_.addMessage(builderForValue.build());
- }
- return this;
- }
- /**
- * repeated .blaze.worker.Input inputs = 2;
- *
- *
- * The inputs that the worker is allowed to read during execution of this
- * request.
- *
- */
- public Builder addInputs(
- int index,
- com.google.devtools.build.lib.worker.WorkerProtocol.Input.Builder builderForValue) {
- if (inputsBuilder_ == null) {
- ensureInputsIsMutable();
- inputs_.add(index, builderForValue.build());
- onChanged();
- } else {
- inputsBuilder_.addMessage(index, builderForValue.build());
- }
- return this;
- }
- /**
- * repeated .blaze.worker.Input inputs = 2;
- *
- *
- * The inputs that the worker is allowed to read during execution of this
- * request.
- *
- */
- public Builder addAllInputs(
- java.lang.Iterable
- values) {
- if (inputsBuilder_ == null) {
- ensureInputsIsMutable();
- com.google.protobuf.AbstractMessageLite.Builder.addAll(values, inputs_);
- onChanged();
- } else {
- inputsBuilder_.addAllMessages(values);
- }
- return this;
- }
- /**
- * repeated .blaze.worker.Input inputs = 2;
- *
- *
- * The inputs that the worker is allowed to read during execution of this
- * request.
- *
- */
- public Builder clearInputs() {
- if (inputsBuilder_ == null) {
- inputs_ = java.util.Collections.emptyList();
- bitField0_ = (bitField0_ & ~0x00000002);
- onChanged();
- } else {
- inputsBuilder_.clear();
- }
- return this;
- }
- /**
- * repeated .blaze.worker.Input inputs = 2;
- *
- *
- * The inputs that the worker is allowed to read during execution of this
- * request.
- *
- */
- public Builder removeInputs(int index) {
- if (inputsBuilder_ == null) {
- ensureInputsIsMutable();
- inputs_.remove(index);
- onChanged();
- } else {
- inputsBuilder_.remove(index);
- }
- return this;
- }
- /**
- * repeated .blaze.worker.Input inputs = 2;
- *
- *
- * The inputs that the worker is allowed to read during execution of this
- * request.
- *
- */
- public com.google.devtools.build.lib.worker.WorkerProtocol.Input.Builder getInputsBuilder(
- int index) {
- return getInputsFieldBuilder().getBuilder(index);
- }
- /**
- * repeated .blaze.worker.Input inputs = 2;
- *
- *
- * The inputs that the worker is allowed to read during execution of this
- * request.
- *
- */
- public com.google.devtools.build.lib.worker.WorkerProtocol.InputOrBuilder getInputsOrBuilder(
- int index) {
- if (inputsBuilder_ == null) {
- return inputs_.get(index);
- } else {
- return inputsBuilder_.getMessageOrBuilder(index);
- }
- }
- /**
- * repeated .blaze.worker.Input inputs = 2;
- *
- *
- * The inputs that the worker is allowed to read during execution of this
- * request.
- *
- */
- public java.util.List<
- ? extends com.google.devtools.build.lib.worker.WorkerProtocol.InputOrBuilder>
- getInputsOrBuilderList() {
- if (inputsBuilder_ != null) {
- return inputsBuilder_.getMessageOrBuilderList();
- } else {
- return java.util.Collections.unmodifiableList(inputs_);
- }
- }
- /**
- * repeated .blaze.worker.Input inputs = 2;
- *
- *
- * The inputs that the worker is allowed to read during execution of this
- * request.
- *
- */
- public com.google.devtools.build.lib.worker.WorkerProtocol.Input.Builder addInputsBuilder() {
- return getInputsFieldBuilder()
- .addBuilder(
- com.google.devtools.build.lib.worker.WorkerProtocol.Input.getDefaultInstance());
- }
- /**
- * repeated .blaze.worker.Input inputs = 2;
- *
- *
- * The inputs that the worker is allowed to read during execution of this
- * request.
- *
- */
- public com.google.devtools.build.lib.worker.WorkerProtocol.Input.Builder addInputsBuilder(
- int index) {
- return getInputsFieldBuilder()
- .addBuilder(
- index,
- com.google.devtools.build.lib.worker.WorkerProtocol.Input.getDefaultInstance());
- }
- /**
- * repeated .blaze.worker.Input inputs = 2;
- *
- *
- * The inputs that the worker is allowed to read during execution of this
- * request.
- *
- */
- public java.util.List
- getInputsBuilderList() {
- return getInputsFieldBuilder().getBuilderList();
- }
-
- private com.google.protobuf.RepeatedFieldBuilder<
- com.google.devtools.build.lib.worker.WorkerProtocol.Input,
- com.google.devtools.build.lib.worker.WorkerProtocol.Input.Builder,
- com.google.devtools.build.lib.worker.WorkerProtocol.InputOrBuilder>
- getInputsFieldBuilder() {
- if (inputsBuilder_ == null) {
- inputsBuilder_ =
- new com.google.protobuf.RepeatedFieldBuilder<
- com.google.devtools.build.lib.worker.WorkerProtocol.Input,
- com.google.devtools.build.lib.worker.WorkerProtocol.Input.Builder,
- com.google.devtools.build.lib.worker.WorkerProtocol.InputOrBuilder>(
- inputs_,
- ((bitField0_ & 0x00000002) == 0x00000002),
- getParentForChildren(),
- isClean());
- inputs_ = null;
- }
- return inputsBuilder_;
- }
-
- public final Builder setUnknownFields(
- final com.google.protobuf.UnknownFieldSet unknownFields) {
- return this;
- }
-
- public final Builder mergeUnknownFields(
- final com.google.protobuf.UnknownFieldSet unknownFields) {
- return this;
- }
-
- // @@protoc_insertion_point(builder_scope:blaze.worker.WorkRequest)
- }
-
- // @@protoc_insertion_point(class_scope:blaze.worker.WorkRequest)
- private static final com.google.devtools.build.lib.worker.WorkerProtocol.WorkRequest
- DEFAULT_INSTANCE;
-
- static {
- DEFAULT_INSTANCE = new com.google.devtools.build.lib.worker.WorkerProtocol.WorkRequest();
- }
-
- public static com.google.devtools.build.lib.worker.WorkerProtocol.WorkRequest
- getDefaultInstance() {
- return DEFAULT_INSTANCE;
- }
-
- private static final com.google.protobuf.Parser PARSER =
- new com.google.protobuf.AbstractParser() {
- public WorkRequest parsePartialFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
- try {
- return new WorkRequest(input, extensionRegistry);
- } catch (RuntimeException e) {
- if (e.getCause() instanceof com.google.protobuf.InvalidProtocolBufferException) {
- throw (com.google.protobuf.InvalidProtocolBufferException) e.getCause();
- }
- throw e;
- }
- }
- };
-
- public static com.google.protobuf.Parser parser() {
- return PARSER;
- }
-
- @java.lang.Override
- public com.google.protobuf.Parser getParserForType() {
- return PARSER;
- }
-
- public com.google.devtools.build.lib.worker.WorkerProtocol.WorkRequest
- getDefaultInstanceForType() {
- return DEFAULT_INSTANCE;
- }
- }
-
- public interface WorkResponseOrBuilder
- extends
- // @@protoc_insertion_point(interface_extends:blaze.worker.WorkResponse)
- com.google.protobuf.MessageOrBuilder {
-
- /** optional int32 exit_code = 1; */
- int getExitCode();
-
- /**
- * optional string output = 2;
- *
- *
- * This is printed to the user after the WorkResponse has been received and is supposed to contain
- * compiler warnings / errors etc. - thus we'll use a string type here, which gives us UTF-8
- * encoding.
- *
- */
- java.lang.String getOutput();
- /**
- * optional string output = 2;
- *
- *
- * This is printed to the user after the WorkResponse has been received and is supposed to contain
- * compiler warnings / errors etc. - thus we'll use a string type here, which gives us UTF-8
- * encoding.
- *
- */
- com.google.protobuf.ByteString getOutputBytes();
- }
- /**
- * Protobuf type {@code blaze.worker.WorkResponse}
- *
- *
- * The worker sends this message to Blaze when it finished its work on the WorkRequest message.
- *
- */
- public static final class WorkResponse extends com.google.protobuf.GeneratedMessage
- implements
- // @@protoc_insertion_point(message_implements:blaze.worker.WorkResponse)
- WorkResponseOrBuilder {
- // Use WorkResponse.newBuilder() to construct.
- private WorkResponse(com.google.protobuf.GeneratedMessage.Builder builder) {
- super(builder);
- }
-
- private WorkResponse() {
- exitCode_ = 0;
- output_ = "";
- }
-
- @java.lang.Override
- public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
- return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
- }
-
- private WorkResponse(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry) {
- this();
- int mutable_bitField0_ = 0;
- try {
- boolean done = false;
- while (!done) {
- int tag = input.readTag();
- switch (tag) {
- case 0:
- done = true;
- break;
- default:
- {
- if (!input.skipField(tag)) {
- done = true;
- }
- break;
- }
- case 8:
- {
- exitCode_ = input.readInt32();
- break;
- }
- case 18:
- {
- String s = input.readStringRequireUtf8();
-
- output_ = s;
- break;
- }
- }
- }
- } catch (com.google.protobuf.InvalidProtocolBufferException e) {
- throw new RuntimeException(e.setUnfinishedMessage(this));
- } catch (java.io.IOException e) {
- throw new RuntimeException(
- new com.google.protobuf.InvalidProtocolBufferException(e.getMessage())
- .setUnfinishedMessage(this));
- } finally {
- makeExtensionsImmutable();
- }
- }
-
- public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
- return com.google.devtools.build.lib.worker.WorkerProtocol
- .internal_static_blaze_worker_WorkResponse_descriptor;
- }
-
- protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
- internalGetFieldAccessorTable() {
- return com.google.devtools.build.lib.worker.WorkerProtocol
- .internal_static_blaze_worker_WorkResponse_fieldAccessorTable
- .ensureFieldAccessorsInitialized(
- com.google.devtools.build.lib.worker.WorkerProtocol.WorkResponse.class,
- com.google.devtools.build.lib.worker.WorkerProtocol.WorkResponse.Builder.class);
- }
-
- public static final int EXIT_CODE_FIELD_NUMBER = 1;
- private int exitCode_;
- /** optional int32 exit_code = 1; */
- public int getExitCode() {
- return exitCode_;
- }
-
- public static final int OUTPUT_FIELD_NUMBER = 2;
- private volatile java.lang.Object output_;
- /**
- * optional string output = 2;
- *
- *
- * This is printed to the user after the WorkResponse has been received and is supposed to contain
- * compiler warnings / errors etc. - thus we'll use a string type here, which gives us UTF-8
- * encoding.
- *
- */
- public java.lang.String getOutput() {
- java.lang.Object ref = output_;
- if (ref instanceof java.lang.String) {
- return (java.lang.String) ref;
- } else {
- com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
- java.lang.String s = bs.toStringUtf8();
- output_ = s;
- return s;
- }
- }
- /**
- * optional string output = 2;
- *
- *
- * This is printed to the user after the WorkResponse has been received and is supposed to contain
- * compiler warnings / errors etc. - thus we'll use a string type here, which gives us UTF-8
- * encoding.
- *
- */
- public com.google.protobuf.ByteString getOutputBytes() {
- java.lang.Object ref = output_;
- if (ref instanceof java.lang.String) {
- com.google.protobuf.ByteString b =
- com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
- output_ = b;
- return b;
- } else {
- return (com.google.protobuf.ByteString) ref;
- }
- }
-
- private byte memoizedIsInitialized = -1;
-
- public final boolean isInitialized() {
- byte isInitialized = memoizedIsInitialized;
- if (isInitialized == 1) return true;
- if (isInitialized == 0) return false;
-
- memoizedIsInitialized = 1;
- return true;
- }
-
- public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
- if (exitCode_ != 0) {
- output.writeInt32(1, exitCode_);
- }
- if (!getOutputBytes().isEmpty()) {
- com.google.protobuf.GeneratedMessage.writeString(output, 2, output_);
- }
- }
-
- public int getSerializedSize() {
- int size = memoizedSize;
- if (size != -1) return size;
-
- size = 0;
- if (exitCode_ != 0) {
- size += com.google.protobuf.CodedOutputStream.computeInt32Size(1, exitCode_);
- }
- if (!getOutputBytes().isEmpty()) {
- size += com.google.protobuf.GeneratedMessage.computeStringSize(2, output_);
- }
- memoizedSize = size;
- return size;
- }
-
- private static final long serialVersionUID = 0L;
-
- public static com.google.devtools.build.lib.worker.WorkerProtocol.WorkResponse parseFrom(
- com.google.protobuf.ByteString data)
- throws com.google.protobuf.InvalidProtocolBufferException {
- return PARSER.parseFrom(data);
- }
-
- public static com.google.devtools.build.lib.worker.WorkerProtocol.WorkResponse parseFrom(
- com.google.protobuf.ByteString data,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
- return PARSER.parseFrom(data, extensionRegistry);
- }
-
- public static com.google.devtools.build.lib.worker.WorkerProtocol.WorkResponse parseFrom(
- byte[] data) throws com.google.protobuf.InvalidProtocolBufferException {
- return PARSER.parseFrom(data);
- }
-
- public static com.google.devtools.build.lib.worker.WorkerProtocol.WorkResponse parseFrom(
- byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
- return PARSER.parseFrom(data, extensionRegistry);
- }
-
- public static com.google.devtools.build.lib.worker.WorkerProtocol.WorkResponse parseFrom(
- java.io.InputStream input) throws java.io.IOException {
- return PARSER.parseFrom(input);
- }
-
- public static com.google.devtools.build.lib.worker.WorkerProtocol.WorkResponse parseFrom(
- java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws java.io.IOException {
- return PARSER.parseFrom(input, extensionRegistry);
- }
-
- public static com.google.devtools.build.lib.worker.WorkerProtocol.WorkResponse
- parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
- return PARSER.parseDelimitedFrom(input);
- }
-
- public static com.google.devtools.build.lib.worker.WorkerProtocol.WorkResponse
- parseDelimitedFrom(
- java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws java.io.IOException {
- return PARSER.parseDelimitedFrom(input, extensionRegistry);
- }
-
- public static com.google.devtools.build.lib.worker.WorkerProtocol.WorkResponse parseFrom(
- com.google.protobuf.CodedInputStream input) throws java.io.IOException {
- return PARSER.parseFrom(input);
- }
-
- public static com.google.devtools.build.lib.worker.WorkerProtocol.WorkResponse parseFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws java.io.IOException {
- return PARSER.parseFrom(input, extensionRegistry);
- }
-
- public Builder newBuilderForType() {
- return newBuilder();
- }
-
- public static Builder newBuilder() {
- return DEFAULT_INSTANCE.toBuilder();
- }
-
- public static Builder newBuilder(
- com.google.devtools.build.lib.worker.WorkerProtocol.WorkResponse prototype) {
- return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
- }
-
- public Builder toBuilder() {
- return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
- }
-
- @java.lang.Override
- protected Builder newBuilderForType(com.google.protobuf.GeneratedMessage.BuilderParent parent) {
- Builder builder = new Builder(parent);
- return builder;
- }
- /**
- * Protobuf type {@code blaze.worker.WorkResponse}
- *
- *
- * The worker sends this message to Blaze when it finished its work on the WorkRequest message.
- *
- */
- public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder
- implements
- // @@protoc_insertion_point(builder_implements:blaze.worker.WorkResponse)
- com.google.devtools.build.lib.worker.WorkerProtocol.WorkResponseOrBuilder {
- public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
- return com.google.devtools.build.lib.worker.WorkerProtocol
- .internal_static_blaze_worker_WorkResponse_descriptor;
- }
-
- protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
- internalGetFieldAccessorTable() {
- return com.google.devtools.build.lib.worker.WorkerProtocol
- .internal_static_blaze_worker_WorkResponse_fieldAccessorTable
- .ensureFieldAccessorsInitialized(
- com.google.devtools.build.lib.worker.WorkerProtocol.WorkResponse.class,
- com.google.devtools.build.lib.worker.WorkerProtocol.WorkResponse.Builder.class);
- }
-
- // Construct using
- // com.google.devtools.build.lib.worker.WorkerProtocol.WorkResponse.newBuilder()
- private Builder() {
- maybeForceBuilderInitialization();
- }
-
- private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) {
- super(parent);
- maybeForceBuilderInitialization();
- }
-
- private void maybeForceBuilderInitialization() {
- if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {}
- }
-
- public Builder clear() {
- super.clear();
- exitCode_ = 0;
-
- output_ = "";
-
- return this;
- }
-
- public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
- return com.google.devtools.build.lib.worker.WorkerProtocol
- .internal_static_blaze_worker_WorkResponse_descriptor;
- }
-
- public com.google.devtools.build.lib.worker.WorkerProtocol.WorkResponse
- getDefaultInstanceForType() {
- return com.google.devtools.build.lib.worker.WorkerProtocol.WorkResponse
- .getDefaultInstance();
- }
-
- public com.google.devtools.build.lib.worker.WorkerProtocol.WorkResponse build() {
- com.google.devtools.build.lib.worker.WorkerProtocol.WorkResponse result = buildPartial();
- if (!result.isInitialized()) {
- throw newUninitializedMessageException(result);
- }
- return result;
- }
-
- public com.google.devtools.build.lib.worker.WorkerProtocol.WorkResponse buildPartial() {
- com.google.devtools.build.lib.worker.WorkerProtocol.WorkResponse result =
- new com.google.devtools.build.lib.worker.WorkerProtocol.WorkResponse(this);
- result.exitCode_ = exitCode_;
- result.output_ = output_;
- onBuilt();
- return result;
- }
-
- public Builder mergeFrom(com.google.protobuf.Message other) {
- if (other instanceof com.google.devtools.build.lib.worker.WorkerProtocol.WorkResponse) {
- return mergeFrom(
- (com.google.devtools.build.lib.worker.WorkerProtocol.WorkResponse) other);
- } else {
- super.mergeFrom(other);
- return this;
- }
- }
-
- public Builder mergeFrom(
- com.google.devtools.build.lib.worker.WorkerProtocol.WorkResponse other) {
- if (other
- == com.google.devtools.build.lib.worker.WorkerProtocol.WorkResponse
- .getDefaultInstance()) return this;
- if (other.getExitCode() != 0) {
- setExitCode(other.getExitCode());
- }
- if (!other.getOutput().isEmpty()) {
- output_ = other.output_;
- onChanged();
- }
- onChanged();
- return this;
- }
-
- public final boolean isInitialized() {
- return true;
- }
-
- public Builder mergeFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws java.io.IOException {
- com.google.devtools.build.lib.worker.WorkerProtocol.WorkResponse parsedMessage = null;
- try {
- parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
- } catch (com.google.protobuf.InvalidProtocolBufferException e) {
- parsedMessage =
- (com.google.devtools.build.lib.worker.WorkerProtocol.WorkResponse)
- e.getUnfinishedMessage();
- throw e;
- } finally {
- if (parsedMessage != null) {
- mergeFrom(parsedMessage);
- }
- }
- return this;
- }
-
- private int exitCode_;
- /** optional int32 exit_code = 1; */
- public int getExitCode() {
- return exitCode_;
- }
- /** optional int32 exit_code = 1; */
- public Builder setExitCode(int value) {
-
- exitCode_ = value;
- onChanged();
- return this;
- }
- /** optional int32 exit_code = 1; */
- public Builder clearExitCode() {
-
- exitCode_ = 0;
- onChanged();
- return this;
- }
-
- private java.lang.Object output_ = "";
- /**
- * optional string output = 2;
- *
- *
- * This is printed to the user after the WorkResponse has been received and is supposed to contain
- * compiler warnings / errors etc. - thus we'll use a string type here, which gives us UTF-8
- * encoding.
- *
- */
- public java.lang.String getOutput() {
- java.lang.Object ref = output_;
- if (!(ref instanceof java.lang.String)) {
- com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
- java.lang.String s = bs.toStringUtf8();
- output_ = s;
- return s;
- } else {
- return (java.lang.String) ref;
- }
- }
- /**
- * optional string output = 2;
- *
- *
- * This is printed to the user after the WorkResponse has been received and is supposed to contain
- * compiler warnings / errors etc. - thus we'll use a string type here, which gives us UTF-8
- * encoding.
- *
- */
- public com.google.protobuf.ByteString getOutputBytes() {
- java.lang.Object ref = output_;
- if (ref instanceof String) {
- com.google.protobuf.ByteString b =
- com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
- output_ = b;
- return b;
- } else {
- return (com.google.protobuf.ByteString) ref;
- }
- }
- /**
- * optional string output = 2;
- *
- *
- * This is printed to the user after the WorkResponse has been received and is supposed to contain
- * compiler warnings / errors etc. - thus we'll use a string type here, which gives us UTF-8
- * encoding.
- *
- */
- public Builder setOutput(java.lang.String value) {
- if (value == null) {
- throw new NullPointerException();
- }
-
- output_ = value;
- onChanged();
- return this;
- }
- /**
- * optional string output = 2;
- *
- *
- * This is printed to the user after the WorkResponse has been received and is supposed to contain
- * compiler warnings / errors etc. - thus we'll use a string type here, which gives us UTF-8
- * encoding.
- *
- */
- public Builder clearOutput() {
-
- output_ = getDefaultInstance().getOutput();
- onChanged();
- return this;
- }
- /**
- * optional string output = 2;
- *
- *
- * This is printed to the user after the WorkResponse has been received and is supposed to contain
- * compiler warnings / errors etc. - thus we'll use a string type here, which gives us UTF-8
- * encoding.
- *
- */
- public Builder setOutputBytes(com.google.protobuf.ByteString value) {
- if (value == null) {
- throw new NullPointerException();
- }
- checkByteStringIsUtf8(value);
-
- output_ = value;
- onChanged();
- return this;
- }
-
- public final Builder setUnknownFields(
- final com.google.protobuf.UnknownFieldSet unknownFields) {
- return this;
- }
-
- public final Builder mergeUnknownFields(
- final com.google.protobuf.UnknownFieldSet unknownFields) {
- return this;
- }
-
- // @@protoc_insertion_point(builder_scope:blaze.worker.WorkResponse)
- }
-
- // @@protoc_insertion_point(class_scope:blaze.worker.WorkResponse)
- private static final com.google.devtools.build.lib.worker.WorkerProtocol.WorkResponse
- DEFAULT_INSTANCE;
-
- static {
- DEFAULT_INSTANCE = new com.google.devtools.build.lib.worker.WorkerProtocol.WorkResponse();
- }
-
- public static com.google.devtools.build.lib.worker.WorkerProtocol.WorkResponse
- getDefaultInstance() {
- return DEFAULT_INSTANCE;
- }
-
- private static final com.google.protobuf.Parser PARSER =
- new com.google.protobuf.AbstractParser() {
- public WorkResponse parsePartialFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
- try {
- return new WorkResponse(input, extensionRegistry);
- } catch (RuntimeException e) {
- if (e.getCause() instanceof com.google.protobuf.InvalidProtocolBufferException) {
- throw (com.google.protobuf.InvalidProtocolBufferException) e.getCause();
- }
- throw e;
- }
- }
- };
-
- public static com.google.protobuf.Parser parser() {
- return PARSER;
- }
-
- @java.lang.Override
- public com.google.protobuf.Parser getParserForType() {
- return PARSER;
- }
-
- public com.google.devtools.build.lib.worker.WorkerProtocol.WorkResponse
- getDefaultInstanceForType() {
- return DEFAULT_INSTANCE;
- }
- }
-
- private static com.google.protobuf.Descriptors.Descriptor
- internal_static_blaze_worker_Input_descriptor;
- private static com.google.protobuf.GeneratedMessage.FieldAccessorTable
- internal_static_blaze_worker_Input_fieldAccessorTable;
- private static com.google.protobuf.Descriptors.Descriptor
- internal_static_blaze_worker_WorkRequest_descriptor;
- private static com.google.protobuf.GeneratedMessage.FieldAccessorTable
- internal_static_blaze_worker_WorkRequest_fieldAccessorTable;
- private static com.google.protobuf.Descriptors.Descriptor
- internal_static_blaze_worker_WorkResponse_descriptor;
- private static com.google.protobuf.GeneratedMessage.FieldAccessorTable
- internal_static_blaze_worker_WorkResponse_fieldAccessorTable;
-
- public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
- return descriptor;
- }
-
- private static com.google.protobuf.Descriptors.FileDescriptor descriptor;
-
- static {
- java.lang.String[] descriptorData = {
- "\n\220\001bazel-out/local-fastbuild/bin/externa"
- + "l/io_bazel/src/main/protobuf/libworker_p"
- + "rotocol_java_proto_srcjar.srcjar.preproc"
- + "essed/worker_protocol.proto\022\014blaze.worke"
- + "r\"%\n\005Input\022\014\n\004path\030\001 \001(\t\022\016\n\006digest\030\002 \001(\014"
- + "\"E\n\013WorkRequest\022\021\n\targuments\030\001 \003(\t\022#\n\006in"
- + "puts\030\002 \003(\0132\023.blaze.worker.Input\"1\n\014WorkR"
- + "esponse\022\021\n\texit_code\030\001 \001(\005\022\016\n\006output\030\002 \001"
- + "(\tB&\n$com.google.devtools.build.lib.work"
- + "erb\006proto3"
- };
- com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
- new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
- public com.google.protobuf.ExtensionRegistry assignDescriptors(
- com.google.protobuf.Descriptors.FileDescriptor root) {
- descriptor = root;
- return null;
- }
- };
- com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
- descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] {}, assigner);
- internal_static_blaze_worker_Input_descriptor = getDescriptor().getMessageTypes().get(0);
- internal_static_blaze_worker_Input_fieldAccessorTable =
- new com.google.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_blaze_worker_Input_descriptor,
- new java.lang.String[] {
- "Path", "Digest",
- });
- internal_static_blaze_worker_WorkRequest_descriptor = getDescriptor().getMessageTypes().get(1);
- internal_static_blaze_worker_WorkRequest_fieldAccessorTable =
- new com.google.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_blaze_worker_WorkRequest_descriptor,
- new java.lang.String[] {
- "Arguments", "Inputs",
- });
- internal_static_blaze_worker_WorkResponse_descriptor = getDescriptor().getMessageTypes().get(2);
- internal_static_blaze_worker_WorkResponse_fieldAccessorTable =
- new com.google.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_blaze_worker_WorkResponse_descriptor,
- new java.lang.String[] {
- "ExitCode", "Output",
- });
- }
-
- // @@protoc_insertion_point(outer_class_scope)
-}
diff --git a/src/java/io/bazel/rulesscala/coverage/instrumenter/BUILD b/src/java/io/bazel/rulesscala/coverage/instrumenter/BUILD
index 1b0ed55bd..13aa7a445 100644
--- a/src/java/io/bazel/rulesscala/coverage/instrumenter/BUILD
+++ b/src/java/io/bazel/rulesscala/coverage/instrumenter/BUILD
@@ -1,3 +1,5 @@
+load("@rules_java//java:defs.bzl", "java_binary")
+
java_binary(
name = "instrumenter",
srcs = [
@@ -10,8 +12,8 @@ java_binary(
main_class = "io.bazel.rulesscala.coverage.instrumenter.JacocoInstrumenter",
visibility = ["//visibility:public"],
deps = [
+ "//third_party/bazel/src/main/protobuf:worker_protocol_java_proto",
"@bazel_tools//tools/jdk:JacocoCoverage",
- "@io_bazel_rules_scala//src/java/com/google/devtools/build/lib:worker",
"@io_bazel_rules_scala//src/java/io/bazel/rulesscala/jar",
"@io_bazel_rules_scala//src/java/io/bazel/rulesscala/worker",
],
diff --git a/src/java/io/bazel/rulesscala/coverage/instrumenter/JacocoInstrumenter.java b/src/java/io/bazel/rulesscala/coverage/instrumenter/JacocoInstrumenter.java
index 86c450b63..d553d7cf5 100644
--- a/src/java/io/bazel/rulesscala/coverage/instrumenter/JacocoInstrumenter.java
+++ b/src/java/io/bazel/rulesscala/coverage/instrumenter/JacocoInstrumenter.java
@@ -52,11 +52,12 @@ public void processRequest(List < String > args) {
private void processArg(Instrumenter jacoco, String arg) throws Exception {
String[] parts = arg.split("=");
- if (parts.length != 2) {
- throw new Exception("expected `in_path=out_path` form for argument: " + arg);
+ if (parts.length != 3) {
+ throw new Exception("expected `in_path=out_path=srcs` form for argument: " + arg);
}
Path inPath = Paths.get(parts[0]);
Path outPath = Paths.get(parts[1]);
+ String srcs = parts[2];
try (
FileSystem inFS = FileSystems.newFileSystem(inPath, null); FileSystem outFS = FileSystems.newFileSystem(
URI.create("jar:" + outPath.toUri()), Collections.singletonMap("create", "true"));
@@ -69,6 +70,21 @@ private void processArg(Instrumenter jacoco, String arg) throws Exception {
throw new RuntimeException(e);
}
});
+
+ /*
+ * https://github.com/bazelbuild/bazel/blob/567ca633d016572f5760bfd027c10616f2b8c2e4/src/java_tools/junitrunner/java/com/google/testing/coverage/JacocoCoverageRunner.java#L411
+ *
+ * Bazel / JacocoCoverageRunner will look for any file that ends with '-paths-for-coverage.txt' within the JAR to be later used for reconstructing the path for source files.
+ * This is a fairly undocumented feature within bazel at this time, but in essence, it opens all the jars, searches for all files matching '-paths-for-coverage.txt'
+ * and then adds them to a single in memory set.
+ *
+ * https://github.com/bazelbuild/bazel/blob/567ca633d016572f5760bfd027c10616f2b8c2e4/src/java_tools/junitrunner/java/com/google/testing/coverage/JacocoLCOVFormatter.java#L70
+ * Which is then used in the formatter to find the corresponding source file from the set of sources we wrote in all the JARs.
+ */
+ Files.write(
+ outFS.getPath("-paths-for-coverage.txt"),
+ srcs.replace(",", "\n").getBytes(java.nio.charset.StandardCharsets.UTF_8)
+ );
}
}
diff --git a/src/java/io/bazel/rulesscala/exe/BUILD b/src/java/io/bazel/rulesscala/exe/BUILD
index 0a36ca645..115b61c53 100644
--- a/src/java/io/bazel/rulesscala/exe/BUILD
+++ b/src/java/io/bazel/rulesscala/exe/BUILD
@@ -1,3 +1,5 @@
+load("@rules_java//java:defs.bzl", "java_binary", "java_library")
+
java_library(
name = "exe-lib",
srcs = [
diff --git a/src/java/io/bazel/rulesscala/exe/LauncherFileWriter.java b/src/java/io/bazel/rulesscala/exe/LauncherFileWriter.java
index f54a57819..15d1c1326 100644
--- a/src/java/io/bazel/rulesscala/exe/LauncherFileWriter.java
+++ b/src/java/io/bazel/rulesscala/exe/LauncherFileWriter.java
@@ -36,7 +36,7 @@ public static void main(String[] args) throws IOException {
.addKeyValuePair("jar_bin_path", jarBinPath)
.addKeyValuePair("java_start_class", javaStartClass)
.addKeyValuePair("classpath", classpath)
- .addJoinedValues("jvm_flags", " ", jvmFlags)
+ .addJoinedValues("jvm_flags", "\t", jvmFlags)
.build();
Path launcher = Paths.get(Runfiles.create().rlocation("bazel_tools/tools/launcher/launcher.exe"));
diff --git a/src/java/io/bazel/rulesscala/io_utils/BUILD b/src/java/io/bazel/rulesscala/io_utils/BUILD
index 3d72bd8e1..f3d6c1c32 100644
--- a/src/java/io/bazel/rulesscala/io_utils/BUILD
+++ b/src/java/io/bazel/rulesscala/io_utils/BUILD
@@ -1,3 +1,5 @@
+load("@rules_java//java:defs.bzl", "java_library")
+
java_library(
name = "io_utils",
srcs = glob(["*.java"]),
diff --git a/src/java/io/bazel/rulesscala/jar/BUILD b/src/java/io/bazel/rulesscala/jar/BUILD
index 173484d19..c92d77853 100644
--- a/src/java/io/bazel/rulesscala/jar/BUILD
+++ b/src/java/io/bazel/rulesscala/jar/BUILD
@@ -1,3 +1,5 @@
+load("@rules_java//java:defs.bzl", "java_binary", "java_library")
+
java_library(
name = "jar",
srcs = [
diff --git a/src/java/io/bazel/rulesscala/scala_test/BUILD b/src/java/io/bazel/rulesscala/scala_test/BUILD
index 2b4f1d851..ba02286d8 100644
--- a/src/java/io/bazel/rulesscala/scala_test/BUILD
+++ b/src/java/io/bazel/rulesscala/scala_test/BUILD
@@ -1,3 +1,5 @@
+load("@rules_java//java:defs.bzl", "java_library")
+
java_library(
name = "runner",
srcs = ["Runner.java"],
diff --git a/src/java/io/bazel/rulesscala/scalac/BUILD b/src/java/io/bazel/rulesscala/scalac/BUILD
index d80b8152f..c6121878a 100644
--- a/src/java/io/bazel/rulesscala/scalac/BUILD
+++ b/src/java/io/bazel/rulesscala/scalac/BUILD
@@ -1,3 +1,4 @@
+load("@rules_java//java:defs.bzl", "java_binary")
load(
":jvm_export_toolchain.bzl",
_export_scalac_repositories_from_toolchain_to_jvm = "export_scalac_repositories_from_toolchain_to_jvm",
@@ -20,10 +21,10 @@ java_binary(
visibility = ["//visibility:public"],
deps = [
":exported_scalac_repositories_from_toolchain_to_jvm",
- "@io_bazel_rules_scala//src/java/com/google/devtools/build/lib:worker",
+ "//external:io_bazel_rules_scala/dependency/commons_io/commons_io",
+ "//third_party/bazel/src/main/protobuf:worker_protocol_java_proto",
"@io_bazel_rules_scala//src/java/io/bazel/rulesscala/jar",
"@io_bazel_rules_scala//src/java/io/bazel/rulesscala/worker",
- "@scalac_rules_commons_io//jar",
],
)
diff --git a/src/java/io/bazel/rulesscala/scalac/CompileOptions.java b/src/java/io/bazel/rulesscala/scalac/CompileOptions.java
index 471dc12d6..e781c280e 100644
--- a/src/java/io/bazel/rulesscala/scalac/CompileOptions.java
+++ b/src/java/io/bazel/rulesscala/scalac/CompileOptions.java
@@ -1,5 +1,6 @@
package io.bazel.rulesscala.scalac;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -15,19 +16,19 @@ public class CompileOptions {
public final String[] files;
public final String[] sourceJars;
public final String[] javaFiles;
- public final Map resourceFiles;
- public final String resourceStripPrefix;
+ public final List resourceFiles;
public final String[] resourceJars;
public final String[] classpathResourceFiles;
public final String[] directJars;
public final String[] directTargets;
- public final String[] ignoredTargets;
+ public final String[] unusedDepsIgnoredTargets;
public final String[] indirectJars;
public final String[] indirectTargets;
- public final String dependencyAnalyzerMode;
+ public final String strictDepsMode;
public final String unusedDependencyCheckerMode;
public final String currentTarget;
public final String statsfile;
+ public final String dependencyTrackingMethod;
public CompileOptions(List args) {
Map argMap = buildArgMap(args);
@@ -50,46 +51,38 @@ public CompileOptions(List args) {
sourceJars = getCommaList(argMap, "SourceJars");
resourceFiles = getResources(argMap);
- resourceStripPrefix = getOrEmpty(argMap, "ResourceStripPrefix");
resourceJars = getCommaList(argMap, "ResourceJars");
classpathResourceFiles = getCommaList(argMap, "ClasspathResourceSrcs");
directJars = getCommaList(argMap, "DirectJars");
directTargets = getCommaList(argMap, "DirectTargets");
- ignoredTargets = getCommaList(argMap, "IgnoredTargets");
+ unusedDepsIgnoredTargets = getCommaList(argMap, "UnusedDepsIgnoredTargets");
indirectJars = getCommaList(argMap, "IndirectJars");
indirectTargets = getCommaList(argMap, "IndirectTargets");
- dependencyAnalyzerMode = getOrElse(argMap, "DependencyAnalyzerMode", "off");
+ strictDepsMode = getOrElse(argMap, "StrictDepsMode", "off");
unusedDependencyCheckerMode = getOrElse(argMap, "UnusedDependencyCheckerMode", "off");
currentTarget = getOrElse(argMap, "CurrentTarget", "NA");
+ dependencyTrackingMethod = getOrElse(argMap, "DependencyTrackingMethod", "high-level");
statsfile = getOrError(argMap, "StatsfileOutput", "Missing required arg StatsfileOutput");
}
- private static Map getResources(Map args) {
- String[] keys = getCommaList(args, "ResourceSrcs");
- String[] dests = getCommaList(args, "ResourceDests");
- String[] shortPaths = getCommaList(args, "ResourceShortPaths");
+ private static List getResources(Map args) {
+ String[] targets = getCommaList(args, "ResourceTargets");
+ String[] sources = getCommaList(args, "ResourceSources");
- if (keys.length != dests.length)
+ if (targets.length != sources.length)
throw new RuntimeException(
String.format(
- "mismatch in resources: keys: %s dests: %s",
- getOrEmpty(args, "ResourceSrcs"), getOrEmpty(args, "ResourceDests")));
+ "mismatch in resources: targets: %s sources: %s",
+ getOrEmpty(args, "ResourceTargets"), getOrEmpty(args, "ResourceSources")));
- if (keys.length != shortPaths.length)
- throw new RuntimeException(
- String.format(
- "mismatch in resources: keys: %s shortPaths: %s",
- getOrEmpty(args, "ResourceSrcs"), getOrEmpty(args, "ResourceShortPaths")));
-
- HashMap res = new HashMap();
- for (int idx = 0; idx < keys.length; idx++) {
- Resource resource = new Resource(dests[idx], shortPaths[idx]);
- res.put(keys[idx], resource);
+ List resources = new ArrayList();
+ for (int idx = 0; idx < targets.length; idx++) {
+ resources.add(new Resource(targets[idx], sources[idx]));
}
- return res;
+ return resources;
}
private static HashMap buildArgMap(List lines) {
diff --git a/src/java/io/bazel/rulesscala/scalac/Resource.java b/src/java/io/bazel/rulesscala/scalac/Resource.java
index a8db9dbc3..6c0b68cc4 100644
--- a/src/java/io/bazel/rulesscala/scalac/Resource.java
+++ b/src/java/io/bazel/rulesscala/scalac/Resource.java
@@ -1,11 +1,11 @@
package io.bazel.rulesscala.scalac;
public class Resource {
- public final String destination;
- public final String shortPath;
+ public final String target;
+ public final String source;
- public Resource(String destination, String shortPath) {
- this.destination = destination;
- this.shortPath = shortPath;
+ public Resource(String target, String source) {
+ this.target = target;
+ this.source = source;
}
}
diff --git a/src/java/io/bazel/rulesscala/scalac/ScalacProcessor.java b/src/java/io/bazel/rulesscala/scalac/ScalacProcessor.java
index 9e43ce639..fe5b7721f 100644
--- a/src/java/io/bazel/rulesscala/scalac/ScalacProcessor.java
+++ b/src/java/io/bazel/rulesscala/scalac/ScalacProcessor.java
@@ -3,7 +3,12 @@
import io.bazel.rulesscala.jar.JarCreator;
import io.bazel.rulesscala.worker.GenericWorker;
import io.bazel.rulesscala.worker.Processor;
-import java.io.*;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
import java.lang.reflect.Field;
import java.nio.file.FileSystems;
import java.nio.file.FileVisitResult;
@@ -12,8 +17,10 @@
import java.nio.file.Paths;
import java.nio.file.SimpleFileVisitor;
import java.nio.file.attribute.BasicFileAttributes;
-import java.util.*;
-import java.util.Map.Entry;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Enumeration;
+import java.util.List;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
import org.apache.commons.io.IOUtils;
@@ -70,7 +77,7 @@ public void processRequest(List args) throws Exception {
}
/** Copy the resources */
- copyResources(ops.resourceFiles, ops.resourceStripPrefix, tmpPath);
+ copyResources(ops.resourceFiles, tmpPath);
/** Extract and copy resources from resource jars */
copyResourceJars(ops.resourceJars, tmpPath);
@@ -173,31 +180,36 @@ private static boolean isModeEnabled(String mode) {
private static String[] getPluginParamsFrom(CompileOptions ops) {
ArrayList pluginParams = new ArrayList<>(0);
- if (isModeEnabled(ops.dependencyAnalyzerMode)) {
- String[] indirectTargets = encodeBazelTargets(ops.indirectTargets);
+ if (isModeEnabled(ops.strictDepsMode) || isModeEnabled(ops.unusedDependencyCheckerMode)) {
String currentTarget = encodeBazelTarget(ops.currentTarget);
String[] dependencyAnalyzerParams = {
- "-P:dependency-analyzer:direct-jars:" + String.join(":", ops.directJars),
- "-P:dependency-analyzer:indirect-jars:" + String.join(":", ops.indirectJars),
- "-P:dependency-analyzer:indirect-targets:" + String.join(":", indirectTargets),
- "-P:dependency-analyzer:mode:" + ops.dependencyAnalyzerMode,
- "-P:dependency-analyzer:current-target:" + currentTarget,
+ "-P:dependency-analyzer:strict-deps-mode:" + ops.strictDepsMode,
+ "-P:dependency-analyzer:unused-deps-mode:" + ops.unusedDependencyCheckerMode,
+ "-P:dependency-analyzer:current-target:" + currentTarget,
+ "-P:dependency-analyzer:dependency-tracking-method:" + ops.dependencyTrackingMethod,
};
+
pluginParams.addAll(Arrays.asList(dependencyAnalyzerParams));
- } else if (isModeEnabled(ops.unusedDependencyCheckerMode)) {
- String[] directTargets = encodeBazelTargets(ops.directTargets);
- String[] ignoredTargets = encodeBazelTargets(ops.ignoredTargets);
- String currentTarget = encodeBazelTarget(ops.currentTarget);
- String[] unusedDependencyCheckerParams = {
- "-P:unused-dependency-checker:direct-jars:" + String.join(":", ops.directJars),
- "-P:unused-dependency-checker:direct-targets:" + String.join(":", directTargets),
- "-P:unused-dependency-checker:ignored-targets:" + String.join(":", ignoredTargets),
- "-P:unused-dependency-checker:mode:" + ops.unusedDependencyCheckerMode,
- "-P:unused-dependency-checker:current-target:" + currentTarget,
- };
- pluginParams.addAll(Arrays.asList(unusedDependencyCheckerParams));
+ if (ops.directJars.length > 0) {
+ pluginParams.add("-P:dependency-analyzer:direct-jars:" + String.join(":", ops.directJars));
+ }
+ if (ops.directTargets.length > 0) {
+ String[] directTargets = encodeBazelTargets(ops.directTargets);
+ pluginParams.add("-P:dependency-analyzer:direct-targets:" + String.join(":", directTargets));
+ }
+ if (ops.indirectJars.length > 0) {
+ pluginParams.add("-P:dependency-analyzer:indirect-jars:" + String.join(":", ops.indirectJars));
+ }
+ if (ops.indirectTargets.length > 0) {
+ String[] indirectTargets = encodeBazelTargets(ops.indirectTargets);
+ pluginParams.add("-P:dependency-analyzer:indirect-targets:" + String.join(":", indirectTargets));
+ }
+ if (ops.unusedDepsIgnoredTargets.length > 0) {
+ String[] ignoredTargets = encodeBazelTargets(ops.unusedDepsIgnoredTargets);
+ pluginParams.add("-P:dependency-analyzer:unused-deps-ignored-targets:" + String.join(":", ignoredTargets));
+ }
}
return pluginParams.toArray(new String[pluginParams.size()]);
@@ -268,44 +280,11 @@ public FileVisitResult postVisitDirectory(Path dir, IOException exc)
}
}
- private static void copyResources(
- Map resources, String resourceStripPrefix, Path dest) throws IOException {
- for (Entry e : resources.entrySet()) {
- Path source = Paths.get(e.getKey());
- Resource resource = e.getValue();
- Path shortPath = Paths.get(resource.shortPath);
- String dstr;
- // Check if we need to modify resource destination path
- if (!"".equals(resourceStripPrefix)) {
- /**
- * NOTE: We are not using the Resource Hash Value as the destination path when
- * `resource_strip_prefix` present. The path in the hash value is computed by the
- * `_adjust_resources_path` in `scala.bzl`. These are the default paths, ie, path that are
- * automatically computed when there is no `resource_strip_prefix` present. But when
- * `resource_strip_prefix` is present, we need to strip the prefix from the Source Path and
- * use that as the new destination path Refer Bazel -> BazelJavaRuleClasses.java#L227 for
- * details
- */
- dstr = getResourcePath(shortPath, resourceStripPrefix);
- } else {
- dstr = resource.destination;
- }
-
- if (dstr.charAt(0) == '/') {
- // we don't want to copy to an absolute destination
- dstr = dstr.substring(1);
- }
- if (dstr.startsWith("../")) {
- // paths to external repositories, for some reason, start with a leading ../
- // we don't want to copy the resource out of our temporary directory, so
- // instead we replace ../ with external/
- // since "external" is a bit of reserved directory in bazel for these kinds
- // of purposes, we don't expect a collision in the paths.
- dstr = "external" + dstr.substring(2);
- }
- Path target = dest.resolve(dstr);
- File tfile = target.getParent().toFile();
- tfile.mkdirs();
+ private static void copyResources(List resources, Path dest) throws IOException {
+ for (Resource r : resources) {
+ Path source = Paths.get(r.source);
+ Path target = dest.resolve(r.target);
+ target.getParent().toFile().mkdirs();
Files.copy(source, target);
}
}
@@ -328,24 +307,6 @@ private static void copyClasspathResourcesToRoot(String[] classpathResourceFiles
}
}
- private static String getResourcePath(Path source, String resourceStripPrefix)
- throws RuntimeException {
- String sourcePath = source.toString();
- // convert strip prefix to a Path first and back to handle different file systems
- String resourceStripPrefixPath = Paths.get(resourceStripPrefix).toString();
- // check if the Resource file is under the specified prefix to strip
- if (!sourcePath.startsWith(resourceStripPrefixPath)) {
- // Resource File is not under the specified prefix to strip
- throw new RuntimeException(
- "Resource File "
- + sourcePath
- + " is not under the specified strip prefix "
- + resourceStripPrefix);
- }
- String newResPath = sourcePath.substring(resourceStripPrefix.length());
- return newResPath;
- }
-
private static void copyResourceJars(String[] resourceJars, Path dest) throws IOException {
for (String jarPath : resourceJars) {
extractJar(jarPath, dest.toString(), null);
diff --git a/src/java/io/bazel/rulesscala/worker/BUILD b/src/java/io/bazel/rulesscala/worker/BUILD
index 9a6fca96a..61c69e98d 100644
--- a/src/java/io/bazel/rulesscala/worker/BUILD
+++ b/src/java/io/bazel/rulesscala/worker/BUILD
@@ -1,3 +1,5 @@
+load("@rules_java//java:defs.bzl", "java_library")
+
java_library(
name = "worker",
srcs = [
@@ -6,6 +8,6 @@ java_library(
],
visibility = ["//visibility:public"],
deps = [
- "//src/java/com/google/devtools/build/lib:worker",
+ "//third_party/bazel/src/main/protobuf:worker_protocol_java_proto",
],
)
diff --git a/src/scala/io/bazel/rules_scala/jmh_support/BenchmarkGenerator.scala b/src/scala/io/bazel/rules_scala/jmh_support/BenchmarkGenerator.scala
index d367ff424..b443f3e68 100644
--- a/src/scala/io/bazel/rules_scala/jmh_support/BenchmarkGenerator.scala
+++ b/src/scala/io/bazel/rules_scala/jmh_support/BenchmarkGenerator.scala
@@ -41,15 +41,24 @@ object BenchmarkGenerator {
classPath: List[Path]
)
+ private case class GenerationException(messageLines: Seq[String])
+ extends RuntimeException(messageLines.mkString("\n"))
+
def main(argv: Array[String]): Unit = {
val args = parseArgs(argv)
- generateJmhBenchmark(
- args.generatorType,
- args.resultSourceJar,
- args.resultResourceJar,
- args.inputJar,
- args.classPath
- )
+ try {
+ generateJmhBenchmark(
+ args.generatorType,
+ args.resultSourceJar,
+ args.resultResourceJar,
+ args.inputJar,
+ args.classPath
+ )
+ } catch {
+ case GenerationException(messageLines) =>
+ messageLines.foreach(log)
+ sys.exit(1)
+ }
}
private def parseArgs(argv: Array[String]): BenchmarkGeneratorArgs = {
@@ -168,10 +177,8 @@ object BenchmarkGenerator {
generator.generate(source, destination)
generator.complete(source, destination)
if (destination.hasErrors) {
- log("JMH Benchmark generator failed")
- for (e <- destination.getErrors.asScala) {
- log(e.toString)
- }
+ throw new GenerationException(
+ "JHM Benchmark generator failed" +: destination.getErrors.asScala.map(_.toString).toSeq)
}
}
constructJar(sourceJarOut, tmpSourceDir)
diff --git a/test/BUILD b/test/BUILD
index daeb207b1..5ff5302c1 100644
--- a/test/BUILD
+++ b/test/BUILD
@@ -1,3 +1,6 @@
+load("@rules_python//python:defs.bzl", "py_binary")
+load("@rules_java//java:defs.bzl", "java_binary", "java_import", "java_library")
+
package(default_testonly = 1)
load(
@@ -303,6 +306,38 @@ sh_test(
data = ["MixJavaScalaLibTestOutputs"],
)
+scala_binary(
+ name = "MixJavaScalaBinary",
+ srcs = ["src/main/scala/scalarules/test/MixJavaScalaLibBinary.scala"] + glob([
+ "src/main/scala/scalarules/test/mix_java_scala/*.scala",
+ ]) + glob([
+ "src/main/scala/scalarules/test/mix_java_scala/*.java",
+ ]),
+ main_class = "scalarules.test.JavaBinary",
+)
+
+scala_test(
+ name = "MixJavaScalaScalaTest",
+ size = "small",
+ srcs = [
+ "HelloLibTest.scala",
+ "OtherJavaLib.java",
+ ],
+ deps = [
+ ":HelloLib",
+ ],
+)
+
+scala_junit_test(
+ name = "MixJavaScalaJunitTest",
+ size = "small",
+ srcs = [
+ "OtherJavaLib.java",
+ "src/main/scala/scalarules/test/junit/HelloWorldJunitTest.scala",
+ ],
+ suffixes = ["Test"],
+)
+
#needed to test java sources are compiled
scala_binary(
name = "MixJavaScalaLibBinary",
@@ -469,8 +504,8 @@ scala_specs2_junit_test(
name = "data_location_expansion",
size = "small",
srcs = ["src/main/scala/scalarules/test/location_expansion/LocationExpansionTest.scala"],
- data = ["//src/java/com/google/devtools/build/lib:worker"],
- jvm_flags = ["-Dlocation.expanded=$(location //src/java/com/google/devtools/build/lib:worker)"],
+ data = ["//third_party/bazel/src/main/protobuf:worker_protocol_java_proto"],
+ jvm_flags = ["-Dlocation.expanded='$(locations //third_party/bazel/src/main/protobuf:worker_protocol_java_proto)'"],
suffixes = ["Test"],
)
@@ -720,3 +755,15 @@ scala_junit_test(
tests_from = [":JunitMixedSeparateTarget"],
runtime_deps = [":JunitMixedSeparateTarget"],
)
+
+py_binary(
+ name = "py_resource_binary",
+ srcs = ["py_resource.py"],
+ main = "py_resource.py",
+)
+
+scala_test(
+ name = "ScalaTestResourcesFromLocalTargetTest",
+ srcs = ["ScalaTestResourcesFromLocalTargetTest.scala"],
+ resources = [":py_resource_binary"],
+)
diff --git a/test/ScalaTestResourcesFromLocalTargetTest.scala b/test/ScalaTestResourcesFromLocalTargetTest.scala
new file mode 100644
index 000000000..717e4dae9
--- /dev/null
+++ b/test/ScalaTestResourcesFromLocalTargetTest.scala
@@ -0,0 +1,9 @@
+package scalarules.test
+
+class ScalaTestResourcesFromLocalTargetTest extends org.scalatest.FlatSpec {
+ "scala_test's resources when referencing local target" should
+ "assert that local target is not placed in bazel-out, but rather next to the packaged code" in {
+ assert(getClass.getResource("/bazel-out/darwin-fastbuild/bin/test/py_resource_binary") == null)
+ assert(getClass.getResource("/test/py_resource_binary") != null)
+ }
+}
\ No newline at end of file
diff --git a/test/aspect/aspect.bzl b/test/aspect/aspect.bzl
index 183397441..5ff91072d 100644
--- a/test/aspect/aspect.bzl
+++ b/test/aspect/aspect.bzl
@@ -43,6 +43,10 @@ def _rule_impl(ctx):
"@io_bazel_rules_scala_org_hamcrest_hamcrest_core//:io_bazel_rules_scala_org_hamcrest_hamcrest_core",
# From specs2/specs2.bzl:specs2_dependencies()
"@io_bazel_rules_scala//specs2:specs2",
+ "@io_bazel_rules_scala_org_specs2_specs2_common//:io_bazel_rules_scala_org_specs2_specs2_common",
+ "@io_bazel_rules_scala_org_specs2_specs2_core//:io_bazel_rules_scala_org_specs2_specs2_core",
+ "@io_bazel_rules_scala_org_specs2_specs2_fp//:io_bazel_rules_scala_org_specs2_specs2_fp",
+ "@io_bazel_rules_scala_org_specs2_specs2_matcher//:io_bazel_rules_scala_org_specs2_specs2_matcher",
"@io_bazel_rules_scala_scala_xml//:io_bazel_rules_scala_scala_xml",
"@io_bazel_rules_scala_scala_parser_combinators//:io_bazel_rules_scala_scala_parser_combinators",
"@io_bazel_rules_scala_scala_library//:io_bazel_rules_scala_scala_library",
@@ -53,8 +57,8 @@ def _rule_impl(ctx):
}
content = ""
for target in ctx.attr.targets:
- visited = sorted(target.visited)
- expected = sorted(expected_deps[target.label.name])
+ visited = depset(sorted(target.visited)).to_list()
+ expected = depset(sorted(expected_deps[target.label.name])).to_list()
if visited != expected:
content += """
echo Expected these deps from {name}: 1>&2
diff --git a/test/coverage/A1.scala b/test/coverage/A1.scala
index 2dcc34f43..be90760e4 100644
--- a/test/coverage/A1.scala
+++ b/test/coverage/A1.scala
@@ -1,3 +1,5 @@
+package coverage;
+
object A1 {
def a1(flag: Boolean): B1.type =
if (flag) B1
diff --git a/test/coverage/A2.scala b/test/coverage/A2.scala
index 0e58f455d..ff3cce15c 100644
--- a/test/coverage/A2.scala
+++ b/test/coverage/A2.scala
@@ -1,7 +1,8 @@
+package coverage;
+
object A2 {
def a2(): Unit = {
- println("a2: " +
- "" // B2.b2_a()
+ println("a2: " + B2.b2_a()
)
}
}
diff --git a/test/coverage/B1.scala b/test/coverage/B1.scala
index 3b5a9f305..ee8f12665 100644
--- a/test/coverage/B1.scala
+++ b/test/coverage/B1.scala
@@ -1,3 +1,5 @@
+package coverage;
+
object B1 {
def not_called(): Unit = {
diff --git a/test/coverage/B2.java b/test/coverage/B2.java
index 30b97c543..629bb28d0 100644
--- a/test/coverage/B2.java
+++ b/test/coverage/B2.java
@@ -1,3 +1,5 @@
+package coverage;
+
class B2 {
public static String b2_a() {
return C2.c2("hello from b2_a");
diff --git a/test/coverage/BUILD b/test/coverage/BUILD
index 1d3cc583b..2a7149336 100644
--- a/test/coverage/BUILD
+++ b/test/coverage/BUILD
@@ -1,19 +1,7 @@
+load("@rules_java//java:defs.bzl", "java_library", "java_test")
load("//scala:scala.bzl", "scala_library", "scala_test")
load("//scala:scala_toolchain.bzl", "scala_toolchain")
-scala_toolchain(
- name = "enable_code_coverage_aspect_impl",
- enable_code_coverage_aspect = "on",
- visibility = ["//visibility:public"],
-)
-
-toolchain(
- name = "enable_code_coverage_aspect",
- toolchain = "enable_code_coverage_aspect_impl",
- toolchain_type = "@io_bazel_rules_scala//scala:toolchain_type",
- visibility = ["//visibility:public"],
-)
-
scala_test(
name = "test-all",
srcs = [
@@ -61,20 +49,10 @@ scala_library(
"A2.scala",
],
deps = [
- # TODO :: Understand why referencing a local java library breaks coverage
- # ":b2",
+ ":b2",
],
)
-#
-# As it stands I can't seem to generate coverage for Java libraries pulled into
-# a scala_test target.
-#
-# The java_library is instrumented, but doesn't have the .uninstrumented files
-# that Bazel seems to expect. There are a few code paths for code coverage, so
-# down the road we can explore how to fix this...
-#
-
java_library(
name = "b2",
srcs = [
diff --git a/test/coverage/C2.scala b/test/coverage/C2.scala
index 7e405b1cf..40daebda1 100644
--- a/test/coverage/C2.scala
+++ b/test/coverage/C2.scala
@@ -1,3 +1,5 @@
+package coverage;
+
object C2 {
def c2(input: String): String =
input.reverse
diff --git a/test/coverage/TestAll.scala b/test/coverage/TestAll.scala
index cbe8f9e4e..aae034261 100644
--- a/test/coverage/TestAll.scala
+++ b/test/coverage/TestAll.scala
@@ -1,3 +1,4 @@
+package coverage;
import org.scalatest._
class TestAll extends FlatSpec {
diff --git a/test/coverage/TestB2.java b/test/coverage/TestB2.java
index ea5275e64..bffa8898f 100644
--- a/test/coverage/TestB2.java
+++ b/test/coverage/TestB2.java
@@ -1,3 +1,5 @@
+package coverage;
+
import org.junit.Test;
import org.junit.Assert.*;
diff --git a/test/coverage/expected-coverage.dat b/test/coverage/expected-coverage.dat
index d142c915f..d92769254 100755
--- a/test/coverage/expected-coverage.dat
+++ b/test/coverage/expected-coverage.dat
@@ -1,78 +1,110 @@
-SF:/A1.scala
-FN:-1,A1$:: ()V
-FN:5,A1$:: ()V
-FN:3,A1$::a1 (Z)LB1$;
-FN:-1,A1::a1 (Z)LB1$;
-FNDA:1,A1$:: ()V
-FNDA:1,A1$:: ()V
-FNDA:1,A1$::a1 (Z)LB1$;
-FNDA:0,A1::a1 (Z)LB1$;
+SF:test/coverage/A1.scala
+FN:-1,coverage/A1$:: ()V
+FN:7,coverage/A1$:: ()V
+FN:5,coverage/A1$::a1 (Z)Lcoverage/B1$;
+FN:-1,coverage/A1::a1 (Z)Lcoverage/B1$;
+FNDA:1,coverage/A1$:: ()V
+FNDA:1,coverage/A1$:: ()V
+FNDA:1,coverage/A1$::a1 (Z)Lcoverage/B1$;
+FNDA:0,coverage/A1::a1 (Z)Lcoverage/B1$;
FNF:4
FNH:3
-BA:3,2
+BA:5,2
BRF:1
BRH:1
-DA:3,4
-DA:4,0
-DA:5,5
+DA:5,4
+DA:6,0
+DA:7,5
LH:2
LF:3
end_of_record
-SF:/A2.scala
-FN:-1,A2$:: ()V
-FN:7,A2$:: ()V
-FN:3,A2$::a2 ()V
-FN:-1,A2::a2 ()V
-FNDA:1,A2$:: ()V
-FNDA:1,A2$:: ()V
-FNDA:1,A2$::a2 ()V
-FNDA:0,A2::a2 ()V
+SF:test/coverage/A2.scala
+FN:-1,coverage/A2$:: ()V
+FN:8,coverage/A2$:: ()V
+FN:5,coverage/A2$::a2 ()V
+FN:-1,coverage/A2::a2 ()V
+FNDA:1,coverage/A2$:: ()V
+FNDA:1,coverage/A2$:: ()V
+FNDA:1,coverage/A2$::a2 ()V
+FNDA:0,coverage/A2::a2 ()V
FNF:4
FNH:3
-DA:3,4
-DA:7,5
+DA:5,11
+DA:8,5
LH:2
LF:2
end_of_record
-SF:/B1.scala
-FN:-1,B1$:: ()V
-FN:7,B1$:: ()V
-FN:4,B1$::not_called ()V
-FN:-1,B1::not_called ()V
-FNDA:1,B1$:: ()V
-FNDA:1,B1$:: ()V
-FNDA:0,B1$::not_called ()V
-FNDA:0,B1::not_called ()V
+SF:test/coverage/B1.scala
+FN:-1,coverage/B1$:: ()V
+FN:9,coverage/B1$:: ()V
+FN:6,coverage/B1$::not_called ()V
+FN:-1,coverage/B1::not_called ()V
+FNDA:1,coverage/B1$:: ()V
+FNDA:1,coverage/B1$:: ()V
+FNDA:0,coverage/B1$::not_called ()V
+FNDA:0,coverage/B1::not_called ()V
FNF:4
FNH:2
-DA:4,0
-DA:7,5
+DA:6,0
+DA:9,5
+LH:1
+LF:2
+end_of_record
+SF:test/coverage/B2.java
+FN:3,coverage/B2:: ()V
+FN:5,coverage/B2::b2_a ()Ljava/lang/String;
+FN:9,coverage/B2::b2_b ()V
+FNDA:0,coverage/B2:: ()V
+FNDA:1,coverage/B2::b2_a ()Ljava/lang/String;
+FNDA:0,coverage/B2::b2_b ()V
+FNF:3
+FNH:1
+DA:3,0
+DA:5,3
+DA:9,0
+DA:10,0
LH:1
+LF:4
+end_of_record
+SF:test/coverage/C2.scala
+FN:-1,coverage/C2$:: ()V
+FN:7,coverage/C2$:: ()V
+FN:5,coverage/C2$::c2 (Ljava/lang/String;)Ljava/lang/String;
+FN:-1,coverage/C2::c2 (Ljava/lang/String;)Ljava/lang/String;
+FNDA:1,coverage/C2$:: ()V
+FNDA:1,coverage/C2$:: ()V
+FNDA:1,coverage/C2$::c2 (Ljava/lang/String;)Ljava/lang/String;
+FNDA:1,coverage/C2::c2 (Ljava/lang/String;)Ljava/lang/String;
+FNF:4
+FNH:4
+DA:5,9
+DA:7,5
+LH:2
LF:2
end_of_record
-SF:/TestAll.scala
-FN:10,TestAll$$anonfun$1:: (LTestAll;)V
-FN:10,TestAll$$anonfun$1::apply ()V
-FN:10,TestAll$$anonfun$1::apply$mcV$sp ()V
-FN:6,TestAll$$anonfun$2:: (LTestAll;)V
-FN:6,TestAll$$anonfun$2::apply ()Lorg/scalatest/compatible/Assertion;
-FN:3,TestAll:: ()V
-FNDA:1,TestAll$$anonfun$1:: (LTestAll;)V
-FNDA:1,TestAll$$anonfun$1::apply ()V
-FNDA:1,TestAll$$anonfun$1::apply$mcV$sp ()V
-FNDA:1,TestAll$$anonfun$2:: (LTestAll;)V
-FNDA:1,TestAll$$anonfun$2::apply ()Lorg/scalatest/compatible/Assertion;
-FNDA:1,TestAll:: ()V
+SF:test/coverage/TestAll.scala
+FN:11,coverage/TestAll$$anonfun$1:: (Lcoverage/TestAll;)V
+FN:11,coverage/TestAll$$anonfun$1::apply ()V
+FN:11,coverage/TestAll$$anonfun$1::apply$mcV$sp ()V
+FN:7,coverage/TestAll$$anonfun$2:: (Lcoverage/TestAll;)V
+FN:7,coverage/TestAll$$anonfun$2::apply ()Lorg/scalatest/compatible/Assertion;
+FN:4,coverage/TestAll:: ()V
+FNDA:1,coverage/TestAll$$anonfun$1:: (Lcoverage/TestAll;)V
+FNDA:1,coverage/TestAll$$anonfun$1::apply ()V
+FNDA:1,coverage/TestAll$$anonfun$1::apply$mcV$sp ()V
+FNDA:1,coverage/TestAll$$anonfun$2:: (Lcoverage/TestAll;)V
+FNDA:1,coverage/TestAll$$anonfun$2::apply ()Lorg/scalatest/compatible/Assertion;
+FNDA:1,coverage/TestAll:: ()V
FNF:6
FNH:6
-BA:6,2
+BA:7,2
BRF:1
BRH:1
-DA:3,2
-DA:5,22
-DA:6,51
-DA:9,23
-DA:10,13
+DA:4,2
+DA:6,22
+DA:7,51
+DA:10,23
+DA:11,13
LH:5
LF:5
end_of_record
diff --git a/test/example_jars/BUILD b/test/example_jars/BUILD
index 612e2e857..773f28aa5 100644
--- a/test/example_jars/BUILD
+++ b/test/example_jars/BUILD
@@ -1,3 +1,5 @@
+load("@rules_java//java:defs.bzl", "java_import")
+
java_import(
name = "example_jar1",
jars = [
diff --git a/test/jmh/BUILD b/test/jmh/BUILD
index 17edd80d1..143b9367c 100644
--- a/test/jmh/BUILD
+++ b/test/jmh/BUILD
@@ -1,3 +1,4 @@
+load("@rules_java//java:defs.bzl", "java_library")
load("//scala:scala.bzl", "scala_library")
load("//jmh:jmh.bzl", "scala_benchmark_jmh")
diff --git a/test/phase/providers/BUILD.bazel b/test/phase/providers/BUILD.bazel
new file mode 100644
index 000000000..e7fb39d78
--- /dev/null
+++ b/test/phase/providers/BUILD.bazel
@@ -0,0 +1,30 @@
+load(":phase_providers_expose.bzl", "phase_expose_provider_singleton", "rule_that_needs_custom_provider", "scala_library_that_exposes_custom_provider")
+load(":phase_providers_override.bzl", "phase_override_provider_singleton", "rule_that_has_phases_which_override_providers", "rule_that_verifies_providers_are_overriden")
+
+scala_library_that_exposes_custom_provider(
+ name = "scala_library_that_exposes_custom_provider",
+)
+
+rule_that_needs_custom_provider(
+ name = "rule_that_needs_custom_provider",
+ dep = ":scala_library_that_exposes_custom_provider",
+)
+
+phase_expose_provider_singleton(
+ name = "phase_expose_provider_singleton_target",
+ visibility = ["//visibility:public"],
+)
+
+rule_that_has_phases_which_override_providers(
+ name = "PhaseOverridesProvider",
+)
+
+rule_that_verifies_providers_are_overriden(
+ name = "PhaseOverridesProviderTest",
+ dep = ":PhaseOverridesProvider",
+)
+
+phase_override_provider_singleton(
+ name = "phase_override_provider_singleton_target",
+ visibility = ["//visibility:public"],
+)
diff --git a/test/phase/providers/phase_providers_expose.bzl b/test/phase/providers/phase_providers_expose.bzl
new file mode 100644
index 000000000..10660c430
--- /dev/null
+++ b/test/phase/providers/phase_providers_expose.bzl
@@ -0,0 +1,42 @@
+load("@io_bazel_rules_scala//scala:advanced_usage/providers.bzl", "ScalaRulePhase")
+load("@io_bazel_rules_scala//scala:advanced_usage/scala.bzl", "make_scala_library")
+
+ext_phase_expose_provider = {
+ "phase_providers": [
+ "//test/phase/providers:phase_expose_provider_singleton_target",
+ ],
+}
+
+scala_library_that_exposes_custom_provider = make_scala_library(ext_phase_expose_provider)
+
+_some_position = "last" #last position is just because a location is mandatory, not important
+
+def _phase_expose_provider_singleton_implementation(ctx):
+ return [
+ ScalaRulePhase(
+ custom_phases = [
+ (_some_position, "", "phase_expose_provider", _phase_expose_provider),
+ ],
+ ),
+ ]
+
+phase_expose_provider_singleton = rule(
+ implementation = _phase_expose_provider_singleton_implementation,
+)
+
+CustomProviderExposedByPhase = provider()
+
+def _phase_expose_provider(ctx, p):
+ return struct(
+ external_providers = {"CustomProviderExposedByPhase": CustomProviderExposedByPhase()},
+ )
+
+def _rule_that_needs_custom_provider_impl(ctx):
+ return []
+
+rule_that_needs_custom_provider = rule(
+ implementation = _rule_that_needs_custom_provider_impl,
+ attrs = {
+ "dep": attr.label(providers = [CustomProviderExposedByPhase]),
+ },
+)
diff --git a/test/phase/providers/phase_providers_override.bzl b/test/phase/providers/phase_providers_override.bzl
new file mode 100644
index 000000000..c432cc55f
--- /dev/null
+++ b/test/phase/providers/phase_providers_override.bzl
@@ -0,0 +1,61 @@
+load("@io_bazel_rules_scala//scala:advanced_usage/providers.bzl", "ScalaRulePhase")
+load("@io_bazel_rules_scala//scala:advanced_usage/scala.bzl", "make_scala_library")
+
+ext_phase_override_provider = {
+ "phase_providers": [
+ "//test/phase/providers:phase_override_provider_singleton_target",
+ ],
+}
+
+rule_that_has_phases_which_override_providers = make_scala_library(ext_phase_override_provider)
+
+def _phase_override_provider_singleton_implementation(ctx):
+ return [
+ ScalaRulePhase(
+ custom_phases = [
+ ("last", "", "first_custom", _phase_original),
+ ("after", "first_custom", "second_custom", _phase_override),
+ ],
+ ),
+ ]
+
+phase_override_provider_singleton = rule(
+ implementation = _phase_override_provider_singleton_implementation,
+)
+
+OverrideProvider = provider(fields = ["content"])
+
+def _phase_original(ctx, p):
+ return struct(
+ external_providers = {
+ "OverrideProvider": OverrideProvider(
+ content = "original",
+ ),
+ },
+ )
+
+def _phase_override(ctx, p):
+ return struct(
+ external_providers = {
+ "OverrideProvider": OverrideProvider(
+ content = "override",
+ ),
+ },
+ )
+
+def _rule_that_verifies_providers_are_overriden_impl(ctx):
+ if (ctx.attr.dep[OverrideProvider].content != "override"):
+ fail(
+ "expected OverrideProvider of {label} to have content 'override' but got '{content}'".format(
+ label = ctx.label,
+ content = ctx.attr.dep[OverrideProvider].content,
+ ),
+ )
+ return []
+
+rule_that_verifies_providers_are_overriden = rule(
+ implementation = _rule_that_verifies_providers_are_overriden_impl,
+ attrs = {
+ "dep": attr.label(providers = [OverrideProvider]),
+ },
+)
diff --git a/test/proto/BUILD b/test/proto/BUILD
index a4614bb57..f97e6ddb3 100644
--- a/test/proto/BUILD
+++ b/test/proto/BUILD
@@ -1,3 +1,5 @@
+load("@rules_java//java:defs.bzl", "java_proto_library")
+load("@rules_proto//proto:defs.bzl", "proto_library")
load(
"//scala_proto:scala_proto.bzl",
"scala_proto_library",
@@ -167,3 +169,79 @@ scala_test(
":test_external_dep",
],
)
+
+proto_library(
+ name = "standalone_proto",
+ srcs = ["standalone.proto"],
+)
+
+proto_library(
+ name = "standalone_proto_strip_import_prefix_partial",
+ srcs = ["standalone.proto"],
+ strip_import_prefix = "/test",
+)
+
+proto_library(
+ name = "standalone_proto_strip_import_prefix_package",
+ srcs = ["standalone.proto"],
+ strip_import_prefix = "/" + package_name(),
+)
+
+proto_library(
+ name = "standalone_proto_with_import_prefix",
+ srcs = ["standalone.proto"],
+ import_prefix = "prefix",
+)
+
+proto_library(
+ name = "standalone_proto_with_custom_prefix",
+ srcs = ["standalone.proto"],
+ import_prefix = "prefix",
+ strip_import_prefix = "/test",
+)
+
+proto_library(
+ name = "nested_proto",
+ srcs = ["some/path/nested.proto"],
+)
+
+proto_library(
+ name = "nested_proto_strip_import_prefix_relative",
+ srcs = ["some/path/nested.proto"],
+ strip_import_prefix = "some",
+)
+
+proto_library(
+ name = "nested_proto_with_import_prefix",
+ srcs = ["some/path/nested.proto"],
+ import_prefix = "prefix",
+)
+
+proto_library(
+ name = "nested_proto_with_custom_prefix",
+ srcs = ["some/path/nested.proto"],
+ import_prefix = "prefix",
+ strip_import_prefix = "some",
+)
+
+scala_proto_library(
+ name = "pack_protos_lib",
+ deps = [
+ ":nested_proto",
+ ":nested_proto_strip_import_prefix_relative",
+ ":nested_proto_with_custom_prefix",
+ ":nested_proto_with_import_prefix",
+ ":standalone_proto",
+ ":standalone_proto_strip_import_prefix_package",
+ ":standalone_proto_strip_import_prefix_partial",
+ ":standalone_proto_with_custom_prefix",
+ ":standalone_proto_with_import_prefix",
+ ],
+)
+
+scala_test(
+ name = "test_pack_protos",
+ srcs = ["PackProtosTest.scala"],
+ unused_dependency_checker_mode = "off",
+ deps = [":pack_protos_lib"],
+)
diff --git a/test/proto/PackProtosTest.scala b/test/proto/PackProtosTest.scala
new file mode 100644
index 000000000..f75084177
--- /dev/null
+++ b/test/proto/PackProtosTest.scala
@@ -0,0 +1,13 @@
+class PackProtosTest extends org.scalatest.FlatSpec {
+ "scala_proto_library" should "pack input proto next to generated code" in {
+ assert(getClass.getResource("test/proto/standalone.proto") != null)
+ assert(getClass.getResource("proto/standalone.proto") != null)
+ assert(getClass.getResource("standalone.proto") != null)
+ assert(getClass.getResource("prefix/test/proto/standalone.proto") != null)
+ assert(getClass.getResource("prefix/proto/standalone.proto") != null)
+ assert(getClass.getResource("test/proto/some/path/nested.proto") != null)
+ assert(getClass.getResource("path/nested.proto") != null)
+ assert(getClass.getResource("prefix/test/proto/some/path/nested.proto") != null)
+ assert(getClass.getResource("prefix/path/nested.proto") != null)
+ }
+}
diff --git a/test/proto/some/path/nested.proto b/test/proto/some/path/nested.proto
new file mode 100644
index 000000000..24afdf24c
--- /dev/null
+++ b/test/proto/some/path/nested.proto
@@ -0,0 +1,4 @@
+syntax = "proto3";
+
+message Message {
+}
diff --git a/test/proto/standalone.proto b/test/proto/standalone.proto
new file mode 100644
index 000000000..24afdf24c
--- /dev/null
+++ b/test/proto/standalone.proto
@@ -0,0 +1,4 @@
+syntax = "proto3";
+
+message Message {
+}
diff --git a/test/proto2/BUILD b/test/proto2/BUILD
index 96e963557..2087f7626 100644
--- a/test/proto2/BUILD
+++ b/test/proto2/BUILD
@@ -1,3 +1,5 @@
+load("@rules_proto//proto:defs.bzl", "proto_library")
+
proto_library(
name = "test",
srcs = ["test.proto"],
diff --git a/test/proto3/BUILD b/test/proto3/BUILD
index 441040e72..2d28654fb 100644
--- a/test/proto3/BUILD
+++ b/test/proto3/BUILD
@@ -2,6 +2,7 @@ load(
"//scala_proto:scala_proto.bzl",
"scala_proto_library",
)
+load("@rules_proto//proto:defs.bzl", "proto_library")
genrule(
name = "generated",
diff --git a/test/proto_cross_repo_boundary/BUILD b/test/proto_cross_repo_boundary/BUILD
new file mode 100644
index 000000000..42fb573a6
--- /dev/null
+++ b/test/proto_cross_repo_boundary/BUILD
@@ -0,0 +1,7 @@
+load("@io_bazel_rules_scala//scala_proto:scala_proto.bzl", "scalapb_proto_library")
+
+scalapb_proto_library(
+ name = "sample_scala_proto",
+ visibility = ["//visibility:public"],
+ deps = ["@proto_cross_repo_boundary//:sample_proto"],
+)
diff --git a/test/proto_cross_repo_boundary/repo.bzl b/test/proto_cross_repo_boundary/repo.bzl
new file mode 100644
index 000000000..0f19c06d2
--- /dev/null
+++ b/test/proto_cross_repo_boundary/repo.bzl
@@ -0,0 +1,6 @@
+def proto_cross_repo_boundary_repository():
+ native.new_local_repository(
+ name = "proto_cross_repo_boundary",
+ path = "test/proto_cross_repo_boundary/repo",
+ build_file = "test/proto_cross_repo_boundary/repo/BUILD.repo",
+ )
diff --git a/test/proto_cross_repo_boundary/repo/BUILD.repo b/test/proto_cross_repo_boundary/repo/BUILD.repo
new file mode 100644
index 000000000..dc9aa78e5
--- /dev/null
+++ b/test/proto_cross_repo_boundary/repo/BUILD.repo
@@ -0,0 +1,7 @@
+load("@rules_proto//proto:defs.bzl", "proto_library")
+
+proto_library(
+ name = "sample_proto",
+ srcs = ["sample.proto"],
+ visibility = ["//visibility:public"],
+)
diff --git a/test/proto_cross_repo_boundary/repo/sample.proto b/test/proto_cross_repo_boundary/repo/sample.proto
new file mode 100644
index 000000000..6fae4b202
--- /dev/null
+++ b/test/proto_cross_repo_boundary/repo/sample.proto
@@ -0,0 +1,9 @@
+syntax = "proto3";
+
+package sample;
+
+option java_package = "sample";
+
+message Sample {
+ repeated string foobar = 1;
+}
\ No newline at end of file
diff --git a/test/py_resource.py b/test/py_resource.py
new file mode 100644
index 000000000..5cb928578
--- /dev/null
+++ b/test/py_resource.py
@@ -0,0 +1 @@
+# Empty file just need to be used for reference
\ No newline at end of file
diff --git a/test/scala_test/A.scala b/test/scala_test/A.scala
new file mode 100644
index 000000000..40cd31468
--- /dev/null
+++ b/test/scala_test/A.scala
@@ -0,0 +1,10 @@
+
+import org.scalatest._
+
+abstract class A extends FunSuite {
+ val Number: Int
+
+ test("number is positive") {
+ assert(Number > 0)
+ }
+}
\ No newline at end of file
diff --git a/test/scala_test/B.scala b/test/scala_test/B.scala
new file mode 100644
index 000000000..e00c5182b
--- /dev/null
+++ b/test/scala_test/B.scala
@@ -0,0 +1,4 @@
+
+class B extends A {
+ override val Number: Int = 12
+}
diff --git a/test/scala_test/BUILD b/test/scala_test/BUILD
new file mode 100644
index 000000000..1ceb25b6f
--- /dev/null
+++ b/test/scala_test/BUILD
@@ -0,0 +1,12 @@
+load("@io_bazel_rules_scala//scala:scala.bzl", "scala_test")
+
+scala_test(
+ name = "a",
+ srcs = ["A.scala"],
+)
+
+scala_test(
+ name = "b",
+ srcs = ["B.scala"],
+ deps = [":a"],
+)
diff --git a/test/scalafmt/.scalafmt.conf b/test/scalafmt/.scalafmt.conf
new file mode 100644
index 000000000..46b439c07
--- /dev/null
+++ b/test/scalafmt/.scalafmt.conf
@@ -0,0 +1 @@
+maxColumn = 40
diff --git a/test/scalafmt/BUILD b/test/scalafmt/BUILD
new file mode 100644
index 000000000..696bc4323
--- /dev/null
+++ b/test/scalafmt/BUILD
@@ -0,0 +1,68 @@
+load(
+ "//test/scalafmt:phase_scalafmt_test.bzl",
+ "scalafmt_scala_binary",
+ "scalafmt_scala_library",
+ "scalafmt_scala_test",
+)
+
+filegroup(
+ name = "custom-conf",
+ srcs = [".scalafmt.conf"],
+ visibility = ["//visibility:public"],
+)
+
+### scala_binary ###
+scalafmt_scala_binary(
+ name = "formatted-binary",
+ srcs = ["formatted/formatted-encoding.scala"],
+ format = True,
+ main_class = "scalarules.test.scalafmt.Format",
+)
+
+scalafmt_scala_binary(
+ name = "unformatted-binary",
+ srcs = ["unformatted/unformatted-encoding.scala"],
+ format = True,
+ main_class = "scalarules.test.scalafmt.Format",
+)
+
+### scala_library ###
+scalafmt_scala_library(
+ name = "formatted-library",
+ srcs = ["formatted/formatted-encoding.scala"],
+ format = True,
+)
+
+scalafmt_scala_library(
+ name = "unformatted-library",
+ srcs = ["unformatted/unformatted-encoding.scala"],
+ format = True,
+)
+
+### scala_test ###
+scalafmt_scala_test(
+ name = "formatted-test",
+ srcs = ["formatted/formatted-test.scala"],
+ format = True,
+)
+
+scalafmt_scala_test(
+ name = "unformatted-test",
+ srcs = ["unformatted/unformatted-test.scala"],
+ format = True,
+)
+
+### custom config ###
+scalafmt_scala_library(
+ name = "formatted-custom-conf",
+ srcs = ["formatted/formatted-custom-conf.scala"],
+ config = ":custom-conf",
+ format = True,
+)
+
+scalafmt_scala_library(
+ name = "unformatted-custom-conf",
+ srcs = ["unformatted/unformatted-custom-conf.scala"],
+ config = ":custom-conf",
+ format = True,
+)
diff --git a/test/scalafmt/formatted/formatted-custom-conf.scala b/test/scalafmt/formatted/formatted-custom-conf.scala
new file mode 100644
index 000000000..9a237e692
--- /dev/null
+++ b/test/scalafmt/formatted/formatted-custom-conf.scala
@@ -0,0 +1,7 @@
+package scalarules.test.scalafmt
+object Format {
+ def main(args: Array[String]) {
+ val warnings: String =
+ "Be careful with this test. The column number is limited to 40, so it should be in new line."
+ }
+}
diff --git a/test/scalafmt/formatted/formatted-encoding.scala b/test/scalafmt/formatted/formatted-encoding.scala
new file mode 100644
index 000000000..9a5192a35
--- /dev/null
+++ b/test/scalafmt/formatted/formatted-encoding.scala
@@ -0,0 +1,12 @@
+package scalarules.test.scalafmt
+object Format {
+ def main(args: Array[String]) {
+ val warnings: List[String] = List(
+ "Be careful with this test",
+ "小心這個測試",
+ "このテストに注意してください",
+ "이 시험에 조심하십시오",
+ "😁✊🚀🍟💯"
+ )
+ }
+}
diff --git a/test/scalafmt/formatted/formatted-test.scala b/test/scalafmt/formatted/formatted-test.scala
new file mode 100644
index 000000000..929e655f4
--- /dev/null
+++ b/test/scalafmt/formatted/formatted-test.scala
@@ -0,0 +1,7 @@
+package scalarules.test.scalafmt
+import org.scalatest._
+class FormatTest extends FlatSpec {
+ "FormatTest" should "be formatted" in {
+ assert(true)
+ }
+}
diff --git a/test/scalafmt/phase_scalafmt_test.bzl b/test/scalafmt/phase_scalafmt_test.bzl
new file mode 100644
index 000000000..ed5e46602
--- /dev/null
+++ b/test/scalafmt/phase_scalafmt_test.bzl
@@ -0,0 +1,16 @@
+load(
+ "//scala:advanced_usage/scala.bzl",
+ "make_scala_binary",
+ "make_scala_library",
+ "make_scala_test",
+)
+load(
+ "//scala/scalafmt:phase_scalafmt_ext.bzl",
+ "ext_scalafmt",
+)
+
+scalafmt_scala_binary = make_scala_binary(ext_scalafmt)
+
+scalafmt_scala_library = make_scala_library(ext_scalafmt)
+
+scalafmt_scala_test = make_scala_test(ext_scalafmt)
diff --git a/test/scalafmt/unformatted/unformatted-custom-conf.scala b/test/scalafmt/unformatted/unformatted-custom-conf.scala
new file mode 100644
index 000000000..46a3dd420
--- /dev/null
+++ b/test/scalafmt/unformatted/unformatted-custom-conf.scala
@@ -0,0 +1,6 @@
+package scalarules.test.scalafmt
+object Format {
+ def main(args: Array[String]) {
+ val warnings: String = "Be careful with this test. The column number is limited to 40, so it should be in new line."
+ }
+}
diff --git a/test/scalafmt/unformatted/unformatted-encoding.scala b/test/scalafmt/unformatted/unformatted-encoding.scala
new file mode 100644
index 000000000..57cc66d0a
--- /dev/null
+++ b/test/scalafmt/unformatted/unformatted-encoding.scala
@@ -0,0 +1,15 @@
+ package scalarules.test.scalafmt
+ object Format {
+ def main ( args:
+
+
+ Array [String ]) {
+ val warnings : List [ String ] = List(
+ "Be careful with this test",
+ "小心這個測試",
+ "このテストに注意してください",
+ "이 시험에 조심하십시오",
+ "😁✊🚀🍟💯"
+ )
+ }
+}
diff --git a/test/scalafmt/unformatted/unformatted-test.scala b/test/scalafmt/unformatted/unformatted-test.scala
new file mode 100644
index 000000000..7a696cc48
--- /dev/null
+++ b/test/scalafmt/unformatted/unformatted-test.scala
@@ -0,0 +1,7 @@
+ package scalarules.test.scalafmt
+ import org.scalatest._
+ class FormatTest extends FlatSpec {
+ "FormatTest" should "be formatted" in {
+ assert ( true )
+ }
+}
diff --git a/test/shell/test_build_event_protocol.sh b/test/shell/test_build_event_protocol.sh
index 0ba50edce..42678cb16 100755
--- a/test/shell/test_build_event_protocol.sh
+++ b/test/shell/test_build_event_protocol.sh
@@ -5,11 +5,12 @@ runner=$(get_test_runner "${1:-local}")
scala_binary_common_jar_is_exposed_in_build_event_protocol() {
local target=$1
+ local target_suffix=${2:-""}
set +e
bazel build test:$target --build_event_text_file=$target_bes.txt
- cat $target_bes.txt | grep "test/$target.jar"
+ cat $target_bes.txt | grep "test/$target$target_suffix.jar"
if [ $? -ne 0 ]; then
- echo "test/$target.jar was not found in build event protocol:"
+ echo "test/$target$target_suffix.jar was not found in build event protocol:"
cat $target_bes.txt
rm $target_bes.txt
exit 1
@@ -31,6 +32,26 @@ scala_junit_test_jar_is_exposed_in_build_event_protocol() {
scala_binary_common_jar_is_exposed_in_build_event_protocol JunitTestWithDeps
}
+scala_binary_java_jar_is_exposed_in_build_event_protocol() {
+ scala_binary_common_jar_is_exposed_in_build_event_protocol MixJavaScalaBinary _java
+}
+
+scala_library_java_jar_is_exposed_in_build_event_protocol() {
+ scala_binary_common_jar_is_exposed_in_build_event_protocol MixJavaScalaLib _java
+}
+
+scala_test_java_jar_is_exposed_in_build_event_protocol() {
+ scala_binary_common_jar_is_exposed_in_build_event_protocol MixJavaScalaScalaTest _java
+}
+
+junit_test_java_jar_is_exposed_in_build_event_protocol() {
+ scala_binary_common_jar_is_exposed_in_build_event_protocol MixJavaScalaJunitTest _java
+}
+
$runner scala_binary_jar_is_exposed_in_build_event_protocol
$runner scala_test_jar_is_exposed_in_build_event_protocol
$runner scala_junit_test_jar_is_exposed_in_build_event_protocol
+$runner scala_binary_java_jar_is_exposed_in_build_event_protocol
+$runner scala_library_java_jar_is_exposed_in_build_event_protocol
+$runner scala_test_java_jar_is_exposed_in_build_event_protocol
+$runner junit_test_java_jar_is_exposed_in_build_event_protocol
diff --git a/test/shell/test_deps.sh b/test/shell/test_deps.sh
index 5570c1e09..746c40cb2 100755
--- a/test/shell/test_deps.sh
+++ b/test/shell/test_deps.sh
@@ -42,7 +42,20 @@ test_scala_import_expect_failure_on_missing_direct_deps_warn_mode() {
test_expect_failure_or_warning_on_missing_direct_deps_with_expected_message "${expected_message1}" ${test_target} "--strict_java_deps=warn" "ne" "${expected_message2}"
}
+test_plus_one_ast_analyzer_strict_deps() {
+ dependenecy_target='//test_expect_failure/missing_direct_deps/internal_deps:transitive_dependency'
+ test_target='test_expect_failure/missing_direct_deps/internal_deps:transitive_dependency_user'
+
+ expected_message_warn="warning: Target '$dependenecy_target' is used but isn't explicitly declared, please add it to the deps"
+ expected_message_error="error: Target '$dependenecy_target' is used but isn't explicitly declared, please add it to the deps"
+
+ test_expect_failure_or_warning_on_missing_direct_deps_with_expected_message "${expected_message_error}" ${test_target} "--extra_toolchains=//test/toolchains:ast_plus_one_deps_strict_deps_error" "eq"
+ test_expect_failure_or_warning_on_missing_direct_deps_with_expected_message "${expected_message_error}" ${test_target} "--extra_toolchains=//test/toolchains:ast_plus_one_deps_strict_deps_unused_deps_error" "eq"
+ test_expect_failure_or_warning_on_missing_direct_deps_with_expected_message "${expected_message_warn}" ${test_target} "--extra_toolchains=//test/toolchains:ast_plus_one_deps_strict_deps_warn" "ne"
+}
+
$runner test_scala_import_library_passes_labels_of_direct_deps
$runner test_plus_one_deps_only_works_for_java_info_targets
$runner scala_pb_library_targets_do_not_have_host_deps
$runner test_scala_import_expect_failure_on_missing_direct_deps_warn_mode
+$runner test_plus_one_ast_analyzer_strict_deps
diff --git a/test/shell/test_helper.sh b/test/shell/test_helper.sh
index 7e5f1b989..1c339f6ef 100755
--- a/test/shell/test_helper.sh
+++ b/test/shell/test_helper.sh
@@ -65,7 +65,7 @@ test_expect_failure_or_warning_on_missing_direct_deps_with_expected_message() {
expected_message=$1
test_target=$2
- strict_deps_mode=$3
+ args=$3
operator=${4:-"eq"}
additional_expected_message=${5:-""}
@@ -75,7 +75,7 @@ test_expect_failure_or_warning_on_missing_direct_deps_with_expected_message() {
error_message="bazel build of scala_library with missing direct deps should not have failed."
fi
- command="bazel build ${test_target} ${strict_deps_mode}"
+ command="bazel build ${test_target} ${args}"
output=$(${command} 2>&1)
status_code=$?
diff --git a/test/shell/test_misc.sh b/test/shell/test_misc.sh
index e1a767b71..2a58ce5da 100755
--- a/test/shell/test_misc.sh
+++ b/test/shell/test_misc.sh
@@ -55,12 +55,27 @@ test_repl() {
test_benchmark_jmh() {
RES=$(bazel run -- test/jmh:test_benchmark -i1 -f1 -wi 1)
- RESPONSE_CODE=$?
+ if [ $? -ne 0 ]; then
+ exit 1
+ fi
if [[ $RES != *Result*Benchmark* ]]; then
echo "Benchmark did not produce expected output:\n$RES"
exit 1
fi
- exit $RESPONSE_CODE
+
+ exit 0
+}
+
+test_benchmark_jmh_failure() {
+ set +e
+
+ bazel build test_expect_failure/jmh:jmh_reports_failure
+ if [ $? -eq 0 ]; then
+ echo "'bazel build test_expect_failure/jmh:jmh_reports_failure' should have failed."
+ exit 1
+ fi
+
+ exit 0
}
scala_test_test_filters() {
@@ -104,7 +119,7 @@ test_override_javabin() {
test_coverage_on() {
bazel coverage \
- --extra_toolchains="//test/coverage:enable_code_coverage_aspect" \
+ --extra_toolchains="//scala:code_coverage_toolchain" \
//test/coverage/...
diff test/coverage/expected-coverage.dat $(bazel info bazel-testlogs)/test/coverage/test-all/coverage.dat
}
@@ -117,6 +132,7 @@ $runner test_disappearing_class
$runner test_transitive_deps
$runner test_repl
$runner test_benchmark_jmh
+$runner test_benchmark_jmh_failure
$runner scala_test_test_filters
$runner test_multi_service_manifest
$runner test_override_javabin
diff --git a/test/shell/test_scalafmt.sh b/test/shell/test_scalafmt.sh
new file mode 100755
index 000000000..03db1a895
--- /dev/null
+++ b/test/shell/test_scalafmt.sh
@@ -0,0 +1,75 @@
+# shellcheck source=./test_runner.sh
+dir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
+. "${dir}"/test_runner.sh
+. "${dir}"/test_helper.sh
+runner=$(get_test_runner "${1:-local}")
+
+backup_unformatted() {
+ FILE_PATH=$1
+ FILENAME=$2
+ cp $FILE_PATH/unformatted/unformatted-$FILENAME.scala $FILE_PATH/unformatted/unformatted-$FILENAME.backup.scala
+}
+
+restore_unformatted_before_exit() {
+ FILE_PATH=$1
+ FILENAME=$2
+ cp $FILE_PATH/unformatted/unformatted-$FILENAME.backup.scala $FILE_PATH/unformatted/unformatted-$FILENAME.scala
+ rm -f $FILE_PATH/unformatted/unformatted-$FILENAME.backup.scala
+}
+
+run_formatting() {
+ set +e
+
+ FILE_PATH="$( dirname $( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) )"/scalafmt
+ RULE_TYPE=$1
+ FILENAME=$2
+
+ bazel run //test/scalafmt:formatted-$RULE_TYPE.format-test
+ if [ $? -ne 0 ]; then
+ echo -e "${RED} formatted-$RULE_TYPE.format-test should be a formatted target. $NC"
+ exit 1
+ fi
+
+ bazel run //test/scalafmt:unformatted-$RULE_TYPE.format-test
+ if [ $? -eq 0 ]; then
+ echo -e "${RED} unformatted-$RULE_TYPE.format-test should be an unformatted target. $NC"
+ exit 1
+ fi
+
+ backup_unformatted $FILE_PATH $FILENAME
+ # format unformatted*.scala
+ bazel run //test/scalafmt:unformatted-$RULE_TYPE.format
+ if [ $? -ne 0 ]; then
+ echo -e "${RED} unformatted-$RULE_TYPE.format should run formatting. $NC"
+ restore_unformatted_before_exit $FILE_PATH $FILENAME
+ exit 1
+ fi
+
+ diff $FILE_PATH/unformatted/unformatted-$FILENAME.scala $FILE_PATH/formatted/formatted-$FILENAME.scala
+ if [ $? -ne 0 ]; then
+ echo -e "${RED} unformatted-$FILENAME.scala should be the same as formatted-$FILENAME.scala after formatting. $NC"
+ restore_unformatted_before_exit $FILE_PATH $FILENAME
+ exit 1
+ fi
+ restore_unformatted_before_exit $FILE_PATH $FILENAME
+}
+
+test_scalafmt_binary() {
+ run_formatting binary encoding
+}
+
+test_scalafmt_library() {
+ run_formatting library encoding
+}
+
+test_scalafmt_test() {
+ run_formatting test test
+}
+test_custom_conf() {
+ run_formatting custom-conf custom-conf
+}
+
+$runner test_scalafmt_binary
+$runner test_scalafmt_library
+$runner test_scalafmt_test
+$runner test_custom_conf
diff --git a/test/shell/test_unused_dependency.sh b/test/shell/test_unused_dependency.sh
index 6e8e1e2ff..4659004ab 100755
--- a/test/shell/test_unused_dependency.sh
+++ b/test/shell/test_unused_dependency.sh
@@ -16,17 +16,12 @@ test_unused_dependency_checker_mode_override_toolchain() {
bazel build --extra_toolchains="//test_expect_failure/unused_dependency_checker:failing_scala_toolchain" //test_expect_failure/unused_dependency_checker:toolchain_override
}
-test_unused_dependency_checker_mode_warn() {
- # this is a hack to invalidate the cache, so that the target actually gets built and outputs warnings.
- bazel build \
- --strict_java_deps=warn \
- //test:UnusedDependencyCheckerWarn
+test_succeeds_with_warning() {
+ cmd=$1
+ expected=$2
local output
- output=$(bazel build \
- --strict_java_deps=off \
- //test:UnusedDependencyCheckerWarn 2>&1
- )
+ output=$($cmd 2>&1)
if [ $? -ne 0 ]; then
echo "Target with unused dependency failed to build with status $?"
@@ -34,8 +29,6 @@ test_unused_dependency_checker_mode_warn() {
exit 1
fi
- local expected="warning: Target '//test:UnusedLib' is specified as a dependency to //test:UnusedDependencyCheckerWarn but isn't used, please remove it from the deps."
-
echo "$output" | grep "$expected"
if [ $? -ne 0 ]; then
echo "Expected output:[$output] to contain [$expected]"
@@ -43,12 +36,48 @@ test_unused_dependency_checker_mode_warn() {
fi
}
+test_unused_dependency_checker_mode_warn() {
+ # this is a hack to invalidate the cache, so that the target actually gets built and outputs warnings.
+ bazel build \
+ --strict_java_deps=warn \
+ //test:UnusedDependencyCheckerWarn
+
+ test_succeeds_with_warning \
+ "bazel build --strict_java_deps=off //test:UnusedDependencyCheckerWarn" \
+ "warning: Target '//test:UnusedLib' is specified as a dependency to //test:UnusedDependencyCheckerWarn but isn't used, please remove it from the deps."
+}
+
test_unused_dependency_fails_even_if_also_exists_in_plus_one_deps() {
action_should_fail build --extra_toolchains="//test_expect_failure/plus_one_deps:plus_one_deps_with_unused_error" //test_expect_failure/plus_one_deps/with_unused_deps:a
}
+test_plus_one_ast_analyzer_unused_deps_error() {
+ action_should_fail build --extra_toolchains="//test/toolchains:ast_plus_one_deps_unused_deps_error" //test_expect_failure/plus_one_deps/with_unused_deps:a
+}
+
+test_plus_one_ast_analyzer_unused_deps_strict_deps_error() {
+ action_should_fail build --extra_toolchains="//test/toolchains:ast_plus_one_deps_strict_deps_unused_deps_error" //test_expect_failure/plus_one_deps/with_unused_deps:a
+}
+
+test_plus_one_ast_analyzer_unused_deps_warn() {
+ test_succeeds_with_warning \
+ "bazel build --extra_toolchains=//test/toolchains:ast_plus_one_deps_unused_deps_warn //test_expect_failure/plus_one_deps/with_unused_deps:a" \
+ "warning: Target '//test_expect_failure/plus_one_deps/with_unused_deps:c' is specified as a dependency to //test_expect_failure/plus_one_deps/with_unused_deps:a but isn't used, please remove it from the deps."
+}
+
+test_plus_one_ast_analyzer_unused_deps_scala_test() {
+ # We should not emit an unuse dep warning for scalatest library in a scala_test rule
+ # even when the rule does not directly depend on scalatest. As scalatest is built into
+ # the scala_test library.
+ bazel build --extra_toolchains="//test/toolchains:ast_plus_one_deps_unused_deps_error" //test/scala_test:b
+}
+
$runner test_unused_dependency_checker_mode_from_scala_toolchain
$runner test_unused_dependency_checker_mode_set_in_rule
$runner test_unused_dependency_checker_mode_override_toolchain
$runner test_unused_dependency_checker_mode_warn
$runner test_unused_dependency_fails_even_if_also_exists_in_plus_one_deps
+$runner test_plus_one_ast_analyzer_unused_deps_error
+$runner test_plus_one_ast_analyzer_unused_deps_strict_deps_error
+$runner test_plus_one_ast_analyzer_unused_deps_warn
+$runner test_plus_one_ast_analyzer_unused_deps_scala_test
diff --git a/test/src/main/scala/scalarules/test/junit/HelloWorldJunitTest.scala b/test/src/main/scala/scalarules/test/junit/HelloWorldJunitTest.scala
new file mode 100644
index 000000000..6d982fb67
--- /dev/null
+++ b/test/src/main/scala/scalarules/test/junit/HelloWorldJunitTest.scala
@@ -0,0 +1,12 @@
+package scalarules.test.junit
+
+import org.junit.Test
+
+class HelloWorldJunitTest {
+
+ @Test
+ def helloWorld: Unit = {
+ println("hello world")
+ }
+
+}
diff --git a/test/src/main/scala/scalarules/test/large_classpath/BUILD b/test/src/main/scala/scalarules/test/large_classpath/BUILD
index e9f1415a5..4d8783082 100644
--- a/test/src/main/scala/scalarules/test/large_classpath/BUILD
+++ b/test/src/main/scala/scalarules/test/large_classpath/BUILD
@@ -1,4 +1,4 @@
-load("//scala:scala.bzl", "scala_binary")
+load("//scala:scala.bzl", "scala_binary", "scala_library")
load(":helper.bzl", "create_dependencies", "get_dependency_labels")
scala_binary(
@@ -8,12 +8,17 @@ scala_binary(
unused_dependency_checker_mode = "off",
visibility = ["//visibility:public"],
deps = get_dependency_labels(
- amount = 250,
+ amount = 1000,
length = 20,
),
)
+scala_library(
+ name = "triggerDeployJarCreation",
+ data = [":largeClasspath_deploy.jar"],
+)
+
create_dependencies(
- amount = 250,
+ amount = 1000,
length = 20,
)
diff --git a/test/src/main/scala/scalarules/test/resources/strip/BUILD b/test/src/main/scala/scalarules/test/resources/strip/BUILD
index b4036aaf9..b13cb4542 100644
--- a/test/src/main/scala/scalarules/test/resources/strip/BUILD
+++ b/test/src/main/scala/scalarules/test/resources/strip/BUILD
@@ -14,3 +14,12 @@ scala_specs2_junit_test(
unused_dependency_checker_mode = "off",
deps = [":noSrcsWithResources"],
)
+
+scala_specs2_junit_test(
+ name = "resouceStripPrefixFromExternalRepoTest",
+ size = "small",
+ srcs = ["ResourceStripPrefixTest.scala"],
+ suffixes = ["Test"],
+ unused_dependency_checker_mode = "off",
+ deps = ["@strip_resource_external_workspace//strip:noSrcsWithResources"],
+)
diff --git a/test/src/main/scala/scalarules/test/scala_import/BUILD b/test/src/main/scala/scalarules/test/scala_import/BUILD
index 0ffc07d7c..80ca9ccd7 100644
--- a/test/src/main/scala/scalarules/test/scala_import/BUILD
+++ b/test/src/main/scala/scalarules/test/scala_import/BUILD
@@ -1,3 +1,4 @@
+load("@rules_java//java:defs.bzl", "java_import")
load("//scala:scala.bzl", "scala_library", "scala_specs2_junit_test")
load("//scala:scala_import.bzl", "scala_import")
diff --git a/test/src/main/scala/scalarules/test/twitter_scrooge/thrift/bare_jar_thrifts/BUILD b/test/src/main/scala/scalarules/test/twitter_scrooge/thrift/bare_jar_thrifts/BUILD
index 7ba56931a..ac9c03ac4 100644
--- a/test/src/main/scala/scalarules/test/twitter_scrooge/thrift/bare_jar_thrifts/BUILD
+++ b/test/src/main/scala/scalarules/test/twitter_scrooge/thrift/bare_jar_thrifts/BUILD
@@ -1,3 +1,4 @@
+load("@rules_java//java:defs.bzl", "java_import")
load("//thrift:thrift.bzl", "thrift_library")
java_import(
diff --git a/test/toolchains/BUILD.bazel b/test/toolchains/BUILD.bazel
new file mode 100644
index 000000000..64a60a4ca
--- /dev/null
+++ b/test/toolchains/BUILD.bazel
@@ -0,0 +1,77 @@
+load("//scala:scala_toolchain.bzl", "scala_toolchain")
+
+scala_toolchain(
+ name = "ast_plus_one_deps_unused_deps_warn_impl",
+ dependency_mode = "plus-one",
+ dependency_tracking_method = "ast",
+ unused_dependency_checker_mode = "warn",
+ visibility = ["//visibility:public"],
+)
+
+toolchain(
+ name = "ast_plus_one_deps_unused_deps_warn",
+ toolchain = "ast_plus_one_deps_unused_deps_warn_impl",
+ toolchain_type = "@io_bazel_rules_scala//scala:toolchain_type",
+ visibility = ["//visibility:public"],
+)
+
+scala_toolchain(
+ name = "ast_plus_one_deps_unused_deps_error_impl",
+ dependency_mode = "plus-one",
+ dependency_tracking_method = "ast",
+ unused_dependency_checker_mode = "error",
+ visibility = ["//visibility:public"],
+)
+
+toolchain(
+ name = "ast_plus_one_deps_unused_deps_error",
+ toolchain = "ast_plus_one_deps_unused_deps_error_impl",
+ toolchain_type = "@io_bazel_rules_scala//scala:toolchain_type",
+ visibility = ["//visibility:public"],
+)
+
+scala_toolchain(
+ name = "ast_plus_one_deps_strict_deps_warn_impl",
+ dependency_mode = "plus-one",
+ dependency_tracking_method = "ast",
+ strict_deps_mode = "warn",
+ visibility = ["//visibility:public"],
+)
+
+toolchain(
+ name = "ast_plus_one_deps_strict_deps_warn",
+ toolchain = "ast_plus_one_deps_strict_deps_warn_impl",
+ toolchain_type = "@io_bazel_rules_scala//scala:toolchain_type",
+ visibility = ["//visibility:public"],
+)
+
+scala_toolchain(
+ name = "ast_plus_one_deps_strict_deps_error_impl",
+ dependency_mode = "plus-one",
+ dependency_tracking_method = "ast",
+ strict_deps_mode = "error",
+ visibility = ["//visibility:public"],
+)
+
+toolchain(
+ name = "ast_plus_one_deps_strict_deps_error",
+ toolchain = "ast_plus_one_deps_strict_deps_error_impl",
+ toolchain_type = "@io_bazel_rules_scala//scala:toolchain_type",
+ visibility = ["//visibility:public"],
+)
+
+scala_toolchain(
+ name = "ast_plus_one_deps_strict_deps_unused_deps_error_impl",
+ dependency_mode = "plus-one",
+ dependency_tracking_method = "ast",
+ strict_deps_mode = "error",
+ unused_dependency_checker_mode = "error",
+ visibility = ["//visibility:public"],
+)
+
+toolchain(
+ name = "ast_plus_one_deps_strict_deps_unused_deps_error",
+ toolchain = "ast_plus_one_deps_strict_deps_unused_deps_error_impl",
+ toolchain_type = "@io_bazel_rules_scala//scala:toolchain_type",
+ visibility = ["//visibility:public"],
+)
diff --git a/test/unstable/BUILD b/test/unstable/BUILD
new file mode 100644
index 000000000..621ee2e25
--- /dev/null
+++ b/test/unstable/BUILD
@@ -0,0 +1,27 @@
+load(
+ "//scala/unstable:defs.bzl",
+ "scala_binary",
+ "scala_library",
+ "scala_test",
+)
+
+scala_binary(
+ name = "binary",
+ srcs = ["binary.scala"],
+ main_class = "test.v2.Binary",
+ deps = [":library"],
+)
+
+scala_library(
+ name = "library",
+ srcs = ["library.scala"],
+ deps = [],
+)
+
+scala_test(
+ name = "test",
+ srcs = ["test.scala"],
+ deps = [
+ ":library",
+ ],
+)
diff --git a/test/unstable/binary.scala b/test/unstable/binary.scala
new file mode 100644
index 000000000..56486bffa
--- /dev/null
+++ b/test/unstable/binary.scala
@@ -0,0 +1,7 @@
+package test.v2
+
+object Binary {
+ def main(args: Array[String]): Unit = {
+ println(s"${Library.method1} ${Library.method2}")
+ }
+}
diff --git a/test/unstable/library.scala b/test/unstable/library.scala
new file mode 100644
index 000000000..8048a67ca
--- /dev/null
+++ b/test/unstable/library.scala
@@ -0,0 +1,6 @@
+package test.v2
+
+object Library {
+ def method1(): String = "hello"
+ def method2(): String = "world"
+}
diff --git a/test/unstable/test.scala b/test/unstable/test.scala
new file mode 100644
index 000000000..88985c7fb
--- /dev/null
+++ b/test/unstable/test.scala
@@ -0,0 +1,13 @@
+package test.v2
+
+import org.scalatest.FunSuite
+
+class Test extends FunSuite {
+ test("method1") {
+ assert(Library.method1 == "hello")
+ }
+
+ test("method2") {
+ assert(Library.method2 == "world")
+ }
+}
diff --git a/test_expect_failure/jmh/BUILD b/test_expect_failure/jmh/BUILD
new file mode 100644
index 000000000..fbd48091d
--- /dev/null
+++ b/test_expect_failure/jmh/BUILD
@@ -0,0 +1,11 @@
+load(
+ "//jmh:jmh.bzl",
+ "scala_benchmark_jmh",
+)
+
+scala_benchmark_jmh(
+ name = "jmh_reports_failure",
+ srcs = [
+ "InvalidBenchmark.scala",
+ ],
+)
diff --git a/test_expect_failure/jmh/InvalidBenchmark.scala b/test_expect_failure/jmh/InvalidBenchmark.scala
new file mode 100644
index 000000000..5a0472942
--- /dev/null
+++ b/test_expect_failure/jmh/InvalidBenchmark.scala
@@ -0,0 +1,10 @@
+package foo
+
+import org.openjdk.jmh.annotations.Benchmark
+
+// Benchmark classes cannot be final.
+final class InvalidBenchmark {
+ @Benchmark
+ def sumIntegersBenchmark: Int =
+ (1 to 100).sum
+}
diff --git a/test_expect_failure/missing_direct_deps/internal_deps/BUILD b/test_expect_failure/missing_direct_deps/internal_deps/BUILD
index de6053f4f..ac1ade64a 100644
--- a/test_expect_failure/missing_direct_deps/internal_deps/BUILD
+++ b/test_expect_failure/missing_direct_deps/internal_deps/BUILD
@@ -1,3 +1,5 @@
+load("@rules_java//java:defs.bzl", "java_library")
+
package(default_visibility = ["//visibility:public"])
load("//scala:scala.bzl", "scala_binary", "scala_library", "scala_test")
diff --git a/test_expect_failure/proto_source_root/dependency/BUILD b/test_expect_failure/proto_source_root/dependency/BUILD
index 37ca7370a..a514e80b9 100644
--- a/test_expect_failure/proto_source_root/dependency/BUILD
+++ b/test_expect_failure/proto_source_root/dependency/BUILD
@@ -1,3 +1,5 @@
+load("@rules_proto//proto:defs.bzl", "proto_library")
+
proto_library(
name = "dependency",
srcs = glob(["*.proto"]),
diff --git a/test_expect_failure/proto_source_root/user/BUILD b/test_expect_failure/proto_source_root/user/BUILD
index 4431a2876..34ce09598 100644
--- a/test_expect_failure/proto_source_root/user/BUILD
+++ b/test_expect_failure/proto_source_root/user/BUILD
@@ -1,3 +1,4 @@
+load("@rules_proto//proto:defs.bzl", "proto_library")
load(
"//scala_proto:scala_proto.bzl",
"scala_proto_library",
diff --git a/test_expect_failure/transitive/java_to_scala/BUILD b/test_expect_failure/transitive/java_to_scala/BUILD
index 73d288846..c60bd89cb 100644
--- a/test_expect_failure/transitive/java_to_scala/BUILD
+++ b/test_expect_failure/transitive/java_to_scala/BUILD
@@ -1,3 +1,4 @@
+load("@rules_java//java:defs.bzl", "java_library")
load("//scala:scala.bzl", "scala_export_to_java", "scala_library")
scala_library(
diff --git a/test_expect_failure/transitive/scala_to_java/BUILD b/test_expect_failure/transitive/scala_to_java/BUILD
index 9e2ab1c2b..dd06d56e0 100644
--- a/test_expect_failure/transitive/scala_to_java/BUILD
+++ b/test_expect_failure/transitive/scala_to_java/BUILD
@@ -1,3 +1,4 @@
+load("@rules_java//java:defs.bzl", "java_library")
load("//scala:scala.bzl", "scala_library")
java_library(
diff --git a/test_rules_scala.sh b/test_rules_scala.sh
index e8456fabf..c57f62661 100755
--- a/test_rules_scala.sh
+++ b/test_rules_scala.sh
@@ -30,6 +30,7 @@ $runner bazel test //test/... --extra_toolchains="//test_expect_failure/plus_one
. "${test_dir}"/test_junit.sh
. "${test_dir}"/test_misc.sh
. "${test_dir}"/test_phase.sh
+. "${test_dir}"/test_scalafmt.sh
. "${test_dir}"/test_scala_binary.sh
. "${test_dir}"/test_scalac_jvm_flags.sh
. "${test_dir}"/test_scala_classpath.sh
diff --git a/test_version/WORKSPACE.template b/test_version/WORKSPACE.template
index 0dd7cd7b3..f2705e2cb 100644
--- a/test_version/WORKSPACE.template
+++ b/test_version/WORKSPACE.template
@@ -11,9 +11,12 @@ scala_version = "${scala_version}"
load("@io_bazel_rules_scala//scala:scala.bzl", "scala_repositories")
-scala_repositories((scala_version, {
-${scala_version_shas}
-}))
+scala_repositories(
+ (scala_version, {
+ ${scala_version_shas}
+ }),
+ fetch_sources = True
+)
load("@io_bazel_rules_scala//twitter_scrooge:twitter_scrooge.bzl", "twitter_scrooge", "scrooge_scala_library")
diff --git a/test_version/version_specific_tests_dir/BUILD b/test_version/version_specific_tests_dir/BUILD
index 5c048a244..b80c9f893 100644
--- a/test_version/version_specific_tests_dir/BUILD
+++ b/test_version/version_specific_tests_dir/BUILD
@@ -1,3 +1,5 @@
+load("@rules_java//java:defs.bzl", "java_binary", "java_library")
+
package(default_testonly = 1)
load(
diff --git a/test_version/version_specific_tests_dir/proto/BUILD b/test_version/version_specific_tests_dir/proto/BUILD
index 98f34bea6..e49bf63f7 100644
--- a/test_version/version_specific_tests_dir/proto/BUILD
+++ b/test_version/version_specific_tests_dir/proto/BUILD
@@ -1,7 +1,9 @@
+load("@rules_java//java:defs.bzl", "java_proto_library")
load(
"@io_bazel_rules_scala//scala_proto:scala_proto.bzl",
"scala_proto_library",
)
+load("@rules_proto//proto:defs.bzl", "proto_library")
proto_library(
name = "test2",
diff --git a/test_version/version_specific_tests_dir/proto2/BUILD b/test_version/version_specific_tests_dir/proto2/BUILD
index 96e963557..2087f7626 100644
--- a/test_version/version_specific_tests_dir/proto2/BUILD
+++ b/test_version/version_specific_tests_dir/proto2/BUILD
@@ -1,3 +1,5 @@
+load("@rules_proto//proto:defs.bzl", "proto_library")
+
proto_library(
name = "test",
srcs = ["test.proto"],
diff --git a/test_version/version_specific_tests_dir/src/main/scala/scalarules/test/twitter_scrooge/thrift/bare_jar_thrifts/BUILD b/test_version/version_specific_tests_dir/src/main/scala/scalarules/test/twitter_scrooge/thrift/bare_jar_thrifts/BUILD
index 199526a6a..cef19fe06 100644
--- a/test_version/version_specific_tests_dir/src/main/scala/scalarules/test/twitter_scrooge/thrift/bare_jar_thrifts/BUILD
+++ b/test_version/version_specific_tests_dir/src/main/scala/scalarules/test/twitter_scrooge/thrift/bare_jar_thrifts/BUILD
@@ -1,3 +1,4 @@
+load("@rules_java//java:defs.bzl", "java_import")
load("@io_bazel_rules_scala//thrift:thrift.bzl", "thrift_library")
java_import(
diff --git a/third_party/bazel/src/main/protobuf/BUILD b/third_party/bazel/src/main/protobuf/BUILD
new file mode 100644
index 000000000..a505b865d
--- /dev/null
+++ b/third_party/bazel/src/main/protobuf/BUILD
@@ -0,0 +1,20 @@
+load("@rules_java//java:defs.bzl", "java_proto_library")
+load("@rules_proto//proto:defs.bzl", "proto_library")
+
+licenses(["notice"])
+
+package(default_visibility = ["//visibility:public"])
+
+FILES = [
+ "worker_protocol",
+]
+
+[proto_library(
+ name = s + "_proto",
+ srcs = [s + ".proto"],
+) for s in FILES]
+
+[java_proto_library(
+ name = s + "_java_proto",
+ deps = [":" + s + "_proto"],
+) for s in FILES]
diff --git a/third_party/bazel/src/main/protobuf/worker_protocol.proto b/third_party/bazel/src/main/protobuf/worker_protocol.proto
new file mode 100644
index 000000000..c628b7eb7
--- /dev/null
+++ b/third_party/bazel/src/main/protobuf/worker_protocol.proto
@@ -0,0 +1,62 @@
+// Copyright 2015 The Bazel Authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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";
+
+package blaze.worker;
+
+option java_package = "com.google.devtools.build.lib.worker";
+
+// An input file.
+message Input {
+ // The path in the file system where to read this input artifact from. This is
+ // either a path relative to the execution root (the worker process is
+ // launched with the working directory set to the execution root), or an
+ // absolute path.
+ string path = 1;
+
+ // A hash-value of the contents. The format of the contents is unspecified and
+ // the digest should be treated as an opaque token.
+ bytes digest = 2;
+}
+
+// This represents a single work unit that Blaze sends to the worker.
+message WorkRequest {
+ repeated string arguments = 1;
+
+ // The inputs that the worker is allowed to read during execution of this
+ // request.
+ repeated Input inputs = 2;
+
+ // To support multiplex worker, each WorkRequest must have an unique ID. This
+ // ID should be attached unchanged to the WorkResponse.
+ int32 request_id = 3;
+}
+
+// The worker sends this message to Blaze when it finished its work on the
+// WorkRequest message.
+message WorkResponse {
+ int32 exit_code = 1;
+
+ // This is printed to the user after the WorkResponse has been received and is
+ // supposed to contain compiler warnings / errors etc. - thus we'll use a
+ // string type here, which gives us UTF-8 encoding.
+ string output = 2;
+
+ // To support multiplex worker, each WorkResponse must have an unique ID.
+ // Since worker processes which support multiplex worker will handle multiple
+ // WorkRequests in parallel, this ID will be used to determined which
+ // WorkerProxy does this WorkResponse belong to.
+ int32 request_id = 3;
+}
diff --git a/third_party/dependency_analyzer/src/main/BUILD b/third_party/dependency_analyzer/src/main/BUILD
index 40fb822a6..e9e00a221 100644
--- a/third_party/dependency_analyzer/src/main/BUILD
+++ b/third_party/dependency_analyzer/src/main/BUILD
@@ -2,14 +2,34 @@ licenses(["notice"]) # 3-clause BSD
load("//scala:scala.bzl", "scala_library_for_plugin_bootstrapping")
+scala_library_for_plugin_bootstrapping(
+ name = "scala_version",
+ srcs = [
+ "io/bazel/rulesscala/dependencyanalyzer/ScalaVersion.scala",
+ ],
+ # As this contains macros we shouldn't make an ijar
+ build_ijar = False,
+ resources = ["resources/scalac-plugin.xml"],
+ visibility = ["//visibility:public"],
+ deps = [
+ "//external:io_bazel_rules_scala/dependency/scala/scala_compiler",
+ "//external:io_bazel_rules_scala/dependency/scala/scala_reflect",
+ ],
+)
+
scala_library_for_plugin_bootstrapping(
name = "dependency_analyzer",
srcs = [
+ "io/bazel/rulesscala/dependencyanalyzer/AstUsedJarFinder.scala",
"io/bazel/rulesscala/dependencyanalyzer/DependencyAnalyzer.scala",
+ "io/bazel/rulesscala/dependencyanalyzer/DependencyAnalyzerSettings.scala",
+ "io/bazel/rulesscala/dependencyanalyzer/HighLevelCrawlUsedJarFinder.scala",
+ "io/bazel/rulesscala/dependencyanalyzer/OptionsParser.scala",
],
resources = ["resources/scalac-plugin.xml"],
visibility = ["//visibility:public"],
deps = [
+ ":scala_version",
"//external:io_bazel_rules_scala/dependency/scala/scala_compiler",
"//external:io_bazel_rules_scala/dependency/scala/scala_reflect",
],
diff --git a/third_party/dependency_analyzer/src/main/io/bazel/rulesscala/dependencyanalyzer/AstUsedJarFinder.scala b/third_party/dependency_analyzer/src/main/io/bazel/rulesscala/dependencyanalyzer/AstUsedJarFinder.scala
new file mode 100644
index 000000000..9f21f3fd2
--- /dev/null
+++ b/third_party/dependency_analyzer/src/main/io/bazel/rulesscala/dependencyanalyzer/AstUsedJarFinder.scala
@@ -0,0 +1,144 @@
+package third_party.dependency_analyzer.src.main.io.bazel.rulesscala.dependencyanalyzer
+
+import scala.reflect.io.AbstractFile
+import scala.tools.nsc.Global
+
+class AstUsedJarFinder(
+ global: Global
+) {
+ import global._
+
+ def findUsedJars: Map[AbstractFile, Global#Position] = {
+ val jars = collection.mutable.Map[AbstractFile, global.Position]()
+
+ def recordUse(source: AbstractFile, pos: Position): Unit = {
+ // We prefer to report locations which have information (e.g.
+ // we don't want NoPosition).
+ if (!jars.contains(source) || !jars(source).isDefined) {
+ jars.put(source, pos)
+ }
+ }
+
+ def handleType(tpe: Type, pos: Position): Unit = {
+ val sym = tpe.typeSymbol
+ val assocFile = sym.associatedFile
+ if (assocFile.path.endsWith(".class"))
+ assocFile.underlyingSource.foreach { source =>
+ recordUse(source, pos)
+ }
+ }
+
+ def exploreType(tpe: Type, pos: Position): Unit = {
+ handleType(tpe, pos)
+ tpe.typeArgs.foreach(exploreType(_, pos))
+ }
+
+ def exploreClassfileAnnotArg(arg: ClassfileAnnotArg, pos: Position): Unit = {
+ arg match {
+ case LiteralAnnotArg(value) =>
+ exploreConstant(value, pos)
+ case ArrayAnnotArg(args) =>
+ args.foreach(exploreClassfileAnnotArg(_, pos))
+ case NestedAnnotArg(info) =>
+ exploreAnnotationInfo(info)
+ case _ =>
+ }
+ }
+ def exploreAnnotationInfo(annot: AnnotationInfo): Unit = {
+ // It would be nice if we could just do
+ // fullyExploreTree(annot.tree)
+ // Unfortunately that tree is synthetic and hence doesn't have
+ // positions attached. Hence we examine the components that
+ // go into that tree separately, as those do have positions.
+ exploreType(annot.tpe, annot.pos)
+ annot.scalaArgs.foreach(fullyExploreTree)
+ annot.javaArgs.values.foreach(exploreClassfileAnnotArg(_, annot.pos))
+ }
+
+ def exploreConstant(value: Constant, pos: Position): Unit = {
+ value.value match {
+ case tpe: Type =>
+ exploreType(tpe, pos)
+ case _ =>
+ }
+ }
+
+ def fullyExploreTree(tree: Tree): Unit = {
+ def visitNode(tree: Tree): Unit = {
+ tree match {
+ case node: TypeTree =>
+ if (node.original != null) {
+ fullyExploreTree(node.original)
+ }
+ case node: Literal =>
+ // We should examine OriginalTreeAttachment but that was only
+ // added in 2.12.4, so include a version check
+ ScalaVersion.conditional(
+ Some("2.12.4"),
+ None,
+ """
+ node.attachments
+ .get[global.treeChecker.OriginalTreeAttachment]
+ .foreach { attach =>
+ fullyExploreTree(attach.original)
+ }
+ """
+ )
+
+ exploreConstant(node.value, tree.pos)
+ case _ =>
+ }
+
+ // If this expression is the result of a macro, then we
+ // should also examine the original macro expression
+ tree.attachments
+ .get[global.treeChecker.MacroExpansionAttachment]
+ .foreach { attach =>
+ // When we explore the original, the original also has
+ // this attachment. So we should not examine the original
+ // again if so.
+ if (attach.expandee != tree) {
+ fullyExploreTree(attach.expandee)
+ }
+ }
+
+ val shouldExamine =
+ tree match {
+ case select: Select if select.symbol.isDefaultGetter =>
+ false
+ case _ =>
+ true
+ }
+
+ if (shouldExamine) {
+ if (tree.hasSymbolField) {
+ tree.symbol.annotations
+ // We skip annotations without positions. The reason for
+ // this is the case of
+ // @SomeAnnotation class A
+ // class B extends A
+ // Now assuming A and B are in separate packages, while
+ // examining B we will examine A as well, and hence
+ // examine A's annotations. However we don't wish to examine
+ // A's annotations as we don't care about those details of A.
+ // Hence we only examine annotations with positions (hence,
+ // they were defined in the same compilation unit and thus
+ // matter).
+ .filter(_.pos.isDefined)
+ .foreach(exploreAnnotationInfo)
+ }
+ if (tree.tpe != null) {
+ exploreType(tree.tpe, tree.pos)
+ }
+ }
+ }
+
+ tree.foreach(visitNode)
+ }
+
+ currentRun.units.foreach { unit =>
+ fullyExploreTree(unit.body)
+ }
+ jars.toMap
+ }
+}
diff --git a/third_party/dependency_analyzer/src/main/io/bazel/rulesscala/dependencyanalyzer/DependencyAnalyzer.scala b/third_party/dependency_analyzer/src/main/io/bazel/rulesscala/dependencyanalyzer/DependencyAnalyzer.scala
index b04724566..847188f20 100644
--- a/third_party/dependency_analyzer/src/main/io/bazel/rulesscala/dependencyanalyzer/DependencyAnalyzer.scala
+++ b/third_party/dependency_analyzer/src/main/io/bazel/rulesscala/dependencyanalyzer/DependencyAnalyzer.scala
@@ -1,110 +1,180 @@
package third_party.dependency_analyzer.src.main.io.bazel.rulesscala.dependencyanalyzer
import scala.reflect.io.AbstractFile
-import scala.tools.nsc.plugins.{Plugin, PluginComponent}
-import scala.tools.nsc.{Global, Phase}
+import scala.tools.nsc.plugins.Plugin
+import scala.tools.nsc.plugins.PluginComponent
+import scala.tools.nsc.Global
+import scala.tools.nsc.Phase
class DependencyAnalyzer(val global: Global) extends Plugin {
- val name = "dependency-analyzer"
- val description =
- "Analyzes the used dependencies and fails the compilation " +
- "if they are not explicitly used as direct dependencies (only declared transitively)"
- val components = List[PluginComponent](Component)
-
- var indirect: Map[String, String] = Map.empty
- var direct: Set[String] = Set.empty
- var analyzerMode: String = "error"
- var currentTarget: String = "NA"
-
- override def processOptions(options: List[String], error: (String) => Unit): Unit = {
- var indirectJars: Seq[String] = Seq.empty
- var indirectTargets: Seq[String] = Seq.empty
-
- for (option <- options) {
- option.split(":").toList match {
- case "direct-jars" :: data => direct = data.toSet
- case "indirect-jars" :: data => indirectJars = data;
- case "indirect-targets" :: data => indirectTargets = data.map(_.replace(";", ":"))
- case "current-target" :: target => currentTarget = target.map(_.replace(";", ":")).head
- case "mode" :: mode => analyzerMode = mode.head
- case unknown :: _ => error(s"unknown param $unknown")
- case Nil =>
- }
- }
- indirect = indirectJars.zip(indirectTargets).toMap
+ override val name = "dependency-analyzer"
+ override val description =
+ "Analyzes the used dependencies. Can check and warn or fail the " +
+ "compilation for issues including not directly including " +
+ "dependencies which are directly included in the code, or " +
+ "including unused dependencies."
+ override val components =
+ List[PluginComponent](
+ new AnalyzerComponent(
+ runsAfterPhase = "typer",
+ handles = DependencyTrackingMethod.Ast
+ ),
+ new AnalyzerComponent(
+ runsAfterPhase = "jvm",
+ handles = DependencyTrackingMethod.HighLevel
+ )
+ )
+
+ private val isWindows: Boolean = System.getProperty("os.name").toLowerCase.contains("windows")
+ private var settings: DependencyAnalyzerSettings = null
+
+ override def init(
+ options: List[String],
+ error: String => Unit
+ ): Boolean = {
+ settings = DependencyAnalyzerSettings.parseSettings(options = options, error = error)
+ true
}
-
- private object Component extends PluginComponent {
- val global: DependencyAnalyzer.this.global.type =
+ private class AnalyzerComponent(
+ // Typer seems to be the better method at least for AST - it seems like
+ // some things get eliminated in later phases. However, due to backwards
+ // compatibility we have to preserve using jvm for the high-level-crawl
+ // dependency tracking method
+ runsAfterPhase: String,
+ handles: DependencyTrackingMethod
+ ) extends PluginComponent {
+ override val global: DependencyAnalyzer.this.global.type =
DependencyAnalyzer.this.global
- import global._
-
- override val runsAfter = List("jvm")
+ override val runsAfter = List(runsAfterPhase)
- val phaseName = DependencyAnalyzer.this.name
+ val phaseName = s"${DependencyAnalyzer.this.name}-post-$runsAfterPhase"
override def newPhase(prev: Phase): StdPhase = new StdPhase(prev) {
override def run(): Unit = {
-
super.run()
-
- val usedJars = findUsedJars
-
- warnOnIndirectTargetsFoundIn(usedJars)
+ if (settings.dependencyTrackingMethod == handles) {
+ runAnalysis()
+ }
}
- private def warnOnIndirectTargetsFoundIn(usedJars: Set[AbstractFile]) = {
- for (usedJar <- usedJars;
- usedJarPath = usedJar.path;
- target <- indirect.get(usedJarPath) if !direct.contains(usedJarPath)) {
- val errorMessage =
- s"""Target '$target' is used but isn't explicitly declared, please add it to the deps.
- |You can use the following buildozer command:
- |buildozer 'add deps $target' $currentTarget""".stripMargin
+ override def apply(unit: global.CompilationUnit): Unit = ()
+ }
+ }
- analyzerMode match {
- case "error" => reporter.error(NoPosition, errorMessage)
- case "warn" => reporter.warning(NoPosition, errorMessage)
- }
+ private def runAnalysis(): Unit = {
+ val usedJarsToPositions = findUsedJarsAndPositions
+ val usedJarPathToPositions =
+ if (!isWindows) {
+ usedJarsToPositions.map { case (jar, pos) =>
+ jar.path -> pos
+ }
+ } else {
+ usedJarsToPositions.map { case (jar, pos) =>
+ jar.path.replaceAll("\\\\", "/") -> pos
}
}
- override def apply(unit: CompilationUnit): Unit = ()
+ if (settings.unusedDepsMode != AnalyzerMode.Off) {
+ reportUnusedDepsFoundIn(usedJarPathToPositions)
}
+ if (settings.strictDepsMode != AnalyzerMode.Off) {
+ reportIndirectTargetsFoundIn(usedJarPathToPositions)
+ }
}
- import global._
+ private def reportIndirectTargetsFoundIn(
+ usedJarPathAndPositions: Map[String, global.Position]
+ ): Unit = {
+ val errors =
+ usedJarPathAndPositions
+ .filterNot { case (jarPath, _) =>
+ settings.directTargetSet.jarSet.contains(jarPath)
+ }
+ .flatMap { case (jarPath, pos) =>
+ settings.indirectTargetSet.targetFromJarOpt(jarPath).map { target =>
+ target -> pos
+ }
+ }
+ .map { case (target, pos) =>
+ val message =
+ s"""Target '$target' is used but isn't explicitly declared, please add it to the deps.
+ |You can use the following buildozer command:
+ |buildozer 'add deps $target' ${settings.currentTarget}""".stripMargin
+ message -> pos
+ }
- private def findUsedJars: Set[AbstractFile] = {
- val jars = collection.mutable.Set[AbstractFile]()
+ warnOrError(settings.strictDepsMode, errors)
+ }
- def walkTopLevels(root: Symbol): Unit = {
- def safeInfo(sym: Symbol): Type =
- if (sym.hasRawInfo && sym.rawInfo.isComplete) sym.info else NoType
+ private def reportUnusedDepsFoundIn(
+ usedJarPathAndPositions: Map[String, global.Position]
+ ): Unit = {
+ val directJarPaths = settings.directTargetSet.jarSet
- def packageClassOrSelf(sym: Symbol): Symbol =
- if (sym.hasPackageFlag && !sym.isModuleClass) sym.moduleClass else sym
- for (x <- safeInfo(packageClassOrSelf(root)).decls) {
- if (x == root) ()
- else if (x.hasPackageFlag) walkTopLevels(x)
- else if (x.owner != root) { // exclude package class members
- if (x.hasRawInfo && x.rawInfo.isComplete) {
- val assocFile = x.associatedFile
- if (assocFile.path.endsWith(".class") && assocFile.underlyingSource.isDefined)
- assocFile.underlyingSource.foreach(jars += _)
- }
+ val usedTargets =
+ usedJarPathAndPositions
+ .flatMap { case (jar, _) =>
+ settings.directTargetSet.targetFromJarOpt(jar)
}
+ .toSet
+
+ val unusedTargets = directJarPaths
+ // This .get is safe because [jar] was gotten from [directJarPaths]
+ // which is the set of keys of the direct targets.
+ .filter(jar => !usedTargets.contains(settings.directTargetSet.targetFromJarOpt(jar).get))
+ .flatMap(settings.directTargetSet.targetFromJarOpt)
+ .diff(settings.ignoredUnusedDependencyTargets)
+
+ val toWarnOrError =
+ unusedTargets.map { target =>
+ val message =
+ s"""Target '$target' is specified as a dependency to ${settings.currentTarget} but isn't used, please remove it from the deps.
+ |You can use the following buildozer command:
+ |buildozer 'remove deps $target' ${settings.currentTarget}
+ |""".stripMargin
+ (message, global.NoPosition: global.Position)
}
+
+ warnOrError(settings.unusedDepsMode, toWarnOrError.toMap)
+ }
+
+ private def warnOrError(
+ analyzerMode: AnalyzerMode,
+ errors: Map[String, global.Position]
+ ): Unit = {
+ val reportFunction: (String, global.Position) => Unit = analyzerMode match {
+ case AnalyzerMode.Error =>
+ { case (message, pos) =>
+ global.reporter.error(pos, message)
+ }
+ case AnalyzerMode.Warn =>
+ { case (message, pos) =>
+ global.reporter.warning(pos, message)
+ }
+ case AnalyzerMode.Off => (_, _) => ()
}
- exitingTyper {
- walkTopLevels(RootClass)
+ errors.foreach { case (message, pos) =>
+ reportFunction(message, pos)
+ }
+ }
+
+ /**
+ *
+ * @return map of used jar file -> representative position in file where
+ * it was used
+ */
+ private def findUsedJarsAndPositions: Map[AbstractFile, global.Position] = {
+ settings.dependencyTrackingMethod match {
+ case DependencyTrackingMethod.HighLevel =>
+ new HighLevelCrawlUsedJarFinder(global).findUsedJars
+ case DependencyTrackingMethod.Ast =>
+ new AstUsedJarFinder(global).findUsedJars
}
- jars.toSet
}
}
diff --git a/third_party/dependency_analyzer/src/main/io/bazel/rulesscala/dependencyanalyzer/DependencyAnalyzerSettings.scala b/third_party/dependency_analyzer/src/main/io/bazel/rulesscala/dependencyanalyzer/DependencyAnalyzerSettings.scala
new file mode 100644
index 000000000..af92abd5b
--- /dev/null
+++ b/third_party/dependency_analyzer/src/main/io/bazel/rulesscala/dependencyanalyzer/DependencyAnalyzerSettings.scala
@@ -0,0 +1,121 @@
+package third_party.dependency_analyzer.src.main.io.bazel.rulesscala.dependencyanalyzer
+
+object AnalyzerMode {
+ case object Error extends AnalyzerMode
+ case object Warn extends AnalyzerMode
+ case object Off extends AnalyzerMode
+
+ def parse(mode: String): Option[AnalyzerMode] = {
+ mode match {
+ case "error" => Some(Error)
+ case "warn" => Some(Warn)
+ case "off" => Some(Off)
+ case _ => None
+ }
+ }
+}
+
+sealed trait AnalyzerMode
+
+object DependencyTrackingMethod {
+ case object HighLevel extends DependencyTrackingMethod("high-level")
+
+ /**
+ * Discovers dependencies by crawling the AST.
+ */
+ case object Ast extends DependencyTrackingMethod("ast")
+
+ def parse(mode: String): Option[DependencyTrackingMethod] = {
+ Seq(HighLevel, Ast).find(_.name == mode)
+ }
+}
+
+sealed abstract class DependencyTrackingMethod(val name: String)
+
+class TargetSet(
+ prefix: String,
+ jarsSeq: Seq[String],
+ targetsSeq: Seq[String]
+) {
+ private lazy val jarToTargetMap: Map[String, String] = {
+ require(targetsSeq.size == jarsSeq.size, s"Arguments $prefix-jars and $prefix-targets had mismatched size")
+
+ jarsSeq.zip(targetsSeq).toMap
+ }
+
+ def targetFromJarOpt(jar: String): Option[String] = {
+ jarToTargetMap.get(jar)
+ }
+
+ lazy val jarSet: Set[String] = {
+ jarsSeq.toSet
+ }
+}
+
+object DependencyAnalyzerSettings {
+ def parseSettings(
+ options: List[String],
+ error: String => Unit
+ ): DependencyAnalyzerSettings = {
+
+ val optionsParser = OptionsParser.create(options, error)
+
+ def decodeTarget(target: String): String = {
+ target.replace(";", ":")
+ }
+
+ def parseTargetSet(prefix: String): TargetSet = {
+ new TargetSet(
+ prefix = prefix,
+ jarsSeq = optionsParser.takeStringSeqOpt(s"$prefix-jars").getOrElse(Seq.empty),
+ targetsSeq = optionsParser.takeStringSeqOpt(s"$prefix-targets").map(_.map(decodeTarget)).getOrElse(Seq.empty)
+ )
+ }
+
+ def extractAnalyzerMode(key: String): AnalyzerMode = {
+ optionsParser
+ .takeStringOpt(key)
+ .map { str =>
+ AnalyzerMode.parse(str).getOrElse {
+ error(s"Failed to parse option $key with value $str")
+ AnalyzerMode.Error
+ }
+ }
+ .getOrElse(AnalyzerMode.Off)
+ }
+
+ val settings =
+ DependencyAnalyzerSettings(
+ currentTarget = decodeTarget(optionsParser.takeString("current-target")),
+ dependencyTrackingMethod =
+ DependencyTrackingMethod
+ .parse(optionsParser.takeString("dependency-tracking-method"))
+ .getOrElse {
+ error("Failed to parse option dependency-tracking-method")
+ DependencyTrackingMethod.HighLevel
+ },
+ indirectTargetSet = parseTargetSet("indirect"),
+ directTargetSet = parseTargetSet("direct"),
+ unusedDepsMode = extractAnalyzerMode("unused-deps-mode"),
+ strictDepsMode = extractAnalyzerMode("strict-deps-mode"),
+ ignoredUnusedDependencyTargets =
+ optionsParser
+ .takeStringSeqOpt(s"unused-deps-ignored-targets")
+ .getOrElse(Seq.empty)
+ .map(decodeTarget)
+ .toSet
+ )
+ optionsParser.failOnUnparsedOptions()
+ settings
+ }
+}
+
+case class DependencyAnalyzerSettings(
+ indirectTargetSet: TargetSet,
+ directTargetSet: TargetSet,
+ currentTarget: String,
+ dependencyTrackingMethod: DependencyTrackingMethod,
+ unusedDepsMode: AnalyzerMode,
+ strictDepsMode: AnalyzerMode,
+ ignoredUnusedDependencyTargets: Set[String]
+)
diff --git a/third_party/dependency_analyzer/src/main/io/bazel/rulesscala/dependencyanalyzer/HighLevelCrawlUsedJarFinder.scala b/third_party/dependency_analyzer/src/main/io/bazel/rulesscala/dependencyanalyzer/HighLevelCrawlUsedJarFinder.scala
new file mode 100644
index 000000000..18e8ae2cd
--- /dev/null
+++ b/third_party/dependency_analyzer/src/main/io/bazel/rulesscala/dependencyanalyzer/HighLevelCrawlUsedJarFinder.scala
@@ -0,0 +1,39 @@
+package third_party.dependency_analyzer.src.main.io.bazel.rulesscala.dependencyanalyzer
+
+import scala.reflect.io.AbstractFile
+import scala.tools.nsc.Global
+
+class HighLevelCrawlUsedJarFinder(
+ global: Global
+) {
+ import global.Symbol
+
+ def findUsedJars: Map[AbstractFile, Global#Position] = {
+ val jars = collection.mutable.Set[AbstractFile]()
+
+ global.exitingTyper {
+ walkTopLevels(global.RootClass, jars)
+ }
+ jars.map(jar => jar -> global.NoPosition).toMap
+ }
+
+ private def walkTopLevels(root: Symbol, jars: collection.mutable.Set[AbstractFile]): Unit = {
+ def safeInfo(sym: Symbol): global.Type =
+ if (sym.hasRawInfo && sym.rawInfo.isComplete) sym.info else global.NoType
+
+ def packageClassOrSelf(sym: Symbol): Symbol =
+ if (sym.hasPackageFlag && !sym.isModuleClass) sym.moduleClass else sym
+
+ for (x <- safeInfo(packageClassOrSelf(root)).decls) {
+ if (x == root) ()
+ else if (x.hasPackageFlag) walkTopLevels(x, jars)
+ else if (x.owner != root) { // exclude package class members
+ if (x.hasRawInfo && x.rawInfo.isComplete) {
+ val assocFile = x.associatedFile
+ if (assocFile.path.endsWith(".class") && assocFile.underlyingSource.isDefined)
+ assocFile.underlyingSource.foreach(jars += _)
+ }
+ }
+ }
+ }
+}
diff --git a/third_party/dependency_analyzer/src/main/io/bazel/rulesscala/dependencyanalyzer/OptionsParser.scala b/third_party/dependency_analyzer/src/main/io/bazel/rulesscala/dependencyanalyzer/OptionsParser.scala
new file mode 100644
index 000000000..f36c93ca1
--- /dev/null
+++ b/third_party/dependency_analyzer/src/main/io/bazel/rulesscala/dependencyanalyzer/OptionsParser.scala
@@ -0,0 +1,51 @@
+package third_party.dependency_analyzer.src.main.io.bazel.rulesscala.dependencyanalyzer
+
+import scala.collection.mutable
+
+object OptionsParser {
+ def create(
+ options: List[String],
+ error: String => Unit
+ ): OptionsParser = {
+ val optionsMap = mutable.Map[String, String]()
+ options.foreach { option =>
+ option.split(":", 2) match {
+ case Array(key) =>
+ error(s"Argument $key missing value")
+ case Array(key, value) =>
+ if (optionsMap.contains(key)) {
+ error(s"Argument $key found multiple times")
+ }
+ optionsMap.put(key, value)
+ }
+ }
+
+ new OptionsParser(error = error, options = optionsMap)
+ }
+}
+
+class OptionsParser private(
+ error: String => Unit,
+ options: mutable.Map[String, String]
+) {
+ def failOnUnparsedOptions(): Unit = {
+ options.keys.foreach { key =>
+ error(s"Unrecognized option $key")
+ }
+ }
+
+ def takeStringOpt(key: String): Option[String] = {
+ options.remove(key)
+ }
+
+ def takeString(key: String): String = {
+ takeStringOpt(key).getOrElse {
+ error(s"Missing required option $key")
+ "NA"
+ }
+ }
+
+ def takeStringSeqOpt(key: String): Option[Seq[String]] = {
+ takeStringOpt(key).map(_.split(":"))
+ }
+}
diff --git a/third_party/dependency_analyzer/src/main/io/bazel/rulesscala/dependencyanalyzer/ScalaVersion.scala b/third_party/dependency_analyzer/src/main/io/bazel/rulesscala/dependencyanalyzer/ScalaVersion.scala
new file mode 100644
index 000000000..e7be56c5a
--- /dev/null
+++ b/third_party/dependency_analyzer/src/main/io/bazel/rulesscala/dependencyanalyzer/ScalaVersion.scala
@@ -0,0 +1,158 @@
+package third_party.dependency_analyzer.src.main.io.bazel.rulesscala.dependencyanalyzer
+
+import scala.language.experimental.macros
+import scala.reflect.macros.blackbox
+
+object ScalaVersion {
+ val Current: ScalaVersion = ScalaVersion(util.Properties.versionNumberString)
+
+ def apply(versionString: String): ScalaVersion = {
+ versionString.split("\\.") match {
+ case Array(superMajor, major, minor) =>
+ new ScalaVersion(superMajor.toInt, major.toInt, minor.toInt)
+ case _ =>
+ throw new Exception(s"Failed to parse version $versionString")
+ }
+ }
+
+ /**
+ * Runs [code] only if minVersion and maxVersion constraints are met.
+ *
+ * NOTE: This method should be used only rarely. Most of the time
+ * just comparing versions in code should be enough. This is needed
+ * only when the code we want to run can't compile under certain
+ * versions. The reason to use this rarely is the API's inflexibility
+ * and the difficulty in debugging this code.
+ *
+ * Each of minVersionOpt and maxVersionOpt can either be None
+ * to signify that there is no restriction on this bound,
+ * or it can be a string of a full version number such as "2.12.10".
+ *
+ * When set to a version number, the bounds are inclusive.
+ * For example, a maxVersion of "2.12.10" will accept version "2.12.10".
+ *
+ * Note only literal strings are accepted and inlined variables are accepted.
+ * If any non-inlined variables are passed the code will fail to compile.
+ * Inlined variables are generally those declared final on an object which
+ * do not have a type attached.
+ *
+ * valid:
+ * conditional(Some("2.12.4"), None, "foo()")
+ * invalid:
+ * conditional(MinVersionForFoo, None, "foo()")
+ */
+ def conditional(
+ minVersionOpt: Option[String],
+ maxVersionOpt: Option[String],
+ code: String
+ ): Unit =
+ macro conditionalImpl
+
+ def conditionalImpl(
+ c: blackbox.Context
+ )(
+ minVersionOpt: c.Expr[Option[String]],
+ maxVersionOpt: c.Expr[Option[String]],
+ code: c.Expr[String]
+ ): c.Tree = {
+ import c.{universe => u}
+
+ // Due to non-deterministic code generation of quasiquotes, we do
+ // not use them
+ // See https://github.com/scala/bug/issues/11008
+ // Eventually once we stop supporting all versions which don't have
+ // the bugfix, we can use quasiquotes as desired
+
+ def extractStringFromTree(tree: c.Tree): Option[String] = {
+ tree match {
+ case u.Literal(u.Constant(s: String)) =>
+ Some(s)
+ case _ =>
+ None
+ }
+ }
+
+ def extractStringOption(expr: c.Expr[Option[String]]): Option[String] = {
+ expr.tree match {
+ case u.Apply(
+ u.TypeApply(
+ u.Select(u.Select(u.Ident(u.TermName("scala")), u.TermName("Some")), u.TermName("apply")),
+ List(u.TypeTree())),
+ str :: Nil
+ ) if extractStringFromTree(str).nonEmpty =>
+ extractStringFromTree(str)
+ case u.Select(u.Ident(u.TermName("scala")), u.TermName("None")) =>
+ None
+ case _ =>
+ c.error(
+ expr.tree.pos,
+ "Parameter must be passed as an Option[String] literal such as " +
+ "Some(\"2.12.10\") or None")
+ None
+ }
+ }
+
+ def extractString(expr: c.Expr[String]): String = {
+ extractStringFromTree(expr.tree).getOrElse {
+ c.error(
+ expr.tree.pos,
+ "Parameter must be passed as a string literal such as \"2.12.10\"")
+ ""
+ }
+ }
+
+ val meetsMinVersionRequirement = {
+ val minVersionOptValue = extractStringOption(minVersionOpt)
+
+ // Note: Unit tests do not test that this bound is inclusive rather
+ // than exclusive so be careful when changing this code not to
+ // accidentally make this an exclusive bound (see ScalaVersionTest for
+ // details)
+ minVersionOptValue.forall(version => Current >= ScalaVersion(version))
+ }
+
+ val meetsMaxVersionRequirement = {
+ val maxVersionOptValue = extractStringOption(maxVersionOpt)
+ // Note: Unit tests do not test that this bound is inclusive rather
+ // than exclusive so be careful when changing this code not to
+ // accidentally make this an exclusive bound (see ScalaVersionTest for
+ // details)
+ maxVersionOptValue.forall(version => Current <= ScalaVersion(version))
+ }
+
+ if (meetsMinVersionRequirement && meetsMaxVersionRequirement) {
+ c.parse(extractString(code))
+ } else {
+ u.EmptyTree
+ }
+ }
+}
+
+class ScalaVersion private(
+ private val superMajor: Int,
+ private val major: Int,
+ private val minor: Int
+) extends Ordered[ScalaVersion] {
+ override def compare(that: ScalaVersion): Int = {
+ if (this.superMajor != that.superMajor) {
+ this.superMajor.compareTo(that.superMajor)
+ } else if (this.major != that.major) {
+ this.major.compareTo(that.major)
+ } else {
+ this.minor.compareTo(that.minor)
+ }
+ }
+
+ override def equals(obj: Any): Boolean = {
+ obj match {
+ case that: ScalaVersion =>
+ compare(that) == 0
+ case _ =>
+ false
+ }
+ }
+
+ override def toString: String = {
+ s"$superMajor.$major.$minor"
+ }
+}
diff --git a/third_party/dependency_analyzer/src/test/BUILD b/third_party/dependency_analyzer/src/test/BUILD
index 0b279289b..51aa24242 100644
--- a/third_party/dependency_analyzer/src/test/BUILD
+++ b/third_party/dependency_analyzer/src/test/BUILD
@@ -2,19 +2,71 @@ licenses(["notice"]) # 3-clause BSD
load("//scala:scala.bzl", "scala_junit_test", "scala_test")
-scala_junit_test(
- name = "dependency_analyzer_test",
+common_jvm_flags = [
+ "-Dplugin.jar.location=$(location //third_party/dependency_analyzer/src/main:dependency_analyzer)",
+ "-Dscala.library.location=$(location //external:io_bazel_rules_scala/dependency/scala/scala_library)",
+ "-Dscala.reflect.location=$(location //external:io_bazel_rules_scala/dependency/scala/scala_reflect)",
+]
+
+scala_test(
+ name = "ast_used_jar_finder_test",
+ size = "small",
+ srcs = [
+ "io/bazel/rulesscala/dependencyanalyzer/AstUsedJarFinderTest.scala",
+ ],
+ jvm_flags = common_jvm_flags,
+ deps = [
+ "//external:io_bazel_rules_scala/dependency/scala/scala_compiler",
+ "//external:io_bazel_rules_scala/dependency/scala/scala_library",
+ "//external:io_bazel_rules_scala/dependency/scala/scala_reflect",
+ "//third_party/dependency_analyzer/src/main:dependency_analyzer",
+ "//third_party/dependency_analyzer/src/main:scala_version",
+ "//third_party/utils/src/test:test_util",
+ "@scalac_rules_commons_io//jar",
+ ],
+)
+
+scala_test(
+ name = "scala_version_test",
size = "small",
srcs = [
- "io/bazel/rulesscala/dependencyanalyzer/DependencyAnalyzerTest.scala",
+ "io/bazel/rulesscala/dependencyanalyzer/ScalaVersionTest.scala",
],
- jvm_flags = [
- "-Dplugin.jar.location=$(location //third_party/dependency_analyzer/src/main:dependency_analyzer)",
- "-Dscala.library.location=$(location //external:io_bazel_rules_scala/dependency/scala/scala_library)",
+ deps = [
+ "//external:io_bazel_rules_scala/dependency/scala/scala_library",
+ "//external:io_bazel_rules_scala/dependency/scala/scala_reflect",
+ "//third_party/dependency_analyzer/src/main:scala_version",
+ ],
+)
+
+scala_test(
+ name = "scalac_dependency_test",
+ size = "small",
+ srcs = [
+ "io/bazel/rulesscala/dependencyanalyzer/ScalacDependencyTest.scala",
+ ],
+ jvm_flags = common_jvm_flags,
+ unused_dependency_checker_mode = "off",
+ deps = [
+ "//external:io_bazel_rules_scala/dependency/scala/scala_compiler",
+ "//external:io_bazel_rules_scala/dependency/scala/scala_library",
+ "//external:io_bazel_rules_scala/dependency/scala/scala_reflect",
+ "//third_party/dependency_analyzer/src/main:dependency_analyzer",
+ "//third_party/utils/src/test:test_util",
+ "@scalac_rules_commons_io//jar",
+ ],
+)
+
+scala_test(
+ name = "strict_deps_test",
+ size = "small",
+ srcs = [
+ "io/bazel/rulesscala/dependencyanalyzer/StrictDepsTest.scala",
+ ],
+ jvm_flags = common_jvm_flags + [
"-Dguava.jar.location=$(location @com_google_guava_guava_21_0_with_file//jar)",
"-Dapache.commons.jar.location=$(location @org_apache_commons_commons_lang_3_5_without_file//:linkable_org_apache_commons_commons_lang_3_5_without_file)",
],
- suffixes = ["Test"],
unused_dependency_checker_mode = "off",
deps = [
"//external:io_bazel_rules_scala/dependency/scala/scala_compiler",
@@ -26,3 +78,23 @@ scala_junit_test(
"@org_apache_commons_commons_lang_3_5_without_file//:linkable_org_apache_commons_commons_lang_3_5_without_file",
],
)
+
+scala_test(
+ name = "unused_dependency_checker_test",
+ size = "small",
+ srcs = [
+ "io/bazel/rulesscala/dependencyanalyzer/UnusedDependencyCheckerTest.scala",
+ ],
+ jvm_flags = common_jvm_flags + [
+ "-Dapache.commons.jar.location=$(location @org_apache_commons_commons_lang_3_5_without_file//:linkable_org_apache_commons_commons_lang_3_5_without_file)",
+ ],
+ unused_dependency_checker_mode = "off",
+ deps = [
+ "//external:io_bazel_rules_scala/dependency/scala/scala_compiler",
+ "//external:io_bazel_rules_scala/dependency/scala/scala_library",
+ "//external:io_bazel_rules_scala/dependency/scala/scala_reflect",
+ "//third_party/dependency_analyzer/src/main:dependency_analyzer",
+ "//third_party/utils/src/test:test_util",
+ "@org_apache_commons_commons_lang_3_5_without_file//:linkable_org_apache_commons_commons_lang_3_5_without_file",
+ ],
+)
diff --git a/third_party/dependency_analyzer/src/test/io/bazel/rulesscala/dependencyanalyzer/AstUsedJarFinderTest.scala b/third_party/dependency_analyzer/src/test/io/bazel/rulesscala/dependencyanalyzer/AstUsedJarFinderTest.scala
new file mode 100644
index 000000000..e63534faa
--- /dev/null
+++ b/third_party/dependency_analyzer/src/test/io/bazel/rulesscala/dependencyanalyzer/AstUsedJarFinderTest.scala
@@ -0,0 +1,613 @@
+package third_party.dependency_analyzer.src.test.io.bazel.rulesscala.dependencyanalyzer
+
+import java.nio.file.Files
+import java.nio.file.Path
+import org.apache.commons.io.FileUtils
+import org.scalatest._
+import scala.tools.nsc.reporters.StoreReporter
+import third_party.dependency_analyzer.src.main.io.bazel.rulesscala.dependencyanalyzer.DependencyTrackingMethod
+import third_party.dependency_analyzer.src.main.io.bazel.rulesscala.dependencyanalyzer.ScalaVersion
+import third_party.utils.src.test.io.bazel.rulesscala.utils.JavaCompileUtil
+import third_party.utils.src.test.io.bazel.rulesscala.utils.TestUtil
+import third_party.utils.src.test.io.bazel.rulesscala.utils.TestUtil.DependencyAnalyzerTestParams
+
+// NOTE: Some tests are version-dependent as some false positives
+// cannot be fixed in older versions of Scala for various reasons.
+// Hence make sure to look at any version checks to understand
+// which versions do and don't support which cases.
+class AstUsedJarFinderTest extends FunSuite {
+ private def withSandbox(action: Sandbox => Unit): Unit = {
+ val tmpDir = Files.createTempDirectory("dependency_analyzer_test_temp")
+ val file = tmpDir.toFile
+ try {
+ action(new Sandbox(tmpDir))
+ } finally {
+ FileUtils.deleteDirectory(file)
+ }
+ }
+
+ private class Sandbox(tmpDir: Path) {
+ def compileWithoutAnalyzer(
+ code: String
+ ): Unit = {
+ val errors =
+ TestUtil.runCompiler(
+ code = code,
+ extraClasspath = List(tmpDir.toString),
+ outputPathOpt = Some(tmpDir)
+ )
+ assert(errors.isEmpty)
+ }
+
+ def compileJava(
+ className: String,
+ code: String
+ ): Unit = {
+ JavaCompileUtil.compile(
+ tmpDir = tmpDir.toString,
+ className = className,
+ code = code
+ )
+ }
+
+ private def verifyAndConvertDepToClass(dep: String): String = {
+ val classPath = tmpDir.resolve(s"$dep.class")
+ // Make sure the dep refers to a real file
+ assert(classPath.toFile.isFile)
+ classPath.toString
+ }
+
+ def checkStrictDepsErrorsReported(
+ code: String,
+ expectedStrictDeps: List[String]
+ ): List[StoreReporter#Info] = {
+ val errors =
+ TestUtil.runCompiler(
+ code = code,
+ extraClasspath = List(tmpDir.toString),
+ dependencyAnalyzerParamsOpt =
+ Some(
+ DependencyAnalyzerTestParams(
+ indirectJars = expectedStrictDeps.map(verifyAndConvertDepToClass),
+ indirectTargets = expectedStrictDeps,
+ strictDeps = true,
+ dependencyTrackingMethod = DependencyTrackingMethod.Ast
+ )
+ )
+ )
+
+ assert(errors.size == expectedStrictDeps.size)
+ errors.foreach { err =>
+ // We should be emitting errors with positions
+ assert(err.pos.isDefined)
+ }
+
+ expectedStrictDeps.foreach { dep =>
+ val expectedError = s"Target '$dep' is used but isn't explicitly declared, please add it to the deps"
+ assert(errors.exists(_.msg.contains(expectedError)))
+ }
+
+ errors
+ }
+
+ def checkUnusedDepsErrorReported(
+ code: String,
+ expectedUnusedDeps: List[String]
+ ): Unit = {
+ val errors =
+ TestUtil.runCompiler(
+ code = code,
+ extraClasspath = List(tmpDir.toString),
+ dependencyAnalyzerParamsOpt =
+ Some(
+ DependencyAnalyzerTestParams(
+ directJars = expectedUnusedDeps.map(verifyAndConvertDepToClass),
+ directTargets = expectedUnusedDeps,
+ unusedDeps = true,
+ dependencyTrackingMethod = DependencyTrackingMethod.Ast
+ )
+ )
+ )
+
+ assert(errors.size == expectedUnusedDeps.size)
+ errors.foreach { err =>
+ // As an unused dep we shouldn't include a position or anything like that
+ assert(!err.pos.isDefined)
+ }
+
+ expectedUnusedDeps.foreach { dep =>
+ val expectedError = s"Target '$dep' is specified as a dependency to ${TestUtil.defaultTarget} but isn't used, please remove it from the deps."
+ assert(errors.exists(_.msg.contains(expectedError)))
+ }
+ }
+ }
+
+ /**
+ * In a situation where B depends on A directly, ensure that the
+ * dependency analyzer recognizes this fact.
+ */
+ private def checkDirectDependencyRecognized(
+ aCode: String,
+ bCode: String
+ ): Unit = {
+ withSandbox { sandbox =>
+ sandbox.compileWithoutAnalyzer(aCode)
+ sandbox.checkStrictDepsErrorsReported(
+ code = bCode,
+ expectedStrictDeps = List("A")
+ )
+ }
+ }
+
+ /**
+ * In a situation where C depends on both A and B directly, ensure
+ * that the dependency analyzer recognizes this fact.
+ */
+ private def checkDirectDependencyRecognized(
+ aCode: String,
+ bCode: String,
+ cCode: String
+ ): Unit = {
+ withSandbox { sandbox =>
+ sandbox.compileWithoutAnalyzer(aCode)
+ sandbox.compileWithoutAnalyzer(bCode)
+ sandbox.checkStrictDepsErrorsReported(
+ code = cCode,
+ expectedStrictDeps = List("A", "B")
+ )
+ }
+ }
+
+ /**
+ * In a situation where C depends directly on B but not on A, ensure
+ * that the dependency analyzer recognizes this fact.
+ */
+ private def checkIndirectDependencyDetected(
+ aCode: String,
+ bCode: String,
+ cCode: String
+ ): Unit = {
+ withSandbox { sandbox =>
+ sandbox.compileWithoutAnalyzer(aCode)
+ sandbox.compileWithoutAnalyzer(bCode)
+ sandbox.checkUnusedDepsErrorReported(
+ code = cCode,
+ expectedUnusedDeps = List("A")
+ )
+ }
+ }
+
+ /**
+ * In a situation where B depends indirectly on A, ensure
+ * that the dependency analyzer recognizes this fact.
+ */
+ private def checkIndirectDependencyDetected(
+ aCode: String,
+ bCode: String
+ ): Unit = {
+ withSandbox { sandbox =>
+ sandbox.compileWithoutAnalyzer(aCode)
+ sandbox.checkUnusedDepsErrorReported(
+ code = bCode,
+ expectedUnusedDeps = List("A")
+ )
+ }
+ }
+
+ test("simple composition in indirect") {
+ checkIndirectDependencyDetected(
+ aCode =
+ """
+ |class A
+ |""".stripMargin,
+ bCode =
+ """
+ |class B(a: A)
+ |""".stripMargin,
+ cCode =
+ """
+ |class C(b: B)
+ |""".stripMargin
+ )
+ }
+
+ test("method call argument is direct") {
+ checkDirectDependencyRecognized(
+ aCode =
+ """
+ |class A
+ |""".stripMargin,
+ bCode =
+ """
+ |class B {
+ | def foo(a: A = new A()): Unit = {}
+ |}
+ |""".stripMargin,
+ cCode =
+ """
+ |class C {
+ | def bar(): Unit = {
+ | new B().foo(new A())
+ | }
+ |}
+ |""".stripMargin
+ )
+ }
+
+ test("class ctor arg type parameter is direct") {
+ checkDirectDependencyRecognized(
+ aCode =
+ s"""
+ |class A(
+ |)
+ |""".stripMargin,
+ bCode =
+ s"""
+ |class B(
+ | a: Option[A]
+ |)
+ |""".stripMargin
+ )
+ }
+
+ test("class static annotation is direct") {
+ checkDirectDependencyRecognized(
+ aCode =
+ s"""
+ |class A(
+ |) extends scala.annotation.StaticAnnotation
+ |""".stripMargin,
+ bCode =
+ s"""
+ |@A
+ |class B(
+ |)
+ |""".stripMargin
+ )
+ }
+
+ test("class annotation is direct") {
+ checkDirectDependencyRecognized(
+ aCode =
+ s"""
+ |class A(
+ |)
+ |""".stripMargin,
+ bCode =
+ s"""
+ |@A
+ |class B(
+ |)
+ |""".stripMargin
+ )
+ }
+
+ test("method annotation is direct") {
+ checkDirectDependencyRecognized(
+ aCode =
+ s"""
+ |class A(
+ |)
+ |""".stripMargin,
+ bCode =
+ s"""
+ |class B {
+ | @A
+ | def foo(): Unit = {
+ | }
+ |}
+ |""".stripMargin
+ )
+ }
+
+ test("static annotation of inherited class is indirect") {
+ checkIndirectDependencyDetected(
+ aCode = "class A extends scala.annotation.StaticAnnotation",
+ bCode = "@A class B",
+ cCode = "class C extends B"
+ )
+ }
+
+ test("class type parameter bound is direct") {
+ checkDirectDependencyRecognized(
+ aCode =
+ s"""
+ |class A(
+ |)
+ |""".stripMargin,
+ bCode =
+ s"""
+ |class B[T <: A](
+ |)
+ |""".stripMargin
+ )
+ }
+
+ test("classOf is direct") {
+ checkDirectDependencyRecognized(
+ aCode =
+ s"""
+ |class A(
+ |)
+ |""".stripMargin,
+ bCode =
+ s"""
+ |class B(
+ |) {
+ | val x: Class[_] = classOf[A]
+ |}
+ |""".stripMargin
+ )
+ }
+
+ test("classOf in class annotation is direct") {
+ checkDirectDependencyRecognized(
+ aCode = "class A",
+ bCode = "class B(a: Any)",
+ cCode =
+ s"""
+ |@B(classOf[A])
+ |class C
+ |""".stripMargin
+ )
+ }
+
+ test("inlined literal is direct") {
+ // Note: For a constant to be inlined
+ // - it must not have a type declaration such as `: Int`.
+ // (this appears to be the case in practice at least)
+ // (is this documented anywhere???)
+ // - some claim it must start with a capital letter, though
+ // this does not seem to be the case. Nevertheless we do that
+ // anyways.
+ //
+ // Hence it is possible that as newer versions of scala
+ // are released then this test may need to be updated to
+ // conform to changing requirements of what is inlined.
+
+ // Note that in versions of scala < 2.12.4 we cannot detect
+ // such a situation. Hence we will have a false positive here
+ // for those older versions, which we verify in test.
+
+ val aCode =
+ s"""
+ |object A {
+ | final val Inlined = 123
+ |}
+ |""".stripMargin
+ val bCode =
+ s"""
+ |object B {
+ | val d: Int = A.Inlined
+ |}
+ |""".stripMargin
+
+ if (ScalaVersion.Current >= ScalaVersion("2.12.4")) {
+ checkDirectDependencyRecognized(aCode = aCode, bCode = bCode)
+ } else {
+ checkIndirectDependencyDetected(aCode = aCode, bCode = bCode)
+ }
+ }
+
+ test("unspecified default argument type is indirect") {
+ checkIndirectDependencyDetected(
+ aCode = "class A",
+ bCode = "class B(a: A = new A())",
+ cCode =
+ s"""
+ |class C {
+ | new B()
+ |}
+ |""".stripMargin
+ )
+ }
+
+ test("macro is direct") {
+ checkDirectDependencyRecognized(
+ aCode =
+ s"""
+ |import scala.language.experimental.macros
+ |import scala.reflect.macros.blackbox.Context
+ |
+ |object A {
+ | def foo(): Unit = macro fooImpl
+ | def fooImpl(
+ | c: Context
+ | )(): c.universe.Tree = {
+ | import c.universe._
+ | q""
+ | }
+ |}
+ |""".stripMargin,
+ bCode =
+ s"""
+ |object B {
+ | A.foo()
+ |}
+ |""".stripMargin
+ )
+ }
+
+ test("imports are complicated") {
+ // This test documents the behavior of imports as is currently.
+ // Ideally all imports would be direct dependencies. However there
+ // are complications. The main one being that the scala AST treats
+ // imports as (expr, selectors) where in e.g. `import a.b.{c, d}`
+ // expr=`a.b` and selectors=[c, d]. (Note selectors are always formed
+ // from the last part of the import).
+ // And only the expr part has type information attached. In order
+ // to gather type information from the selector, we would need to
+ // do some resolution of types, which is possible but probably complex.
+ // Note also that fixing this is probably less of a priority, as
+ // people who want to check unused deps generally also want to check
+ // unused imports, so they wouldn't run into these problems in the
+ // first place.
+
+ def testImport(importString: String, isDirect: Boolean): Unit = {
+ withSandbox { sandbox =>
+ sandbox.compileWithoutAnalyzer(
+ s"""
+ |package foo.bar
+ |
+ |object A { val i: Int = 0 }
+ |""".stripMargin
+ )
+
+ val bCode =
+ s"""
+ |import $importString
+ |
+ |class B
+ |""".stripMargin
+ val dep = "foo/bar/A"
+
+ if (isDirect) {
+ sandbox.checkStrictDepsErrorsReported(
+ code = bCode,
+ expectedStrictDeps = List(dep)
+ )
+ } else {
+ sandbox.checkUnusedDepsErrorReported(
+ code = bCode,
+ expectedUnusedDeps = List(dep)
+ )
+ }
+ }
+ }
+
+ // In this case, expr=foo.bar.A and selectors=[i], so looking at expr does
+ // give us a type.
+ testImport("foo.bar.A.i", isDirect = true)
+
+ // In this case expr=foo.bar and selectors=[A], so expr does not have
+ // a type which corresponds with A.
+ testImport("foo.bar.A", isDirect = false)
+
+ // In this case expr=foo and selectors=[bar], so expr does not have
+ // a type which corresponds with A.
+ testImport("foo.bar", isDirect = false)
+
+ // In this case expr=foo.bar and selectors=[_], so expr does not have
+ // a type which corresponds with A.
+ testImport("foo.bar._", isDirect = false)
+ }
+
+ test("java interface method argument is direct") {
+ withSandbox { sandbox =>
+ sandbox.compileJava(
+ className = "B",
+ code = "public interface B { }"
+ )
+ sandbox.checkStrictDepsErrorsReported(
+ """
+ |class C {
+ | def foo(x: B): Unit = {}
+ |}
+ |""".stripMargin,
+ expectedStrictDeps = List("B")
+ )
+ }
+ }
+
+ test("java interface field and method is direct") {
+ withSandbox { sandbox =>
+ sandbox.compileJava(
+ className = "A",
+ code = "public interface A { int a = 42; }"
+ )
+ val bCode =
+ """
+ |class B {
+ | def foo(x: A): Unit = {}
+ | val b = A.a
+ |}
+ |""".stripMargin
+
+ // Unlike other tests, this one includes both access to an inlined
+ // variable and taking the class A as an argument. In theory,
+ // this test should work for all supported versions just like
+ // test `java interface method argument is direct` since they
+ // both have a method taking A as an argument.
+ //
+ // However, it does not work for all versions. It is unclear why but
+ // presumably there were various compiler improvements.
+ if (ScalaVersion.Current >= ScalaVersion("2.12.0")) {
+ sandbox.checkStrictDepsErrorsReported(
+ bCode,
+ expectedStrictDeps = List("A")
+ )
+ } else {
+ sandbox.checkUnusedDepsErrorReported(
+ bCode,
+ expectedUnusedDeps = List("A")
+ )
+ }
+ }
+ }
+
+ test("java interface field is direct") {
+ withSandbox { sandbox =>
+ sandbox.compileJava(
+ className = "A",
+ code = "public interface A { int a = 42; }"
+ )
+ val bCode =
+ """
+ |class B {
+ | val b = A.a
+ |}
+ |""".stripMargin
+ if (ScalaVersion.Current >= ScalaVersion("2.12.4")) {
+ sandbox.checkStrictDepsErrorsReported(
+ bCode,
+ expectedStrictDeps = List("A")
+ )
+ } else {
+ sandbox.checkUnusedDepsErrorReported(
+ bCode,
+ expectedUnusedDeps = List("A")
+ )
+ }
+ }
+ }
+
+ test("classOf in class Java annotation is direct") {
+ withSandbox { sandbox =>
+ sandbox.compileJava(
+ className = "Category",
+ code =
+ s"""
+ |public @interface Category {
+ | Class value();
+ |}
+ |""".stripMargin
+ )
+ sandbox.compileWithoutAnalyzer("class UnitTests")
+ sandbox.checkStrictDepsErrorsReported(
+ """
+ |@Category(classOf[UnitTests])
+ |class C
+ |""".stripMargin,
+ expectedStrictDeps = List("UnitTests", "Category")
+ )
+ }
+ }
+
+ test("position of strict deps error is correct") {
+ // While we do ensure that generally strict deps errors have
+ // a position in the other tests, here we make sure that that
+ // position is correctly computed.
+ withSandbox { sandbox =>
+ sandbox.compileWithoutAnalyzer("class A")
+ val errors =
+ sandbox.checkStrictDepsErrorsReported(
+ "class B(a: A)",
+ expectedStrictDeps = List("A")
+ )
+ assert(errors.size == 1)
+ val pos = errors(0).pos
+ assert(pos.line == 1)
+ assert(pos.column == 12)
+ }
+ }
+}
diff --git a/third_party/dependency_analyzer/src/test/io/bazel/rulesscala/dependencyanalyzer/ScalaVersionTest.scala b/third_party/dependency_analyzer/src/test/io/bazel/rulesscala/dependencyanalyzer/ScalaVersionTest.scala
new file mode 100644
index 000000000..c3d46075c
--- /dev/null
+++ b/third_party/dependency_analyzer/src/test/io/bazel/rulesscala/dependencyanalyzer/ScalaVersionTest.scala
@@ -0,0 +1,146 @@
+package third_party.dependency_analyzer.src.test.io.bazel.rulesscala.dependencyanalyzer
+
+import org.scalatest._
+import third_party.dependency_analyzer.src.main.io.bazel.rulesscala.dependencyanalyzer.ScalaVersion
+
+class ScalaVersionTest extends FunSuite {
+ test("version comparison works") {
+ // Test that when a > b, all the comparisons are as expected
+ def testOrder(a: String, b: String): Unit = {
+ val va = ScalaVersion(a)
+ val vb = ScalaVersion(b)
+
+ assert(!(va == vb))
+ assert(va != vb)
+ assert(!(va < vb))
+ assert(!(va <= vb))
+ assert(va > vb)
+ assert(va >= vb)
+
+ assert(!(vb == va))
+ assert(vb != va)
+ assert(vb < va)
+ assert(vb <= va)
+ assert(!(vb > va))
+ assert(!(vb >= va))
+ }
+
+ def testEqual(a: String, b: String): Unit = {
+ val va = ScalaVersion(a)
+ val vb = ScalaVersion(b)
+
+ assert(va == vb)
+ assert(!(va != vb))
+ assert(!(va < vb))
+ assert(va <= vb)
+ assert(!(va > vb))
+ assert(va >= vb)
+ }
+
+ testEqual("1.1.1", "1.1.1")
+ testEqual("1.2.3", "1.2.3")
+ testEqual("30.20.10", "30.20.10")
+
+ testOrder("1.2.3", "1.0.0")
+ testOrder("1.2.1", "1.2.0")
+ testOrder("1.2.0", "1.1.9")
+ testOrder("2.12.12", "2.12.11")
+ testOrder("2.12.0", "2.1.50")
+ }
+
+ test("macro works") {
+ // These are rather duplicative unfortunately as the person
+ // who wrote the macro is not very smart
+
+ // We use versions like 1.0.0 and 500.0.0 so that even
+ // as versions of scala change the test won't need to be updated
+
+ // Note: this test unfortunately does not test that the min and max
+ // bounds are inclusive rather than exclusive, because this code has to
+ // compile across all supported scala versions and we can't get an
+ // inlineable constant with the version string. In theory there may
+ // be complex solutions such as making this a template file and
+ // inserting the version, but that seems rather overdifficult.
+ //
+ // As version-differing behavior should be tested in unit tests anyways,
+ // with their own version bounds checks, this seems an acceptable risk
+ // given the costs of fixing.
+
+ // No bounds
+ {
+ var hit = false
+ ScalaVersion.conditional(
+ None,
+ None,
+ "hit = true"
+ )
+ assert(hit)
+ }
+
+ // Min bounds hit
+ {
+ var hit = false
+ ScalaVersion.conditional(
+ Some("1.0.0"),
+ None,
+ "hit = true"
+ )
+ assert(hit)
+ }
+
+ // Min bounds not hit
+ {
+ var hit = false
+ ScalaVersion.conditional(
+ Some("500.0.0"),
+ None,
+ "hit = true"
+ )
+ assert(!hit)
+ }
+
+ // Max bounds hit
+ {
+ var hit = false
+ ScalaVersion.conditional(
+ None,
+ Some("500.0.0"),
+ "hit = true"
+ )
+ assert(hit)
+ }
+
+ // Max bounds not hit
+ {
+ var hit = false
+ ScalaVersion.conditional(
+ None,
+ Some("1.0.0"),
+ "hit = true"
+ )
+ assert(!hit)
+ }
+
+ // Min-max bound hit
+ {
+ var hit = false
+ ScalaVersion.conditional(
+ Some("1.0.0"),
+ Some("500.0.0"),
+ "hit = true"
+ )
+ assert(hit)
+ }
+
+ // Min-max bound not hit
+ {
+ var hit = false
+ ScalaVersion.conditional(
+ Some("500.0.0"),
+ Some("1000.0.0"),
+ "hit = true"
+ )
+ assert(!hit)
+ }
+ }
+}
diff --git a/third_party/dependency_analyzer/src/test/io/bazel/rulesscala/dependencyanalyzer/ScalacDependencyTest.scala b/third_party/dependency_analyzer/src/test/io/bazel/rulesscala/dependencyanalyzer/ScalacDependencyTest.scala
new file mode 100644
index 000000000..6126d9c2e
--- /dev/null
+++ b/third_party/dependency_analyzer/src/test/io/bazel/rulesscala/dependencyanalyzer/ScalacDependencyTest.scala
@@ -0,0 +1,109 @@
+package third_party.dependency_analyzer.src.test.io.bazel.rulesscala.dependencyanalyzer
+
+import java.nio.file.Files
+import java.nio.file.Path
+import java.util.UUID
+import org.apache.commons.io.FileUtils
+import org.scalatest._
+import third_party.utils.src.test.io.bazel.rulesscala.utils.JavaCompileUtil
+import third_party.utils.src.test.io.bazel.rulesscala.utils.TestUtil
+
+/**
+ * Test that the scalac compiler behaves how we expect it to around
+ * dependencies. That is, for given scenarios, we want to make sure
+ * that scalac requires the given set of dependencies; no more and
+ * no less.
+ *
+ * To clarify: these tests do not reflect the end result of strict/unused
+ * deps as we are considering alternatives of how to mitigate scalac's
+ * limitations.
+ */
+class ScalacDependencyTest extends FunSuite {
+ private def withSandbox(action: Sandbox => Unit): Unit = {
+ val tmpDir = Files.createTempDirectory("dependency_analyzer_test_temp")
+ val file = tmpDir.toFile
+ try {
+ action(new Sandbox(tmpDir))
+ } finally {
+ FileUtils.deleteDirectory(file)
+ }
+ }
+
+ private class Sandbox(tmpDir: Path) {
+ def compile(
+ code: String
+ ): Unit = {
+ val errors =
+ TestUtil.runCompiler(
+ code = code,
+ extraClasspath = List(tmpDir.toString),
+ outputPathOpt = Some(tmpDir)
+ )
+ assert(errors.isEmpty)
+ }
+
+ def compileJava(
+ className: String,
+ code: String
+ ): Unit = {
+ JavaCompileUtil.compile(
+ tmpDir = tmpDir.toString,
+ className = className,
+ code = code
+ )
+ }
+
+ def checkExactDepsNeeded(
+ code: String,
+ deps: List[String]
+ ): Unit = {
+ def doesCompileSucceed(usedDeps: List[String]): Boolean = {
+ val subdir = tmpDir.resolve(UUID.randomUUID().toString)
+ Files.createDirectory(subdir)
+ usedDeps.foreach { dep =>
+ val name = s"$dep.class"
+ Files.copy(tmpDir.resolve(name), subdir.resolve(name))
+ }
+ val errors =
+ TestUtil.runCompiler(
+ code = code,
+ extraClasspath = List(subdir.toString)
+ )
+ errors.isEmpty
+ }
+
+ assert(doesCompileSucceed(deps), s"Failed to compile with all deps")
+
+ deps.foreach { toSkip =>
+ val remaining = deps.filter(_ != toSkip)
+ // sanity check we removed exactly one item
+ assert(remaining.size + 1 == deps.size)
+ assert(
+ !doesCompileSucceed(remaining),
+ s"Compile succeeded even though $toSkip was missing")
+ }
+ }
+ }
+
+ test("static annotation of superclass not needed") {
+ withSandbox { sandbox =>
+ sandbox.compile("class A extends scala.annotation.StaticAnnotation")
+ sandbox.compile("@A class B")
+ sandbox.checkExactDepsNeeded(
+ code = "class C extends B",
+ deps = List("B")
+ )
+ }
+ }
+
+ test("superclass of superclass needed") {
+ withSandbox { sandbox =>
+ sandbox.compile("class A")
+ sandbox.compile("class B extends A")
+ sandbox.checkExactDepsNeeded(
+ code = "class C extends B",
+ deps = List("A", "B")
+ )
+ }
+ }
+}
diff --git a/third_party/dependency_analyzer/src/test/io/bazel/rulesscala/dependencyanalyzer/DependencyAnalyzerTest.scala b/third_party/dependency_analyzer/src/test/io/bazel/rulesscala/dependencyanalyzer/StrictDepsTest.scala
similarity index 62%
rename from third_party/dependency_analyzer/src/test/io/bazel/rulesscala/dependencyanalyzer/DependencyAnalyzerTest.scala
rename to third_party/dependency_analyzer/src/test/io/bazel/rulesscala/dependencyanalyzer/StrictDepsTest.scala
index 7ec3d70df..1f837a1f4 100644
--- a/third_party/dependency_analyzer/src/test/io/bazel/rulesscala/dependencyanalyzer/DependencyAnalyzerTest.scala
+++ b/third_party/dependency_analyzer/src/test/io/bazel/rulesscala/dependencyanalyzer/StrictDepsTest.scala
@@ -1,42 +1,34 @@
package third_party.dependency_analyzer.src.test.io.bazel.rulesscala.dependencyanalyzer
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.junit.runners.JUnit4
-import java.nio.file.Paths
-
+import org.scalatest._
+import third_party.dependency_analyzer.src.main.io.bazel.rulesscala.dependencyanalyzer.DependencyTrackingMethod
+import third_party.utils.src.test.io.bazel.rulesscala.utils.TestUtil
import third_party.utils.src.test.io.bazel.rulesscala.utils.TestUtil._
-@RunWith(classOf[JUnit4])
-class DependencyAnalyzerTest {
+class StrictDepsTest extends FunSuite {
val pluginName = "dependency_analyzer"
def compileWithDependencyAnalyzer(code: String, withDirect: List[String] = Nil, withIndirect: List[(String, String)] = Nil): List[String] = {
- val toolboxPluginOptions: String = {
- val jar = System.getProperty(s"plugin.jar.location")
- val start= jar.indexOf(s"/third_party/$pluginName")
- // this substring is needed due to issue: https://github.com/bazelbuild/bazel/issues/2475
- val jarInRelationToBaseDir = jar.substring(start, jar.length)
- val pluginPath = Paths.get(baseDir, jarInRelationToBaseDir).toAbsolutePath
- s"-Xplugin:$pluginPath -Jdummy=${pluginPath.toFile.lastModified}"
- }
-
- val constructParam: (String, Iterable[String]) => String = constructPluginParam("dependency-analyzer")
- val compileOptions = Seq(
- constructParam("direct-jars", withDirect),
- constructParam("indirect-jars", withIndirect.map(_._1)),
- constructParam("indirect-targets", withIndirect.map(_._2)),
- constructParam("current-target", Seq(defaultTarget))
- ).mkString(" ")
-
val extraClasspath = withDirect ++ withIndirect.map(_._1)
- runCompiler(code, compileOptions, extraClasspath, toolboxPluginOptions)
+ TestUtil.runCompiler(
+ code = code,
+ extraClasspath = extraClasspath,
+ dependencyAnalyzerParamsOpt =
+ Some(
+ DependencyAnalyzerTestParams(
+ directJars = withDirect,
+ indirectJars = withIndirect.map(_._1),
+ indirectTargets = withIndirect.map(_._2),
+ strictDeps = true,
+ dependencyTrackingMethod = DependencyTrackingMethod.HighLevel
+ )
+ )
+ )
+ .map(_.msg)
}
-
- @Test
- def `error on indirect dependency target`(): Unit = {
+ test("error on indirect dependency target") {
val testCode =
"""object Foo {
| org.apache.commons.lang3.ArrayUtils.EMPTY_BOOLEAN_ARRAY.length
@@ -49,8 +41,7 @@ class DependencyAnalyzerTest {
compileWithDependencyAnalyzer(testCode, withIndirect = indirect).expectErrorOn(commonsTarget)
}
- @Test
- def `error on multiple indirect dependency targets`(): Unit = {
+ test("error on multiple indirect dependency targets") {
val testCode =
"""object Foo {
| org.apache.commons.lang3.ArrayUtils.EMPTY_BOOLEAN_ARRAY.length
@@ -65,8 +56,7 @@ class DependencyAnalyzerTest {
compileWithDependencyAnalyzer(testCode, withIndirect = indirect).expectErrorOn(commonsTarget, guavaTarget)
}
- @Test
- def `do not give error on direct dependency target`(): Unit = {
+ test("do not give error on direct dependency target") {
val testCode =
"""object Foo {
| org.apache.commons.lang3.ArrayUtils.EMPTY_BOOLEAN_ARRAY.length
@@ -77,7 +67,6 @@ class DependencyAnalyzerTest {
val direct = List(apacheCommonsClasspath)
val indirect = List(apacheCommonsClasspath -> commonsTarget)
- val a = compileWithDependencyAnalyzer(testCode, withDirect = direct, withIndirect = indirect)
compileWithDependencyAnalyzer(testCode, withDirect = direct, withIndirect = indirect).noErrorOn(commonsTarget)
}
@@ -96,11 +85,11 @@ class DependencyAnalyzerTest {
def expectErrorOn(targets: String*): Unit = targets.foreach(target => assert(
infos.exists(checkErrorContainsMessage(target)),
- s"expected an error on $target to appear in errors (with buildozer command)!")
+ s"expected an error on $target to appear in errors (with buildozer command)! Errors: $info")
)
def noErrorOn(target: String) = assert(
!infos.exists(checkErrorContainsMessage(target)),
- s"error on $target should not appear in errors!")
+ s"error on $target should not appear in errors! Errors: $info")
}
}
diff --git a/third_party/unused_dependency_checker/src/test/io/bazel/rulesscala/dependencyanalyzer/UnusedDependencyCheckerTest.scala b/third_party/dependency_analyzer/src/test/io/bazel/rulesscala/dependencyanalyzer/UnusedDependencyCheckerTest.scala
similarity index 54%
rename from third_party/unused_dependency_checker/src/test/io/bazel/rulesscala/dependencyanalyzer/UnusedDependencyCheckerTest.scala
rename to third_party/dependency_analyzer/src/test/io/bazel/rulesscala/dependencyanalyzer/UnusedDependencyCheckerTest.scala
index 3b928d983..97a5a650d 100644
--- a/third_party/unused_dependency_checker/src/test/io/bazel/rulesscala/dependencyanalyzer/UnusedDependencyCheckerTest.scala
+++ b/third_party/dependency_analyzer/src/test/io/bazel/rulesscala/dependencyanalyzer/UnusedDependencyCheckerTest.scala
@@ -1,31 +1,28 @@
-package third_party.unused_dependency_checker.src.test.io.bazel.rulesscala.dependencyanalyzer
-
-import java.nio.file.Paths
+package third_party.dependency_analyzer.src.test.io.bazel.rulesscala.dependencyanalyzer
import org.scalatest._
+import third_party.dependency_analyzer.src.main.io.bazel.rulesscala.dependencyanalyzer.DependencyTrackingMethod
+import third_party.utils.src.test.io.bazel.rulesscala.utils.TestUtil
import third_party.utils.src.test.io.bazel.rulesscala.utils.TestUtil._
class UnusedDependencyCheckerTest extends FunSuite {
def compileWithUnusedDependencyChecker(code: String, withDirect: List[(String, String)] = Nil): List[String] = {
- val toolboxPluginOptions: String = {
- val jar = System.getProperty("plugin.jar.location")
- val start = jar.indexOf("/third_party/unused_dependency_checker")
- // this substring is needed due to issue: https://github.com/bazelbuild/bazel/issues/2475
- val jarInRelationToBaseDir = jar.substring(start, jar.length)
- val pluginPath = Paths.get(baseDir, jarInRelationToBaseDir).toAbsolutePath
- s"-Xplugin:$pluginPath -Jdummy=${pluginPath.toFile.lastModified}"
- }
-
- val constructParam: (String, Iterable[String]) => String = constructPluginParam("unused-dependency-checker")
- val compileOptions = List(
- constructParam("direct-jars", withDirect.map(_._1)),
- constructParam("direct-targets", withDirect.map(_._2)),
- constructParam("current-target", Seq(defaultTarget))
- ).mkString(" ")
-
val extraClasspath = withDirect.map(_._1)
- runCompiler(code, compileOptions, extraClasspath, toolboxPluginOptions)
+ TestUtil.runCompiler(
+ code = code,
+ extraClasspath = extraClasspath,
+ dependencyAnalyzerParamsOpt =
+ Some(
+ DependencyAnalyzerTestParams(
+ directJars = withDirect.map(_._1),
+ directTargets = withDirect.map(_._2),
+ unusedDeps = true,
+ dependencyTrackingMethod = DependencyTrackingMethod.HighLevel
+ )
+ )
+ )
+ .map(_.msg)
}
test("error on unused direct dependencies") {
diff --git a/third_party/test/strip_resource_external_workspace/WORKSPACE b/third_party/test/strip_resource_external_workspace/WORKSPACE
new file mode 100644
index 000000000..e5d127dc1
--- /dev/null
+++ b/third_party/test/strip_resource_external_workspace/WORKSPACE
@@ -0,0 +1 @@
+workspace(name = "strip_resource_external_workspace")
diff --git a/third_party/test/strip_resource_external_workspace/strip/BUILD.bazel b/third_party/test/strip_resource_external_workspace/strip/BUILD.bazel
new file mode 100644
index 000000000..2e2167d71
--- /dev/null
+++ b/third_party/test/strip_resource_external_workspace/strip/BUILD.bazel
@@ -0,0 +1,8 @@
+load("@io_bazel_rules_scala//scala:scala.bzl", "scala_library")
+
+scala_library(
+ name = "noSrcsWithResources",
+ resource_strip_prefix = "strip",
+ resources = ["nosrc_jar_resource.txt"],
+ visibility = ["//visibility:public"],
+)
diff --git a/third_party/test/strip_resource_external_workspace/strip/nosrc_jar_resource.txt b/third_party/test/strip_resource_external_workspace/strip/nosrc_jar_resource.txt
new file mode 100644
index 000000000..b5bf914d1
--- /dev/null
+++ b/third_party/test/strip_resource_external_workspace/strip/nosrc_jar_resource.txt
@@ -0,0 +1 @@
+I am a text resource!
diff --git a/third_party/unused_dependency_checker/LICENSE b/third_party/unused_dependency_checker/LICENSE
deleted file mode 100644
index ec832b9a1..000000000
--- a/third_party/unused_dependency_checker/LICENSE
+++ /dev/null
@@ -1,29 +0,0 @@
-*******************************************************************************
-* Classpath Shrinker: a scalac plugin to detect unused classpath entries
-* Copyright (c) Scala Center
-* All rights reserved.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions
-* are met:
-* 1. Redistributions of source code must retain the above copyright
-* notice, this list of conditions and the following disclaimer.
-* 2. Redistributions in binary form must reproduce the above copyright
-* notice, this list of conditions and the following disclaimer in the
-* documentation and/or other materials provided with the distribution.
-* 3. Neither the name of the copyright holders nor the names of its
-* contributors may be used to endorse or promote products derived from
-* this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-* THE POSSIBILITY OF SUCH DAMAGE.
-*******************************************************************************
\ No newline at end of file
diff --git a/third_party/unused_dependency_checker/src/main/BUILD b/third_party/unused_dependency_checker/src/main/BUILD
deleted file mode 100644
index d28702892..000000000
--- a/third_party/unused_dependency_checker/src/main/BUILD
+++ /dev/null
@@ -1,16 +0,0 @@
-licenses(["notice"]) # 3-clause BSD
-
-load("//scala:scala.bzl", "scala_library_for_plugin_bootstrapping")
-
-scala_library_for_plugin_bootstrapping(
- name = "unused_dependency_checker",
- srcs = [
- "io/bazel/rulesscala/unuseddependencychecker/UnusedDependencyChecker.scala",
- ],
- resources = ["resources/scalac-plugin.xml"],
- visibility = ["//visibility:public"],
- deps = [
- "//external:io_bazel_rules_scala/dependency/scala/scala_compiler",
- "//external:io_bazel_rules_scala/dependency/scala/scala_reflect",
- ],
-)
diff --git a/third_party/unused_dependency_checker/src/main/io/bazel/rulesscala/unuseddependencychecker/UnusedDependencyChecker.scala b/third_party/unused_dependency_checker/src/main/io/bazel/rulesscala/unuseddependencychecker/UnusedDependencyChecker.scala
deleted file mode 100644
index 469db9093..000000000
--- a/third_party/unused_dependency_checker/src/main/io/bazel/rulesscala/unuseddependencychecker/UnusedDependencyChecker.scala
+++ /dev/null
@@ -1,144 +0,0 @@
-package third_party.unused_dependency_checker.src.main.io.bazel.rulesscala.unused_dependency_checker
-
-import scala.reflect.io.AbstractFile
-import scala.tools.nsc.plugins.{Plugin, PluginComponent}
-import scala.tools.nsc.{Global, Phase}
-import UnusedDependencyChecker._
-
-class UnusedDependencyChecker(val global: Global) extends Plugin { self =>
- val name = "unused-dependency-checker"
- val description = "Errors if there exists dependencies that are not used"
-
- val components: List[PluginComponent] = List[PluginComponent](Component)
-
- var direct: Map[String, String] = Map.empty
- var ignoredTargets: Set[String] = Set.empty
- var analyzerMode: AnalyzerMode = Error
- var currentTarget: String = "NA"
-
- val isWindows: Boolean = System.getProperty("os.name").toLowerCase.contains("windows")
-
- override def init(options: List[String], error: (String) => Unit): Boolean = {
- var directJars: Seq[String] = Seq.empty
- var directTargets: Seq[String] = Seq.empty
-
- for (option <- options) {
- option.split(":").toList match {
- case "direct-jars" :: data => directJars = data.map(decodeTarget)
- case "direct-targets" :: data => directTargets = data.map(decodeTarget)
- case "ignored-targets" :: data => ignoredTargets = data.map(decodeTarget).toSet
- case "current-target" :: target :: _ => currentTarget = decodeTarget(target)
- case "mode" :: mode :: _ => parseAnalyzerMode(mode).foreach(analyzerMode = _)
- case unknown :: _ => error(s"unknown param $unknown")
- case Nil =>
- }
- }
-
- direct = directJars.zip(directTargets).toMap
-
- true
- }
-
-
- private object Component extends PluginComponent {
- val global: Global = self.global
-
- import global._
-
- override val runsAfter = List("jvm")
-
- val phaseName: String = self.name
-
- private def warnOrError(messages: Set[String]): Unit = {
- val reportFunction: String => Unit = analyzerMode match {
- case Error => reporter.error(NoPosition, _)
- case Warn => reporter.warning(NoPosition, _)
- }
-
- messages.foreach(reportFunction)
- }
-
- override def newPhase(prev: Phase): StdPhase = new StdPhase(prev) {
- override def run(): Unit = {
- super.run()
-
- warnOrError(unusedDependenciesFound)
- }
-
- private def unusedDependenciesFound: Set[String] = {
- val usedJars: Set[AbstractFile] = findUsedJars
- val directJarPaths = direct.keys.toSet
- val usedJarPaths = if (!isWindows) usedJars.map(_.path) else usedJars.map(_.path.replaceAll("\\\\", "/"))
-
- val usedTargets = usedJarPaths
- .map(direct.get)
- .collect {
- case Some(target) => target
- }
-
- val unusedTargets = directJarPaths
- .filter(jar => !usedTargets.contains(direct(jar)))
- .map(direct.get)
- .collect {
- case Some(target) if !ignoredTargets.contains(target) => target
- }
-
- unusedTargets.map { target =>
- s"""Target '$target' is specified as a dependency to $currentTarget but isn't used, please remove it from the deps.
- |You can use the following buildozer command:
- |buildozer 'remove deps $target' $currentTarget
- |""".stripMargin
- }
- }
-
- override def apply(unit: CompilationUnit): Unit = ()
- }
-
- def findUsedJars: Set[AbstractFile] = {
- val jars = collection.mutable.Set[AbstractFile]()
-
- def walkTopLevels(root: Symbol): Unit = {
- def safeInfo(sym: Symbol): Type =
- if (sym.hasRawInfo && sym.rawInfo.isComplete) sym.info else NoType
-
- def packageClassOrSelf(sym: Symbol): Symbol =
- if (sym.hasPackageFlag && !sym.isModuleClass) sym.moduleClass else sym
-
- for (x <- safeInfo(packageClassOrSelf(root)).decls) {
- if (x == root) ()
- else if (x.hasPackageFlag) walkTopLevels(x)
- else if (x.owner != root) { // exclude package class members
- if (x.hasRawInfo && x.rawInfo.isComplete) {
- val assocFile = x.associatedFile
- if (assocFile.path.endsWith(".class") && assocFile.underlyingSource.isDefined)
- assocFile.underlyingSource.foreach(jars += _)
- }
- }
- }
- }
-
- exitingTyper {
- walkTopLevels(RootClass)
- }
- jars.toSet
- }
- }
-
-}
-
-object UnusedDependencyChecker {
-
- sealed trait AnalyzerMode
-
- case object Error extends AnalyzerMode
-
- case object Warn extends AnalyzerMode
-
- def parseAnalyzerMode(mode: String): Option[AnalyzerMode] = mode match {
- case "error" => Some(Error)
- case "warn" => Some(Warn)
- case _ => None
- }
-
- def decodeTarget(target: String): String = target.replace(";", ":")
-}
diff --git a/third_party/unused_dependency_checker/src/main/resources/scalac-plugin.xml b/third_party/unused_dependency_checker/src/main/resources/scalac-plugin.xml
deleted file mode 100644
index ae5ddca8f..000000000
--- a/third_party/unused_dependency_checker/src/main/resources/scalac-plugin.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
- unused-dependency-checker
- third_party.unused_dependency_checker.src.main.io.bazel.rulesscala.unused_dependency_checker.UnusedDependencyChecker
-
diff --git a/third_party/unused_dependency_checker/src/test/BUILD b/third_party/unused_dependency_checker/src/test/BUILD
deleted file mode 100644
index f8574859f..000000000
--- a/third_party/unused_dependency_checker/src/test/BUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-licenses(["notice"]) # 3-clause BSD
-
-load("//scala:scala.bzl", "scala_junit_test", "scala_test")
-
-scala_test(
- name = "unused_dependency_checker_test",
- size = "small",
- srcs = [
- "io/bazel/rulesscala/dependencyanalyzer/UnusedDependencyCheckerTest.scala",
- ],
- jvm_flags = [
- "-Dplugin.jar.location=$(location //third_party/unused_dependency_checker/src/main:unused_dependency_checker)",
- "-Dscala.library.location=$(location //external:io_bazel_rules_scala/dependency/scala/scala_library)",
- "-Dapache.commons.jar.location=$(location @org_apache_commons_commons_lang_3_5_without_file//:linkable_org_apache_commons_commons_lang_3_5_without_file)",
- ],
- unused_dependency_checker_mode = "off",
- deps = [
- "//external:io_bazel_rules_scala/dependency/scala/scala_compiler",
- "//external:io_bazel_rules_scala/dependency/scala/scala_library",
- "//external:io_bazel_rules_scala/dependency/scala/scala_reflect",
- "//third_party/unused_dependency_checker/src/main:unused_dependency_checker",
- "//third_party/utils/src/test:test_util",
- "@org_apache_commons_commons_lang_3_5_without_file//:linkable_org_apache_commons_commons_lang_3_5_without_file",
- ],
-)
diff --git a/third_party/utils/src/test/BUILD b/third_party/utils/src/test/BUILD
index 2dbce6ac2..9c3e8bafb 100644
--- a/third_party/utils/src/test/BUILD
+++ b/third_party/utils/src/test/BUILD
@@ -5,11 +5,13 @@ load("//scala:scala.bzl", "scala_library")
scala_library(
name = "test_util",
srcs = [
+ "io/bazel/rulesscala/utils/JavaCompileUtil.scala",
"io/bazel/rulesscala/utils/TestUtil.scala",
],
visibility = ["//visibility:public"],
deps = [
"//external:io_bazel_rules_scala/dependency/scala/scala_compiler",
"//external:io_bazel_rules_scala/dependency/scala/scala_reflect",
+ "//third_party/dependency_analyzer/src/main:dependency_analyzer",
],
)
diff --git a/third_party/utils/src/test/io/bazel/rulesscala/utils/JavaCompileUtil.scala b/third_party/utils/src/test/io/bazel/rulesscala/utils/JavaCompileUtil.scala
new file mode 100644
index 000000000..ed300f7f7
--- /dev/null
+++ b/third_party/utils/src/test/io/bazel/rulesscala/utils/JavaCompileUtil.scala
@@ -0,0 +1,52 @@
+package third_party.utils.src.test.io.bazel.rulesscala.utils
+
+import java.io.File
+import java.io.IOException
+import java.net.URI
+import java.util
+import java.util.Locale
+import javax.tools.DiagnosticCollector
+import javax.tools.JavaFileObject
+import javax.tools.JavaFileObject.Kind
+import javax.tools.SimpleJavaFileObject
+import javax.tools.StandardLocation
+import javax.tools.ToolProvider
+
+// Modified from
+// https://myshittycode.com/2014/02/13/java-programmatically-compile-and-unit-test-generated-java-source-code/
+object JavaCompileUtil {
+ // in-memory Java file object
+ class InMemoryJavaFileObject(val className: String, val contents: String) extends SimpleJavaFileObject(URI.create("string:///" + className.replace('.', '/') + Kind.SOURCE.extension), Kind.SOURCE) {
+ @throws[IOException]
+ override def getCharContent(ignoreEncodingErrors: Boolean): CharSequence = contents
+ }
+
+ /**
+ * Compile some java code
+ */
+ def compile(tmpDir: String, className: String, code: String): Unit = {
+ val javaFileObject = new InMemoryJavaFileObject(className, code)
+ val compiler = ToolProvider.getSystemJavaCompiler
+ val fileManager = compiler.getStandardFileManager(null, null, null)
+ val files = util.Arrays.asList(new File(tmpDir))
+ fileManager.setLocation(StandardLocation.CLASS_OUTPUT, files)
+ val diagnostics = new DiagnosticCollector[JavaFileObject]
+ val task = compiler.getTask(null, fileManager, diagnostics, null, null, util.Arrays.asList(javaFileObject))
+ val success = task.call
+ fileManager.close()
+ // If there's a compilation error, display error messages and fail the test
+ if (!success) {
+ import scala.collection.JavaConversions._
+ for (diagnostic <- diagnostics.getDiagnostics) {
+ println("Code: " + diagnostic.getCode)
+ println("Kind: " + diagnostic.getKind)
+ println("Position: " + diagnostic.getPosition)
+ println("Start Position: " + diagnostic.getStartPosition)
+ println("End Position: " + diagnostic.getEndPosition)
+ println("Source: " + diagnostic.getSource)
+ println("Message: " + diagnostic.getMessage(Locale.getDefault))
+ }
+ throw new Exception("Compilation failed!")
+ }
+ }
+}
diff --git a/third_party/utils/src/test/io/bazel/rulesscala/utils/TestUtil.scala b/third_party/utils/src/test/io/bazel/rulesscala/utils/TestUtil.scala
index a15f6a5c8..025564901 100644
--- a/third_party/utils/src/test/io/bazel/rulesscala/utils/TestUtil.scala
+++ b/third_party/utils/src/test/io/bazel/rulesscala/utils/TestUtil.scala
@@ -1,62 +1,141 @@
package third_party.utils.src.test.io.bazel.rulesscala.utils
+import java.nio.file.Path
import java.nio.file.Paths
-
import scala.reflect.internal.util.BatchSourceFile
+import scala.reflect.io.AbstractFile
+import scala.reflect.io.Directory
+import scala.reflect.io.PlainDirectory
import scala.reflect.io.VirtualDirectory
import scala.tools.cmd.CommandLineParser
+import scala.tools.nsc.CompilerCommand
+import scala.tools.nsc.Global
+import scala.tools.nsc.Settings
import scala.tools.nsc.reporters.StoreReporter
-import scala.tools.nsc.{CompilerCommand, Global, Settings}
+import third_party.dependency_analyzer.src.main.io.bazel.rulesscala.dependencyanalyzer.DependencyTrackingMethod
object TestUtil {
-
- import scala.language.postfixOps
-
final val defaultTarget = "//..."
- def constructPluginParam(pluginName: String)(name: String, values: Iterable[String]): String = {
+ private def constructPluginParam(pluginName: String)(name: String, values: Iterable[String]): String = {
if (values.isEmpty) ""
else s"-P:$pluginName:$name:${values.mkString(":")}"
}
- def runCompiler(code: String, compileOptions: String, extraClasspath: List[String], toolboxPluginOptions: String): List[String] = {
- val fullCompileOptions: String = getCompileOptions(code, compileOptions, extraClasspath, toolboxPluginOptions)
- val reporter: StoreReporter = eval(code, fullCompileOptions)
- reporter.infos.collect({ case msg if msg.severity == reporter.ERROR => msg.msg }).toList
+ private lazy val toolboxPluginOptions: String = {
+ val jar = System.getProperty(s"plugin.jar.location")
+ val start = jar.indexOf(s"/third_party/dependency_analyzer")
+ // this substring is needed due to issue: https://github.com/bazelbuild/bazel/issues/2475
+ val jarInRelationToBaseDir = jar.substring(start, jar.length)
+ val pluginPath = Paths.get(baseDir, jarInRelationToBaseDir).toAbsolutePath
+ s"-Xplugin:$pluginPath -Jdummy=${pluginPath.toFile.lastModified}"
}
- private def getCompileOptions(code: String, compileOptions: String, extraClasspath: Seq[String], toolboxPluginOptions: String): String = {
- val fullClasspath: String = {
- val extraClasspathString = extraClasspath.mkString(":")
- if (toolboxClasspath.isEmpty) extraClasspathString
- else s"$toolboxClasspath:$extraClasspathString"
+ case class DependencyAnalyzerTestParams(
+ dependencyTrackingMethod: DependencyTrackingMethod,
+ strictDeps: Boolean = false,
+ unusedDeps: Boolean = false,
+ directJars: List[String] = List.empty,
+ directTargets: List[String] = List.empty,
+ indirectJars: List[String] = List.empty,
+ indirectTargets: List[String] = List.empty
+ )
+
+ private def getDependencyAnalyzerOptions(params: DependencyAnalyzerTestParams): String = {
+ val argsForAnalyzer =
+ List(
+ "dependency-tracking-method" -> Seq(params.dependencyTrackingMethod.name),
+ "current-target" -> Seq(TestUtil.defaultTarget),
+ "unused-deps-mode" -> (if (params.unusedDeps) { Seq("error") } else { Seq() }),
+ "strict-deps-mode" -> (if (params.strictDeps) { Seq("error") } else { Seq() }),
+ "direct-jars" -> params.directJars,
+ "direct-targets" -> params.directTargets,
+ "indirect-jars" -> params.indirectJars,
+ "indirect-targets" -> params.indirectTargets
+ )
+ val constructParam = TestUtil.constructPluginParam("dependency-analyzer") _
+ val argsForAnalyzerString =
+ argsForAnalyzer
+ .map { case (k, v) =>
+ constructParam(k, v)
+ }
+ .mkString(" ")
+ s"$argsForAnalyzerString $toolboxPluginOptions"
+ }
+
+ private def getClasspathArguments(extraClasspath: List[String]): String = {
+ val classpathEntries = {
+ val builtinClassPaths = builtinClasspaths.filterNot(_.isEmpty)
+ extraClasspath ++ builtinClassPaths
+ }
+ if (classpathEntries.isEmpty) {
+ ""
+ } else {
+ s"-classpath ${classpathEntries.mkString(":")}"
}
- val basicOptions =
- createBasicCompileOptions(fullClasspath, toolboxPluginOptions)
+ }
- s"$basicOptions $compileOptions"
+ /**
+ * Runs the compiler on a piece of code.
+ *
+ * @param dependencyAnalyzerParamsOpt If set, includes the dependency analyzer
+ * plugin with the provided parameters
+ * @param outputPathOpt If non-None, a directory to output the files in
+ * @return list of errors returned by the compiler
+ */
+ def runCompiler(
+ code: String,
+ extraClasspath: List[String] = List.empty,
+ dependencyAnalyzerParamsOpt: Option[DependencyAnalyzerTestParams] = None,
+ outputPathOpt: Option[Path] = None
+ ): List[StoreReporter#Info] = {
+ val dependencyAnalyzerOptions =
+ dependencyAnalyzerParamsOpt
+ .map(getDependencyAnalyzerOptions)
+ .getOrElse("")
+ val classPathOptions = getClasspathArguments(extraClasspath)
+ val compileOptions = s"$dependencyAnalyzerOptions $classPathOptions"
+ val output =
+ outputPathOpt
+ .map(output => new PlainDirectory(new Directory(output.toFile)))
+ .getOrElse(new VirtualDirectory("(memory)", None))
+ eval(code = code, compileOptions = compileOptions, output = output)
}
- /** Evaluate using global instance instead of toolbox because toolbox seems
- * to fail to typecheck code that comes from external dependencies. */
- private def eval(code: String, compileOptions: String = ""): StoreReporter = {
+ private def eval(
+ code: String,
+ compileOptions: String,
+ output: AbstractFile
+ ): List[StoreReporter#Info] = {
// TODO: Optimize and cache global.
val options = CommandLineParser.tokenize(compileOptions)
val reporter = new StoreReporter()
val settings = new Settings(println)
val _ = new CompilerCommand(options, settings)
- settings.outputDirs.setSingleOutput(new VirtualDirectory("(memory)", None))
+ settings.outputDirs.setSingleOutput(output)
+
+ // Evaluate using global instance instead of toolbox because toolbox seems
+ // to fail to typecheck code that comes from external dependencies.
val global = new Global(settings, reporter)
+
val run = new global.Run
- val toCompile = new BatchSourceFile("", code)
+
+ // It is important that the source name when compiling code
+ // looks like a valid scala file -
+ // this causes the compiler to report positions correctly. And
+ // tests verify that positions are reported successfully.
+ val toCompile = new BatchSourceFile("CompiledCode.scala", code)
run.compileSources(List(toCompile))
- reporter
+ reporter.infos.filter(_.severity == reporter.ERROR).toList
}
- lazy val baseDir = System.getProperty("user.dir")
+ private lazy val baseDir = System.getProperty("user.dir")
- lazy val toolboxClasspath: String =
- pathOf("scala.library.location")
+ private lazy val builtinClasspaths: Vector[String] =
+ Vector(
+ pathOf("scala.library.location"),
+ pathOf("scala.reflect.location")
+ )
lazy val guavaClasspath: String =
pathOf("guava.jar.location")
@@ -70,10 +149,6 @@ object TestUtil {
libPath.toString
}
- private def createBasicCompileOptions(classpath: String, usePluginOptions: String) =
- s"-classpath $classpath $usePluginOptions"
-
-
def decodeLabel(targetLabel: String): String = targetLabel.replace(";", ":")
def encodeLabel(targetLabel: String): String = targetLabel.replace(":", ";")
diff --git a/tools/bazel b/tools/bazel
index aad205806..8fc0f8ce1 100755
--- a/tools/bazel
+++ b/tools/bazel
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -e
-default_bazel_version='1.1.0'
+default_bazel_version='2.0.0'
if [ "$BUILDKITE" = true ]; then
bazel_version='host'
@@ -27,10 +27,6 @@ case "$bazel_version" in
bazel_version=$("$BAZEL_REAL" version | awk '/Build label/ {print $3}' | cut -d '-' -f 1)
bazel="$BAZEL_REAL"
;;
- '1.1.0')
- darwin_sha='1a552f4ce194860fbbd50eeb319f81788ddf50a849e92378eec72231cc64ef65'
- linux_sha='14301099c87568db302d59a5d3585f5eb8a6250ac2c6bb0367c56e623ff6e65f'
- ;;
'2.0.0')
darwin_sha='c675fa27d99a3114d681db10eb03ded547c40f702b2048c99b8f4ea8e89b9356'
linux_sha='2fbdc9c0e3d376697caf0ee3673b7c9475214068c55a01b9744891e131f90b87'
diff --git a/twitter_scrooge/twitter_scrooge.bzl b/twitter_scrooge/twitter_scrooge.bzl
index 4680b3701..fa2482939 100644
--- a/twitter_scrooge/twitter_scrooge.bzl
+++ b/twitter_scrooge/twitter_scrooge.bzl
@@ -1,5 +1,6 @@
load(
"//scala:scala_cross_version.bzl",
+ _default_maven_server_urls = "default_maven_server_urls",
_default_scala_version = "default_scala_version",
_extract_major_version = "extract_major_version",
_scala_mvn_artifact = "scala_mvn_artifact",
@@ -12,7 +13,14 @@ load(
"//scala/private:common.bzl",
"write_manifest_file",
)
-load("//scala/private:rule_impls.bzl", "compile_scala")
+load(
+ "//scala/private:dependency.bzl",
+ "legacy_unclear_dependency_info_for_protobuf_scrooge",
+)
+load(
+ "//scala/private:rule_impls.bzl",
+ "compile_scala",
+)
load("@io_bazel_rules_scala//thrift:thrift_info.bzl", "ThriftInfo")
load(
"@io_bazel_rules_scala//thrift:thrift.bzl",
@@ -23,7 +31,7 @@ _jar_extension = ".jar"
def twitter_scrooge(
scala_version = _default_scala_version(),
- maven_servers = ["https://repo.maven.apache.org/maven2"]):
+ maven_servers = _default_maven_server_urls()):
major_version = _extract_major_version(scala_version)
_scala_maven_import_external(
@@ -238,6 +246,8 @@ def _compile_scala(
expect_java_output = False,
scalac_jvm_flags = [],
scalac = ctx.attr._scalac,
+ dependency_info = legacy_unclear_dependency_info_for_protobuf_scrooge(ctx),
+ unused_dependency_checker_ignored_targets = [],
)
return JavaInfo(