From 5bb046d544d2911bca4ecf84e94d5bd87947369d Mon Sep 17 00:00:00 2001
From: Tink Team <tink-dev@google.com>
Date: Fri, 30 Aug 2019 05:55:09 -0700
Subject: [PATCH] Migrate from legacy 'java' provider to the JavaInfo provider.
'java' provider is deprecated and is going to be removed from blaze soon.
PiperOrigin-RevId: 266361895
---
tools/java_single_jar.bzl | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/java_single_jar.bzl b/tools/java_single_jar.bzl
index ce3dd2016..19397c73e 100644
--- a/tools/java_single_jar.bzl
+++ b/tools/java_single_jar.bzl
@@ -25,7 +25,7 @@ def _java_single_jar(ctx):
inputs = depset(transitive = [inputs, dep.java.transitive_runtime_deps])
source_jars = depset(transitive = [source_jars, dep.java.source_jars])
for td in dep.java.transitive_runtime_deps:
- if hasattr(td, "java"):
+ if JavaInfo in td:
source_jars = depset(transitive = [source_jars, td.java.source_jars])
compress = ""
@@ -74,7 +74,7 @@ def _java_single_jar(ctx):
java_single_jar = rule(
attrs = {
- "deps": attr.label_list(providers = ["java"]),
+ "deps": attr.label_list(providers = [JavaInfo]),
"_singlejar": attr.label(
default = Label("@bazel_tools//tools/jdk:singlejar"),
cfg = "host",
--
GitLab